use built in enforcer rule rather than a custom one to ban the use of…

… system tests in other modules Signed-off-by: Sam Barker <[email protected]> rh-pre-commit.version: 2.0.1 rh-pre-commit.check-secrets: ENABLED
franvila · Nov 13, 2023 · 0b67d70 · 0b67d70
1 parent 0560cd4
commit 0b67d70
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 131 deletions.
diff --git a/kroxylicious-enforcer-rules/pom.xml b/kroxylicious-enforcer-rules/pom.xml
diff --git a/...-enforcer-rules/src/main/java/io/kroxylicious/enforcer/rules/SystemTestIsolationRule.java b/...-enforcer-rules/src/main/java/io/kroxylicious/enforcer/rules/SystemTestIsolationRule.java
diff --git a/kroxylicious-systemtests/pom.xml b/kroxylicious-systemtests/pom.xml
@@ -132,35 +132,11 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <dependencies>
-                    <dependency>
-                        <groupId>io.kroxylicious</groupId>
-                        <artifactId>kroxylicious-enforcer-rules</artifactId>
-                        <version>0.4.0-SNAPSHOT</version>
-                    </dependency>
-                </dependencies>
-                <executions>
-                    <execution>
-                        <id>enforce-systemtest-isolation</id>
-                        <configuration>
-                            <rules>
-                                <systemTestIsolationRule implementation="io.kroxylicious.enforcer.rules.SystemTestIsolationRule"/>
-                            </rules>
-                        </configuration>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
             </resource>
         </resources>
     </build>
-</project>
+</project>
diff --git a/pom.xml b/pom.xml
@@ -343,7 +343,6 @@
     </dependencyManagement>
 
     <modules>
-        <module>kroxylicious-enforcer-rules</module>
         <module>kroxylicious-kms</module>
         <module>kroxylicious-kms-provider-kroxylicious-inmemory</module>
         <module>kroxylicious-bom</module>
@@ -655,6 +654,27 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>enforce-systemtest-isolation</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <bannedDependencies>
+                                    <excludes>
+                                        <exclude>io.kroxylicious:kroxylicious-systemtests</exclude>
+                                    </excludes>
+                                </bannedDependencies>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
@@ -949,4 +969,4 @@
             </build>
         </profile>
     </profiles>
-</project>
+</project>