Build with Java 17-ea
diff --git a/Jenkinsfile b/Jenkinsfile
index 008fbf1..39abb05 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -34,7 +34,7 @@
}
agent {
docker {
- label 'ubuntu && !H28 && !H36 && !H40'
+ label 'ubuntu'
image 'apachedirectory/maven-build:jdk-8'
args '-v $HOME/.m2:/home/hnelson/.m2'
}
@@ -57,7 +57,7 @@
}
agent {
docker {
- label 'ubuntu && !H28 && !H36 && !H40'
+ label 'ubuntu'
image 'apachedirectory/maven-build:jdk-8'
args '-v $HOME/.m2:/home/hnelson/.m2'
}
@@ -81,7 +81,7 @@
}
agent {
docker {
- label 'ubuntu && !H28 && !H36 && !H40'
+ label 'ubuntu'
image 'apachedirectory/maven-build:jdk-11'
args '-v $HOME/.m2:/home/hnelson/.m2'
}
@@ -96,15 +96,15 @@
}
}
}
- stage ('Linux Java 14') {
+ stage ('Linux Java 17') {
options {
timeout(time: 4, unit: 'HOURS')
retry(2)
}
agent {
docker {
- label 'ubuntu && !H28 && !H36 && !H40'
- image 'apachedirectory/maven-build:jdk-14'
+ label 'ubuntu'
+ image 'apachedirectory/maven-build:jdk-17'
args '-v $HOME/.m2:/home/hnelson/.m2'
}
}
@@ -149,7 +149,7 @@
retry(2)
}
agent {
- label 'ubuntu && !H28 && !H36 && !H40'
+ label 'ubuntu'
}
// https://cwiki.apache.org/confluence/display/INFRA/JDK+Installation+Matrix
// https://cwiki.apache.org/confluence/display/INFRA/Maven+Installation+Matrix
@@ -173,7 +173,7 @@
}
agent {
docker {
- label 'ubuntu && !H28 && !H36 && !H40'
+ label 'ubuntu'
image 'apachedirectory/maven-build:jdk-8'
args '-v $HOME/.m2:/home/hnelson/.m2'
alwaysPull true
@@ -201,7 +201,7 @@
retry(2)
}
agent {
- label 'ubuntu && !H28 && !H36 && !H40'
+ label 'ubuntu'
}
steps {
unstash 'deb'
@@ -219,7 +219,7 @@
retry(2)
}
agent {
- label 'ubuntu && !H28 && !H36 && !H40'
+ label 'ubuntu'
}
steps {
unstash 'rpm'
@@ -237,7 +237,7 @@
retry(2)
}
agent {
- label 'ubuntu && !H28 && !H36 && !H40'
+ label 'ubuntu'
}
steps {
unstash 'bin'
@@ -255,7 +255,7 @@
retry(2)
}
agent {
- label 'ubuntu && !H28 && !H36 && !H40'
+ label 'ubuntu'
}
steps {
unstash 'archive'
diff --git a/pom.xml b/pom.xml
index 60ae2c8..5bac441 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,7 +80,7 @@
<logback.version>1.2.3</logback.version>
<maven.version>3.8.1</maven.version>
<mina.core.version>2.1.3</mina.core.version>
- <org.apache.felix.version>6.0.3</org.apache.felix.version>
+ <org.apache.felix.version>7.0.0</org.apache.felix.version>
<pax-exam.version>4.13.1</pax-exam.version>
<pax-url.version>2.6.2</pax-url.version>
<plexus.utils.version>3.3.0</plexus.utils.version>