diff --git a/.travis.yml b/.travis.yml
index 32bfdf3..1ac97a1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
install: mvn install --quiet -DskipTests=true -B
language: java
jdk:
- - openjdk8
+ - openjdk21
diff --git a/Jenkinsfile b/Jenkinsfile
index c7b4e28..29fe5ce 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -78,7 +78,7 @@ pipeline {
timeout(time: 1, unit: 'HOURS')
}
steps{
- withMaven(maven: 'maven-latest', jdk: 'jdk8-latest', globalMavenSettingsConfig: '51e52749-c47a-4e11-9c58-0adf485626f5', mavenSettingsConfig: 'codice-maven-settings', mavenOpts: '${LINUX_MVN_RANDOM}') {
+ withMaven(maven: 'maven-latest', jdk: 'jdk21', globalMavenSettingsConfig: '51e52749-c47a-4e11-9c58-0adf485626f5', mavenSettingsConfig: 'codice-maven-settings', mavenOpts: '${LINUX_MVN_RANDOM}') {
sh 'mvn deploy -nsu -DskipTests=true -Dpmd.skip=true -Dfindbugs.skip=true -Dcheckstyle.skip=true'
}
}
@@ -97,7 +97,7 @@ pipeline {
timeout(time: 1, unit: 'HOURS')
}
steps {
- withMaven(maven: 'maven-latest', jdk: 'jdk11', globalMavenSettingsConfig: '51e52749-c47a-4e11-9c58-0adf485626f5', mavenSettingsConfig: 'feca3f61-1da1-4887-a9ad-dd4a41fd4423', mavenOpts: '${LARGE_MVN_OPTS} ${LINUX_MVN_RANDOM}') {
+ withMaven(maven: 'maven-latest', jdk: 'jdk21', globalMavenSettingsConfig: '51e52749-c47a-4e11-9c58-0adf485626f5', mavenSettingsConfig: 'feca3f61-1da1-4887-a9ad-dd4a41fd4423', mavenOpts: '${LARGE_MVN_OPTS} ${LINUX_MVN_RANDOM}') {
sh 'mvn clean -q -B -DskipTests=true -Dfindbugs.skip=true -Dcheckstyle.skip=true org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN -Dsonar.organization=codice -Dsonar.projectKey=ddf-support:master -Dsonar.organization=codice'
}
}
diff --git a/pom.xml b/pom.xml
index 14e8289..7a81ad7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,23 +42,25 @@
- 1.8
- 1.8
+ 21
+ 21
- 0.1
+ 0.4-SNAPSHOT
2.2.2
2.4.1
2.5
2.7
- 3.0.0-M1
+ 3.1.0
3.4
2.4
2.3.2
- 3.0.0-M1
+ 3.1.0
2.3.1
- 2.18.1
- 0.8.1
+ 3.5.2
+ 0.8.12
+ 3.14.0
+ 3.3
diff --git a/support-githooks/pom.xml b/support-githooks/pom.xml
index 3cd4f0d..7b087f0 100644
--- a/support-githooks/pom.xml
+++ b/support-githooks/pom.xml
@@ -161,10 +161,10 @@
org.apache.maven.plugins
maven-compiler-plugin
- 3.3
+ ${maven.compiler.plugin.version}
- 1.8
- 1.8
+ 21
+ 21
diff --git a/support-karaf/pom.xml b/support-karaf/pom.xml
index 4081e67..82d10d1 100644
--- a/support-karaf/pom.xml
+++ b/support-karaf/pom.xml
@@ -38,7 +38,7 @@
org.apache.felix
maven-bundle-plugin
- 3.2.0
+ 5.1.9
true
@@ -49,10 +49,10 @@
org.apache.maven.plugins
maven-compiler-plugin
- 3.3
+ ${maven.compiler.plugin.version}
- 1.8
- 1.8
+ 21
+ 21
512M
${compiler.fork}
${project.build.sourceEncoding}
diff --git a/support-maven/bundle-validation-plugin/pom.xml b/support-maven/bundle-validation-plugin/pom.xml
index 29782c6..26ef496 100644
--- a/support-maven/bundle-validation-plugin/pom.xml
+++ b/support-maven/bundle-validation-plugin/pom.xml
@@ -32,8 +32,7 @@
3.6.0
3.6.0
4.12
- 1.10.19
- 3.5
+ 5.14.0
@@ -46,6 +45,7 @@
org.apache.maven
maven-plugin-api
${maven.plugin.api.version}
+ provided
org.apache.maven.plugin-tools
@@ -56,6 +56,7 @@
org.apache.maven
maven-core
${maven.core.version}
+ provided
junit
@@ -65,8 +66,8 @@
org.mockito
- mockito-all
- ${mockito-all.version}
+ mockito-core
+ ${mockito.version}
test
@@ -77,6 +78,9 @@
org.apache.maven.plugins
maven-plugin-plugin
${maven.plugin.plugin.version}
+
+ maven-plugin-plugin
+
org.jacoco
diff --git a/support-maven/version-validation-plugin/pom.xml b/support-maven/version-validation-plugin/pom.xml
index 2ffb34b..f7cadcc 100644
--- a/support-maven/version-validation-plugin/pom.xml
+++ b/support-maven/version-validation-plugin/pom.xml
@@ -24,56 +24,53 @@
version-validation-plugin
- 1.8
- 1.8
+ 21
+ 21
org.apache.maven
maven-plugin-api
- 2.0
+ 3.9.9
+ provided
org.apache.maven.plugin-tools
maven-plugin-annotations
- 3.2
+ 3.14.0
provided
org.glassfish
- javax.json
- 1.0.4
+ jakarta.json
+ 2.0.1
org.apache.commons
commons-lang3
- 3.5
+ 3.17.0
org.codehaus.plexus
plexus-utils
- 3.0.8
+ 4.0.0
-
- org.apache.maven
- maven-project
- 3.0-alpha-2
-
commons-io
commons-io
- 2.5
+ 2.16.1
org.apache.maven
maven-core
3.3.9
+ provided
junit
@@ -85,6 +82,14 @@
+
+ org.apache.maven.plugins
+ maven-plugin-plugin
+ ${maven.plugin.plugin.version}
+
+ maven-plugin-plugin
+
+
org.apache.maven.plugins
maven-surefire-plugin
diff --git a/support-maven/version-validation-plugin/src/main/java/org/codice/plugin/version/MavenVersionValidationPlugin.java b/support-maven/version-validation-plugin/src/main/java/org/codice/plugin/version/MavenVersionValidationPlugin.java
index 925e37a..d8f2d78 100644
--- a/support-maven/version-validation-plugin/src/main/java/org/codice/plugin/version/MavenVersionValidationPlugin.java
+++ b/support-maven/version-validation-plugin/src/main/java/org/codice/plugin/version/MavenVersionValidationPlugin.java
@@ -24,10 +24,10 @@
import java.util.Map;
import java.util.Set;
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
-import javax.json.JsonValue;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonReader;
+import jakarta.json.JsonValue;
import org.apache.commons.io.FileUtils;
import org.apache.maven.plugin.AbstractMojo;