This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/main by this push:
new f20d9c03fd [#7696] Add JDK 19/20/21 support
new ef2a12142b Merge pull request #1723 from mattrpav/KARAF-7696
f20d9c03fd is described below
commit f20d9c03fd35a93d5a8a2ea5e2441392062a2c53
Author: Matt Pavlovich <m...@hyte.io>
AuthorDate: Wed Jun 14 10:11:09 2023 -0500
[#7696] Add JDK 19/20/21 support
---
Jenkinsfile | 33 ++++++++++++++++++++--
.../resources/etc/config.properties | 18 ++++++++++++
.../resources/etc/jre.properties | 2 ++
3 files changed, 51 insertions(+), 2 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 53dfbd23dc..76deecb42d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -69,9 +69,38 @@ pipeline {
}
}
- stage('Build') {
+ stage('Build JDK 20') {
+ tools {
+ jdk "jdk_20_latest"
+ }
+ steps {
+ echo 'Building JDK 20'
+ sh 'java -version'
+ sh 'mvn -version'
+ sh 'mvn -U -B -e clean install -DskipTests'
+ }
+ }
+
+ stage('Build JDK 17') {
+ tools {
+ jdk "jdk_17_latest"
+ }
+ steps {
+ echo 'Building JDK 17'
+ sh 'java -version'
+ sh 'mvn -version'
+ sh 'mvn -U -B -e clean install -DskipTests'
+ }
+ }
+
+ stage('Build JDK 11') {
+ tools {
+ jdk "jdk_11_latest"
+ }
steps {
- echo 'Building'
+ echo 'Building JDK 11'
+ sh 'java -version'
+ sh 'mvn -version'
sh 'mvn -U -B -e clean install -DskipTests -Dinvoker.skip=true
-Prat'
}
}
diff --git
a/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties
b/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties
index 7a3a81b1fd..e012e02ace 100644
---
a/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties
+++
b/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties
@@ -125,6 +125,24 @@ equinox-capabilities= \
osgi.service;objectClass:List<String>=org.eclipse.osgi.service.security.TrustEngine;osgi.signedcontent.trust.engine=org.eclipse.osgi,
\
osgi.service;objectClass:List<String>=org.eclipse.osgi.service.urlconversion.URLConverter;protocol:List<String>="bundleentry,bundleresource"
+eecap-21 = osgi.ee; osgi.ee="OSGi/Minimum";
version:List<Version>="1.0,1.1,1.2", \
+ osgi.ee; osgi.ee="JavaSE";
version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0,20.0,21.0",
\
+ osgi.ee; osgi.ee="JRE"; version:List<Version>="1.0,1.1", \
+ osgi.ee; osgi.ee="JavaSE/compact1";
version:List<Version>="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0,20.0,21.0",
\
+ osgi.ee; osgi.ee="JavaSE/compact2";
version:List<Version>="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0,20.0,21.0",
\
+ osgi.ee; osgi.ee="JavaSE/compact3";
version:List<Version>="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0,20.0,21.0"
+eecap-20 = osgi.ee; osgi.ee="OSGi/Minimum";
version:List<Version>="1.0,1.1,1.2", \
+ osgi.ee; osgi.ee="JavaSE";
version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0,20.0",
\
+ osgi.ee; osgi.ee="JRE"; version:List<Version>="1.0,1.1", \
+ osgi.ee; osgi.ee="JavaSE/compact1";
version:List<Version>="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0,20.0",
\
+ osgi.ee; osgi.ee="JavaSE/compact2";
version:List<Version>="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0,20.0",
\
+ osgi.ee; osgi.ee="JavaSE/compact3";
version:List<Version>="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0,20.0"
+eecap-19 = osgi.ee; osgi.ee="OSGi/Minimum";
version:List<Version>="1.0,1.1,1.2", \
+ osgi.ee; osgi.ee="JavaSE";
version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0",
\
+ osgi.ee; osgi.ee="JRE"; version:List<Version>="1.0,1.1", \
+ osgi.ee; osgi.ee="JavaSE/compact1";
version:List<Version>="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0", \
+ osgi.ee; osgi.ee="JavaSE/compact2";
version:List<Version>="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0", \
+ osgi.ee; osgi.ee="JavaSE/compact3";
version:List<Version>="1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0"
eecap-18 = osgi.ee; osgi.ee="OSGi/Minimum";
version:List<Version>="1.0,1.1,1.2", \
osgi.ee; osgi.ee="JavaSE";
version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0",
\
osgi.ee; osgi.ee="JRE"; version:List<Version>="1.0,1.1", \
diff --git
a/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties
b/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties
index 871e77b080..5791023c57 100644
---
a/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties
+++
b/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties
@@ -501,3 +501,5 @@ jre-16 = ${jre-15}
jre-17 = ${jre-16}
jre-18 = ${jre-17}
jre-19 = ${jre-18}
+jre-20 = ${jre-19}
+jre-21 = ${jre-20}
