diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index b9ab6ec..32917f1 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -21,7 +21,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: temurin
- java-version: 17
+ java-version: 21
cache: 'maven'
- name: Check code format
run: |
@@ -32,17 +32,13 @@ jobs:
build_with_integration_tests:
runs-on: ubuntu-latest
- strategy:
- matrix:
- java: [ 17 ]
- kubernetes: [ 'v1.26.12', 'v1.27.9', 'v1.28.5' ]
steps:
- uses: actions/checkout@v4
- name: Set up Java and Maven
uses: actions/setup-java@v4
with:
distribution: temurin
- java-version: ${{ matrix.java }}
+ java-version: 21
cache: 'maven'
- name: Run integration tests
run: ./mvnw ${MAVEN_ARGS} clean install
diff --git a/pom.xml b/pom.xml
index 3bb9a7c..723405a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,21 +25,19 @@
- 17
- 17
- UTF-8
+ 21
+ ${java.version}
${java.version}
${java.version}
+ UTF-8
3.2.5
6.11.0
- 1.0
- 1.9.0
- 2.23.0
24.0.0
5.11.0
0.9.11
6.6.7
3.25.3
+ 2.43.0
@@ -140,30 +138,6 @@
-
-
-
- net.revelc.code
- impsort-maven-plugin
- ${impsort-maven-plugin.version}
-
- .cache
- java.,javax.,org.,io.,com.
- *
- true
- true
-
-
-
- net.revelc.code.formatter
- formatter-maven-plugin
- ${formatter-maven-plugin.version}
-
- .cache
-
-
-
-
io.quarkus
@@ -212,49 +186,27 @@
3.13.0
- org.commonjava.maven.plugins
- directory-maven-plugin
- ${directory-maven-plugin.version}
-
-
- directories
-
- highest-basedir
-
- initialize
-
- resourceglueoperator.project.root
-
-
-
-
-
- net.revelc.code.formatter
- formatter-maven-plugin
-
-
-
- format
-
-
-
- ${resourceglueoperator.project.root}/contributing/eclipse-google-style.xml
-
-
-
-
-
-
- net.revelc.code
- impsort-maven-plugin
-
-
- sort
-
- sort
-
-
-
+ com.diffplug.spotless
+ spotless-maven-plugin
+ ${spotless.version}
+
+
+
+ pom.xml
+ ./**/pom.xml
+
+
+
+
+
+ contributing/eclipse-google-style.xml
+
+
+ contributing/eclipse.importorder
+
+
+
+