moved invocation of japicmp plugin to japicmp-test-maven-plugin due t…

…o cyclic deps
siom79 · Aug 25, 2024 · ebc2e33 · ebc2e33
1 parent 7411d9f
commit ebc2e33
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 35 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,6 +22,4 @@ jobs:
     - name: Build with Maven
       run: mvn -B package
     - name: japicmp report in Job Summary
-      run:  cd japicmp && \
-        mvn -Pjapicmp com.github.siom79.japicmp:japicmp-maven-plugin:cmp && \
-        cat ./japicmp/target/japicmp/japicmp.md >> GITHUB_STEP_SUMMARY
+      run:  cat ./japicmp-testbase/japicmp-test-maven-plugin/target/japicmp/github-job-summary.md >> GITHUB_STEP_SUMMARY
diff --git a/japicmp-testbase/japicmp-test-maven-plugin/pom.xml b/japicmp-testbase/japicmp-test-maven-plugin/pom.xml
@@ -79,6 +79,25 @@
 				<artifactId>japicmp-maven-plugin</artifactId>
 				<version>${project.version}</version>
 				<executions>
+					<execution>
+						<id>github-job-summary</id>
+						<phase>pre-integration-test</phase>
+						<goals>
+							<goal>cmp</goal>
+						</goals>
+						<configuration>
+							<newVersion>
+								<dependency>
+									<groupId>com.github.siom79.japicmp</groupId>
+									<artifactId>japicmp</artifactId>
+									<version>${project.version}</version>
+								</dependency>
+							</newVersion>
+							<parameter>
+								<onlyModified>false</onlyModified>
+							</parameter>
+						</configuration>
+					</execution>
 					<execution>
 						<id>single-version</id>
 						<phase>pre-integration-test</phase>

diff --git a/japicmp/pom.xml b/japicmp/pom.xml
@@ -209,37 +209,5 @@
 				</plugins>
 			</build>
 		</profile>
-		<profile>
-			<id>japicmp</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>com.github.siom79.japicmp</groupId>
-						<artifactId>japicmp-maven-plugin</artifactId>
-						<version>${project.version}</version>
-						<configuration>
-							<newVersion>
-								<file>
-									<path>${project.build.directory}/${project.artifactId}-${project.version}.jar</path>
-								</file>
-							</newVersion>
-							<parameter>
-								<oldVersionPattern>\d+\.\d+\.\d+</oldVersionPattern>
-								<onlyModified>true</onlyModified>
-							</parameter>
-							<skip>false</skip>
-						</configuration>
-						<executions>
-							<execution>
-								<phase>package</phase>
-								<goals>
-									<goal>cmp</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
 	</profiles>
 </project>