Merge 254956c into 877e98b

sevntu-checkstyle · Oct 25, 2022 · c678161 · c678161
2 parents 877e98b + 254956c
commit c678161
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 34 deletions.
diff --git a/.ci/validation.sh b/.ci/validation.sh
@@ -47,6 +47,7 @@ sonar-plugin)
 sevntu-checks)
   cd sevntu-checks
   mvn -e -Pcoverall install
+  mvn -e verify -Pno-validations,selftesting
   if [[ $TRAVIS == 'true' ]]; then
    mvn -e -Pcoverall jacoco:report coveralls:report
   fi

diff --git a/sevntu-checks/pom.xml b/sevntu-checks/pom.xml
@@ -250,7 +250,6 @@
           </execution>
         </executions>
       </plugin>
-      <!-- Checkstyle Config -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
@@ -281,39 +280,6 @@
           </dependency>
         </dependencies>
       </plugin>
-      <!-- Sevntu Config -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <version>${antrun.plugin.version}</version>
-        <executions>
-          <execution>
-            <id>ant-phase-verify-sevntu</id>
-            <phase>verify</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <target>
-                <property name="mvn.project.build.directory" value="${project.build.directory}" />
-                <ant antfile="ant-phase-verify-sevntu.xml" />
-              </target>
-            </configuration>
-          </execution>
-        </executions>
-        <dependencies>
-          <dependency>
-            <groupId>com.puppycrawl.tools</groupId>
-            <artifactId>checkstyle</artifactId>
-            <version>${checkstyle.version}</version>
-          </dependency>
-         <dependency>
-            <groupId>com.github.sevntu-checkstyle</groupId>
-            <artifactId>sevntu-checks</artifactId>
-            <version>${project.version}</version>
-          </dependency>
-        </dependencies>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-pmd-plugin</artifactId>
@@ -915,6 +881,57 @@
         <maven.site.skip>true</maven.site.skip>
       </properties>
     </profile>
+    <!-- this must stay as a separate profile as the build plugin has a similar run,
+         but with different dependencies. Maven does not allow 2 similar plugin runs
+         and wrongly combines the 2 which can fail with breaking changes. -->
+    <profile>
+      <id>selftesting</id>
+      <properties>
+        <checkstyle.ant.skip>false</checkstyle.ant.skip>
+      </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <version>${antrun.plugin.version}</version>
+            <executions>
+              <!-- disable non-profile run -->
+              <execution>
+                <id>ant-phase-verify</id>
+                <phase>none</phase>
+              </execution>
+              <!-- profile run -->
+              <execution>
+                <id>ant-phase-verify-sevntu</id>
+                <phase>verify</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                  <target>
+                    <property name="mvn.project.build.directory" value="${project.build.directory}" />
+                    <ant antfile="ant-phase-verify-sevntu.xml" />
+                  </target>
+                </configuration>
+              </execution>
+            </executions>
+            <dependencies>
+              <dependency>
+                <groupId>com.puppycrawl.tools</groupId>
+                <artifactId>checkstyle</artifactId>
+                <version>${checkstyle.eclipse-cs.version}</version>
+              </dependency>
+             <dependency>
+                <groupId>com.github.sevntu-checkstyle</groupId>
+                <artifactId>sevntu-checks</artifactId>
+                <version>${project.version}</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
 
     <profile>
       <id>local-deploy</id>