This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch karaf-4.2.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/karaf-4.2.x by this push:
new 27d2ffb [KARAF-6829] Add JDK15 support
27d2ffb is described below
commit 27d2ffbf4512d2877d339fd29e4a483cec40f823
Author: jbonofre <jbono...@apache.org>
AuthorDate: Mon Aug 31 20:41:51 2020 +0200
[KARAF-6829] Add JDK15 support
(cherry picked from commit 04019182448ef7c3674f84708ca058f44b23eefb)
---
.../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 | 7 +++++++
main/src/test/resources/test-karaf-home/etc/config.properties | 7 +++++++
main/src/test/resources/test-karaf-home/etc/jre.properties | 1 +
6 files changed, 28 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 796cc02..4d9a7cf 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-15 = 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",
\
+ 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", \
+ osgi.ee; osgi.ee="JavaSE/compact2";
version:List<Version>="1.8,9.0,10.0,11.0,13.0,14.0,15.0", \
+ osgi.ee; osgi.ee="JavaSE/compact3";
version:List<Version>="1.8,9.0,10.0,11.0,13.0,14.0,15.0"
eecap-14 = 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",
\
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 27e253e..0f408ab 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
@@ -695,3 +695,4 @@ jre-10 = ${jre-9}
jre-11 = ${jre-10}
jre-13 = ${jre-11}
jre-14 = ${jre-13}
+jre-15 = ${jre-14}
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 e71fb58..d50a4be 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-15= 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,15.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,15.0", \
+ osgi.ee; osgi.ee="JavaSE/compact2";
version:List<Version>="1.8,9.0,10.0,11.0,13.0,15.0", \
+ osgi.ee; osgi.ee="JavaSE/compact3";
version:List<Version>="1.8,9.0,10.0,11.0,13.0,15.0"
eecap-14= 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",
\
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 44a8c1a..e1e381b 100644
--- a/itests/test/src/test/filtered-resources/etc/config.properties
+++ b/itests/test/src/test/filtered-resources/etc/config.properties
@@ -99,6 +99,13 @@ org.osgi.framework.system.capabilities= \
osgi.service;effective:=active;objectClass=org.osgi.service.resolver.Resolver, \
osgi.service;effective:=active;objectClass=org.osgi.service.startlevel.StartLevel,
\
osgi.service;effective:=active;objectClass=org.osgi.service.url.URLHandlers
+
+eecap-15= 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",
\
+ 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", \
+ osgi.ee; osgi.ee="JavaSE/compact2";
version:List<Version>="1.8,9.0,10.0,11.0,13.0,14.0,15.0", \
+ osgi.ee; osgi.ee="JavaSE/compact3";
version:List<Version>="1.8,9.0,10.0,11.0,13.0,14.0,15.0"
eecap-14= 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",
\
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 1a40318..8fa829b 100755
--- a/main/src/test/resources/test-karaf-home/etc/config.properties
+++ b/main/src/test/resources/test-karaf-home/etc/config.properties
@@ -64,6 +64,13 @@ org.osgi.framework.system.packages= \
org.osgi.framework.system.capabilities= \
${eecap-${java.specification.version}}
+
+eecap-15= 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",
\
+ 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", \
+ osgi.ee; osgi.ee="JavaSE/compact2";
version:List<Version>="1.8,9.0,10.0,11.0,13.0,14.0,15.0", \
+ osgi.ee; osgi.ee="JavaSE/compact3";
version:List<Version>="1.8,9.0,10.0,11.0,13.0,14.0,15.0"
eecap-14= 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",
\
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 67ebedc..a1b74a3 100644
--- a/main/src/test/resources/test-karaf-home/etc/jre.properties
+++ b/main/src/test/resources/test-karaf-home/etc/jre.properties
@@ -709,3 +709,4 @@ jre-10 = ${jre-9}
jre-11 = ${jre-10}
jre-13 = ${jre-11}
jre-14 = ${jre-13}
+jre-15 = ${jre-14}
