Skip to content

Commit 5bfe6f2

Browse files
csvirimetacosm
csviri
authored and
metacosm
committed
improve: replace current formatting plugins with spotless plugin (#2302)
Signed-off-by: Attila Mészáros <[email protected]>
1 parent ee59b1c commit 5bfe6f2

File tree

22 files changed

+1119
-1165
lines changed

22 files changed

+1119
-1165
lines changed

Diff for: ‎.github/workflows/pr.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ jobs:
2626
cache: 'maven'
2727
- name: Check code format
2828
run: |
29-
./mvnw ${MAVEN_ARGS} formatter:validate -Dconfigfile=$PWD/contributing/eclipse-google-style.xml -pl '!operator-framework-bom' --file pom.xml
30-
./mvnw ${MAVEN_ARGS} impsort:check -pl '!operator-framework-bom' --file pom.xml
29+
./mvnw ${MAVEN_ARGS} spotless:check --file pom.xml
3130
- name: Run unit tests
3231
run: ./mvnw ${MAVEN_ARGS} clean install --file pom.xml
3332

Diff for: ‎bootstrapper-maven-plugin/pom.xml

+26-26
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44

55
<parent>
6-
<artifactId>java-operator-sdk</artifactId>
76
<groupId>io.javaoperatorsdk</groupId>
7+
<artifactId>java-operator-sdk</artifactId>
88
<version>5.0.0-SNAPSHOT</version>
99
</parent>
1010

@@ -72,29 +72,29 @@
7272
</dependencies>
7373

7474
<build>
75-
<plugins>
76-
<plugin>
77-
<groupId>org.apache.maven.plugins</groupId>
78-
<artifactId>maven-plugin-plugin</artifactId>
79-
<version>${maven-plugin-plugin.version}</version>
80-
<configuration>
81-
<goalPrefix>josdk-bootstrapper</goalPrefix>
82-
</configuration>
83-
</plugin>
84-
<plugin>
85-
<groupId>org.codehaus.mojo</groupId>
86-
<artifactId>templating-maven-plugin</artifactId>
87-
<version>${templating-maven-plugin.version}</version>
88-
<executions>
89-
<execution>
90-
<id>filtering-java-templates</id>
91-
<goals>
92-
<goal>filter-sources</goal>
93-
</goals>
94-
</execution>
95-
</executions>
96-
</plugin>
75+
<plugins>
76+
<plugin>
77+
<groupId>org.apache.maven.plugins</groupId>
78+
<artifactId>maven-plugin-plugin</artifactId>
79+
<version>${maven-plugin-plugin.version}</version>
80+
<configuration>
81+
<goalPrefix>josdk-bootstrapper</goalPrefix>
82+
</configuration>
83+
</plugin>
84+
<plugin>
85+
<groupId>org.codehaus.mojo</groupId>
86+
<artifactId>templating-maven-plugin</artifactId>
87+
<version>${templating-maven-plugin.version}</version>
88+
<executions>
89+
<execution>
90+
<id>filtering-java-templates</id>
91+
<goals>
92+
<goal>filter-sources</goal>
93+
</goals>
94+
</execution>
95+
</executions>
96+
</plugin>
9797

98-
</plugins>
98+
</plugins>
9999
</build>
100100
</project>

Diff for: ‎caffeine-bounded-cache-support/pom.xml

+5-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
54
<parent>
6-
<artifactId>java-operator-sdk</artifactId>
75
<groupId>io.javaoperatorsdk</groupId>
6+
<artifactId>java-operator-sdk</artifactId>
87
<version>5.0.0-SNAPSHOT</version>
98
</parent>
10-
<modelVersion>4.0.0</modelVersion>
119

1210
<artifactId>caffeine-bounded-cache-support</artifactId>
1311
<name>Operator SDK - Caffeine Bounded Cache Support</name>
@@ -65,10 +63,10 @@
6563
However, this is needed to compile the tests so let's disable apt just for the compile phase -->
6664
<execution>
6765
<id>default-compile</id>
68-
<phase>compile</phase>
6966
<goals>
7067
<goal>compile</goal>
7168
</goals>
69+
<phase>compile</phase>
7270
<configuration>
7371
<compilerArgs>
7472
<arg>-proc:none</arg>
@@ -80,4 +78,4 @@
8078
</plugins>
8179
</build>
8280

83-
</project>
81+
</project>

Diff for: ‎micrometer-support/pom.xml

+8-10
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
54
<parent>
6-
<artifactId>java-operator-sdk</artifactId>
75
<groupId>io.javaoperatorsdk</groupId>
6+
<artifactId>java-operator-sdk</artifactId>
87
<version>5.0.0-SNAPSHOT</version>
98
</parent>
10-
<modelVersion>4.0.0</modelVersion>
119

1210
<artifactId>micrometer-support</artifactId>
1311
<name>Operator SDK - Micrometer Support</name>
14-
12+
1513
<dependencies>
1614
<dependency>
1715
<groupId>io.micrometer</groupId>
@@ -37,9 +35,9 @@
3735
<scope>test</scope>
3836
</dependency>
3937
<dependency>
40-
<groupId>org.awaitility</groupId>
41-
<artifactId>awaitility</artifactId>
42-
<scope>test</scope>
38+
<groupId>org.awaitility</groupId>
39+
<artifactId>awaitility</artifactId>
40+
<scope>test</scope>
4341
</dependency>
4442
<dependency>
4543
<groupId>io.javaoperatorsdk</groupId>
@@ -54,4 +52,4 @@
5452
</dependency>
5553
</dependencies>
5654

57-
</project>
55+
</project>

0 commit comments

Comments
 (0)