build-tools gone, one less POM, checkstyle configured from filesystem

Evolveum · Jan 27, 2020 · 8f695ea · 8f695ea
1 parent 2c607a8
commit 8f695ea
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 62 deletions.
diff --git a/...idpoint-build/checkstyle-suppressions.xml → ...style-configs/checkstyle-suppressions.xml b/...idpoint-build/checkstyle-suppressions.xml → ...style-configs/checkstyle-suppressions.xml
diff --git a/...n/resources/midpoint-build/checkstyle.xml → ...-system/checkstyle-configs/checkstyle.xml b/...n/resources/midpoint-build/checkstyle.xml → ...-system/checkstyle-configs/checkstyle.xml
diff --git a/build-system/pom.xml b/build-system/pom.xml
@@ -1727,16 +1727,9 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
                 <version>${checkstyle.version}</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>com.evolveum.midpoint</groupId>
-                        <artifactId>build-tools</artifactId>
-                        <version>${project.version}</version>
-                    </dependency>
-                </dependencies>
                 <configuration>
-                    <configLocation>midpoint-build/checkstyle.xml</configLocation>
-                    <suppressionsLocation>midpoint-build/checkstyle-suppressions.xml</suppressionsLocation>
+                    <configLocation>${maven.multiModuleProjectDirectory}/build-system/checkstyle-configs/checkstyle.xml</configLocation>
+                    <suppressionsLocation>${maven.multiModuleProjectDirectory}/build-system/checkstyle-configs/checkstyle-suppressions.xml</suppressionsLocation>
                     <encoding>UTF-8</encoding>
                     <consoleOutput>true</consoleOutput>
                     <failsOnError>true</failsOnError>

diff --git a/build-tools/pom.xml b/build-tools/pom.xml
diff --git a/pom.xml b/pom.xml
@@ -173,7 +173,6 @@
     </repositories>
 
     <modules>
-        <module>build-tools</module>
         <module>build-system</module>
         <module>tools</module>
         <module>infra</module>