Skip to content

Commit f81816d

Browse files
marko-bekhtamarko-bekhta
committed
HV-2051 Remove the plugins that are supposed to be replaced by spotless
1 parent 118f5eb commit f81816d

File tree

5 files changed

+4
-164
lines changed

5 files changed

+4
-164
lines changed

‎build/build-config/src/main/resources/java-header-style.xml‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎build/build-config/src/main/resources/xml-header-style.xml‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎parents/internal/pom.xml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,8 @@
4141
<build>
4242
<plugins>
4343
<plugin>
44-
<groupId>net.revelc.code</groupId>
45-
<artifactId>impsort-maven-plugin</artifactId>
46-
</plugin>
47-
<plugin>
48-
<groupId>net.revelc.code.formatter</groupId>
49-
<artifactId>formatter-maven-plugin</artifactId>
44+
<groupId>com.diffplug.spotless</groupId>
45+
<artifactId>spotless-maven-plugin</artifactId>
5046
</plugin>
5147
<plugin>
5248
<artifactId>maven-dependency-plugin</artifactId>

‎parents/public/pom.xml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,8 @@
4444
<artifactId>flatten-maven-plugin</artifactId>
4545
</plugin>
4646
<plugin>
47-
<groupId>net.revelc.code</groupId>
48-
<artifactId>impsort-maven-plugin</artifactId>
49-
</plugin>
50-
<plugin>
51-
<groupId>net.revelc.code.formatter</groupId>
52-
<artifactId>formatter-maven-plugin</artifactId>
47+
<groupId>com.diffplug.spotless</groupId>
48+
<artifactId>spotless-maven-plugin</artifactId>
5349
</plugin>
5450
<plugin>
5551
<groupId>org.apache.maven.plugins</groupId>

‎pom.xml‎

Lines changed: 0 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,6 @@
254254
<version.jar.plugin>3.4.2</version.jar.plugin>
255255
<version.jqassistant.plugin>2.4.0</version.jqassistant.plugin>
256256
<version.javadoc.plugin>3.10.1</version.javadoc.plugin>
257-
<version.license.plugin>4.6</version.license.plugin>
258257
<version.release.plugin>3.1.1</version.release.plugin>
259258
<version.resources.plugin>3.3.1</version.resources.plugin>
260259
<version.shade.plugin>3.6.0</version.shade.plugin>
@@ -267,8 +266,6 @@
267266
<version.flatten-maven-plugin>1.6.0</version.flatten-maven-plugin>
268267
<version.moditect.plugin>1.2.2.Final</version.moditect.plugin>
269268
<version.sisu-maven-plugin>0.9.0.M3</version.sisu-maven-plugin>
270-
<version.impsort-maven-plugin>1.12.0</version.impsort-maven-plugin>
271-
<version.formatter-maven-plugin>2.24.1</version.formatter-maven-plugin>
272269
<version.versions.plugin>2.17.1</version.versions.plugin>
273270
<version.maven-wrapper-plugin>3.3.2</version.maven-wrapper-plugin>
274271
<version.spotless-maven-plugin>2.43.0</version.spotless-maven-plugin>
@@ -396,8 +393,6 @@
396393

397394
<!-- Formatting -->
398395
<format.skip>false</format.skip>
399-
<goal.impsort-maven-plugin>sort</goal.impsort-maven-plugin>
400-
<goal.formatter-maven-plugin>format</goal.formatter-maven-plugin>
401396
</properties>
402397

