config: combine sevntu selftesting with regular testing

sevntu-checkstyle · Oct 23, 2022 · eb45480 · eb45480
1 parent 8b469f8
commit eb45480
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 40 deletions.
diff --git a/.ci/validation.sh b/.ci/validation.sh
@@ -47,7 +47,6 @@ 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,6 +250,7 @@
           </execution>
         </executions>
       </plugin>
+      <!-- Checkstyle Config -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
@@ -280,6 +281,39 @@
           </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>
@@ -881,45 +915,6 @@
         <maven.site.skip>true</maven.site.skip>
       </properties>
     </profile>
-    <profile>
-      <id>selftesting</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <version>${antrun.plugin.version}</version>
-            <executions>
-              <execution>
-                <id>ant-phase-verify</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>
-        </plugins>
-      </build>
-    </profile>
 
     <profile>
       <id>local-deploy</id>