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 ba643b1 [KARAF-7266] Prepare Karaf to run/build with JDK 18
new a512e5d Merge pull request #1482 from jbonofre/KARAF-7266
ba643b1 is described below
commit ba643b107c402380ad764cfa5ecb982db5a650e8
Author: Jean-Baptiste Onofré <jbono...@apache.org>
AuthorDate: Sat Jan 8 06:56:31 2022 +0100
[KARAF-7266] Prepare Karaf to run/build with JDK 18
---
.../src/main/filtered-resources/resources/etc/config.properties | 6 ++++++
.../base/src/main/filtered-resources/resources/etc/jre.properties | 1 +
.../org/apache/karaf/instance/resources/etc/config.properties | 6 ++++++
itests/test/src/test/filtered-resources/etc/config.properties | 6 ++++++
main/src/test/resources/test-karaf-home/etc/config.properties | 6 ++++++
main/src/test/resources/test-karaf-home/etc/jre.properties | 1 +
6 files changed, 26 insertions(+)
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 01ef06f..7a3a81b 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,12 @@ 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-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", \
+ 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", \
+ 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", \
+ 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"
eecap-17 = 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",
\
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 944188c..11be98a 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
@@ -812,3 +812,4 @@ jre-14 = ${jre-13}
jre-15 = ${jre-14}
jre-16 = ${jre-15}
jre-17 = ${jre-16}
+jre-18 = ${jre-17}
diff --git
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/config.properties
b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/config.properties
index c5fca02..f59a295 100644
---
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/config.properties
+++
b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/config.properties
@@ -129,6 +129,12 @@ 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-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", \
+ 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", \
+ 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", \
+ 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"
eecap-17 = 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",
\
osgi.ee; osgi.ee="JRE"; version:List<Version>="1.0,1.1", \
diff --git a/itests/test/src/test/filtered-resources/etc/config.properties
b/itests/test/src/test/filtered-resources/etc/config.properties
index 85b80f2..73f73b4 100644
--- a/itests/test/src/test/filtered-resources/etc/config.properties
+++ b/itests/test/src/test/filtered-resources/etc/config.properties
@@ -100,6 +100,12 @@ org.osgi.framework.system.capabilities= \
osgi.service;effective:=active;objectClass=org.osgi.service.startlevel.StartLevel,
\
osgi.service;effective:=active;objectClass=org.osgi.service.url.URLHandlers
+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", \
+ 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", \
+ 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", \
+ 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"
eecap-17 = 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",
\
osgi.ee; osgi.ee="JRE"; version:List<Version>="1.0,1.1", \
diff --git a/main/src/test/resources/test-karaf-home/etc/config.properties
b/main/src/test/resources/test-karaf-home/etc/config.properties
index 3403e40..38f00e8 100755
--- a/main/src/test/resources/test-karaf-home/etc/config.properties
+++ b/main/src/test/resources/test-karaf-home/etc/config.properties
@@ -76,6 +76,12 @@ org.osgi.framework.system.packages= \
org.osgi.framework.system.capabilities= \
${eecap-${java.specification.version}}
+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", \
+ 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", \
+ 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", \
+ 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"
eecap-17 = 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",
\
osgi.ee; osgi.ee="JRE"; version:List<Version>="1.0,1.1", \
diff --git a/main/src/test/resources/test-karaf-home/etc/jre.properties
b/main/src/test/resources/test-karaf-home/etc/jre.properties
index 49cb49d..0f3e488 100644
--- a/main/src/test/resources/test-karaf-home/etc/jre.properties
+++ b/main/src/test/resources/test-karaf-home/etc/jre.properties
@@ -712,3 +712,4 @@ jre-14 = ${jre-13}
jre-15 = ${jre-14}
jre-16 = ${jre-15}
jre-17 = ${jre-16}
+jre-18 = ${jre-17}