403398
<dependencyManagement>
@@ -645,10 +640,6 @@
645640
</execution>
646641
</executions>
647642
</plugin>
648-
<plugin>
649-
<groupId>com.mycila</groupId>
650-
<artifactId>license-maven-plugin</artifactId>
651-
</plugin>
652643
<plugin>
653644
<groupId>org.codehaus.mojo</groupId>
654645
<artifactId>build-helper-maven-plugin</artifactId>
@@ -908,51 +899,6 @@
908899
</execution>
909900
</executions>
910901
</plugin>
911-
<plugin>
912-
<groupId>com.mycila</groupId>
913-
<artifactId>license-maven-plugin</artifactId>
914-
<version>${version.license.plugin}</version>
915-
<configuration>
916-
<licenseSets>
917-
<licenseSet>
918-
<header>${hibernate-validator-parent.path}/build/build-config/src/main/resources/license.header</header>
919-
<excludes>
920-
<!-- Next two classes are copied from other project and have different headers -->
921-
<exclude>**/org/hibernate/validator/internal/util/TypeHelper.java</exclude>
922-
<exclude>**/org/hibernate/validator/test/internal/util/TypeHelperTest.java</exclude>
923-
<exclude>**/settings-example.xml</exclude>
924-
<exclude>**/src/test/resources/org/hibernate/validator/referenceguide/**/*.*</exclude>
925-
<exclude>**/org/hibernate/validator/referenceguide/**/*.*</exclude>
926-
<exclude>**/src/test/resources/org/hibernate/validator/test/internal/xml/**/*.xml</exclude>
927-
<exclude>.mvn/**</exclude>
928-
<exclude>**/generated-sources/**</exclude>
929-
<exclude>**/javadoc-bundle-options/**</exclude>
930-
</excludes>
931-
<includes>
932-
<include>**/*.java</include>
933-
<include>**/*.xml</include>
934-
</includes>
935-
</licenseSet>
936-
</licenseSets>
937-
<strictCheck>true</strictCheck>
938-
<headerDefinitions>
939-
<headerDefinition>${hibernate-validator-parent.path}/build/build-config/src/main/resources/java-header-style.xml</headerDefinition>
940-
<headerDefinition>${hibernate-validator-parent.path}/build/build-config/src/main/resources/xml-header-style.xml</headerDefinition>
941-
</headerDefinitions>
942-
<mapping>
943-
<java>JAVA_CLASS_STYLE</java>
944-
<xml>XML_FILE_STYLE</xml>
945-
</mapping>
946-
</configuration>
947-
<executions>
948-
<execution>
949-
<id>license-headers</id>
950-
<goals>
951-
<goal>check</goal>
952-
</goals>
953-
</execution>
954-
</executions>
955-
</plugin>
956902
<plugin>
957903
<artifactId>maven-surefire-plugin</artifactId>
958904
<version>${version.surefire.plugin}</version>
@@ -1416,60 +1362,6 @@
14161362
</execution>
14171363
</executions>
14181364
</plugin>
1419-
<plugin>
1420-
<groupId>net.revelc.code</groupId>
1421-
<artifactId>impsort-maven-plugin</artifactId>
1422-
<version>${version.impsort-maven-plugin}</version>
1423-
<configuration>
1424-
<!-- store outside of target to speed up formatting when mvn clean is used -->
1425-
<cachedir>.cache/impsort-maven-plugin-${version.impsort-maven-plugin}</cachedir>
1426-
<groups>org.openjdk.jmh.,java.,javax.,jakarta.,org.hibernate., org.hibernate.testing., org.hibernate.test., org.junit., org.jboss., com., *</groups>
1427-
<staticGroups>*</staticGroups>
1428-
<!-- To make static imports go on top: -->
1429-
<staticAfter>false</staticAfter>
1430-
<skip>${format.skip}</skip>
1431-
<removeUnused>true</removeUnused>
1432-
</configuration>
1433-
<executions>
1434-
<execution>
1435-
<id>import-sorting</id>
1436-
<goals>
1437-
<goal>${goal.impsort-maven-plugin}</goal>
1438-
</goals>
1439-
<phase>process-sources</phase>
1440-
</execution>
1441-
</executions>
1442-
</plugin>
1443-
<plugin>
1444-
<groupId>net.revelc.code.formatter</groupId>
1445-
<artifactId>formatter-maven-plugin</artifactId>
1446-
<version>${version.formatter-maven-plugin}</version>
1447-
<dependencies>
1448-
<dependency>
1449-
<groupId>org.hibernate.validator</groupId>
1450-
<artifactId>hibernate-validator-build-config</artifactId>
1451-
<version>${project.version}</version>
1452-
</dependency>
1453-
</dependencies>
1454-
<configuration>
1455-
<!-- store outside of target to speed up formatting when mvn clean is used -->
1456-
<cachedir>.cache/formatter-maven-plugin-${version.formatter-maven-plugin}</cachedir>
1457-
<configFile>hibernate_validator_style.xml</configFile>
1458-
<skip>${format.skip}</skip>
1459-
<removeTrailingWhitespace>true</removeTrailingWhitespace>
1460-
<skipJsonFormatting>true</skipJsonFormatting>
1461-
<skipHtmlFormatting>true</skipHtmlFormatting>
1462-
</configuration>
1463-
<executions>
1464-
<execution>
1465-
<id>code-formatting</id>
1466-
<goals>
1467-
<goal>${goal.formatter-maven-plugin}</goal>
1468-
</goals>
1469-
<phase>process-sources</phase>
1470-
</execution>
1471-
</executions>
1472-
</plugin>
14731365
<plugin>
14741366
<groupId>com.diffplug.spotless</groupId>
14751367
<artifactId>spotless-maven-plugin</artifactId>
@@ -1899,8 +1791,6 @@
18991791
<profile>
19001792
<id>ci-build</id>
19011793
<properties>
1902-
<goal.impsort-maven-plugin>check</goal.impsort-maven-plugin>
1903-
<goal.formatter-maven-plugin>validate</goal.formatter-maven-plugin>
19041794
</properties>
19051795
</profile>
19061796
<profile>

0 commit comments

Comments
 (0)