You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pa...@apache.org on 2017/11/07 13:55:43 UTC
svn commit: r1814500 - in /felix/trunk/framework/src/main:
java/org/apache/felix/framework/util/Util.java resources/default.properties
Author: pauls
Date: Tue Nov 7 13:55:43 2017
New Revision: 1814500
URL: http://svn.apache.org/viewvc?rev=1814500&view=rev
Log:
FELIX-5742: Add a felix.detect.jpms property that maps to jpms and use that in the default properties to be able to work with future java versions ootb (just using the current java9 definitions).
Modified:
felix/trunk/framework/src/main/java/org/apache/felix/framework/util/Util.java
felix/trunk/framework/src/main/resources/default.properties
Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/util/Util.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/Util.java?rev=1814500&r1=1814499&r2=1814500&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/util/Util.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/util/Util.java Tue Nov 7 13:55:43 2017
@@ -116,6 +116,7 @@ public class Util
properties.put("felix.detect.jpms." + name, name);
}
}
+ properties.put("felix.detect.jpms", "jpms");
}
catch (Exception ex)
{
Modified: felix/trunk/framework/src/main/resources/default.properties
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/resources/default.properties?rev=1814500&r1=1814499&r2=1814500&view=diff
==============================================================================
--- felix/trunk/framework/src/main/resources/default.properties (original)
+++ felix/trunk/framework/src/main/resources/default.properties Tue Nov 7 13:55:43 2017
@@ -21,7 +21,7 @@
# New-style generic execution environment capabilities.
org.osgi.framework.system.capabilities= \
- ${dollar}{felix.service.caps}, ${dollar}{eecap-${dollar}{java.specification.version}}
+ ${dollar}{felix.service.caps} ${dollar}{eecap-${dollar}{java.specification.version}} ${dollar}{eecap-${dollar}{felix.detect.jpms}}
# Native Processor Aliases. Format is felix.native.processor.alias.<normalized Processor Name>=alias1,alias2
felix.native.processor.alias.68k=
@@ -75,34 +75,34 @@ felix.service.caps=osgi.service; objectC
osgi.service; objectClass:List<String>=org.osgi.service.startlevel.StartLevel; uses:=org.osgi.service.startlevel, \
osgi.service; objectClass:List<String>=org.osgi.service.packageadmin.PackageAdmin; uses:=org.osgi.service.packageadmin
-eecap-9= osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \
+eecap-jpms=, 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", \
osgi.ee; osgi.ee="JavaSE/compact1"; version:List<Version>="1.8,9", \
osgi.ee; osgi.ee="JavaSE/compact2"; version:List<Version>="1.8,9", \
osgi.ee; osgi.ee="JavaSE/compact3"; version:List<Version>="1.8,9"
-eecap-1.8= osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \
+eecap-1.8=, 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", \
osgi.ee; osgi.ee="JavaSE/compact1"; version:List<Version>="1.8", \
osgi.ee; osgi.ee="JavaSE/compact2"; version:List<Version>="1.8", \
osgi.ee; osgi.ee="JavaSE/compact3"; version:List<Version>="1.8"
-eecap-1.7= osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \
+eecap-1.7=, 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"
-eecap-1.6= osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \
+eecap-1.6=, 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"
-eecap-1.5= osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \
+eecap-1.5=, 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"
-eecap-1.4= osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \
+eecap-1.4=, 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"
-eecap-1.3= osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1", \
+eecap-1.3=, osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1", \
osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0,1.1,1.2,1.3"
-eecap-1.2= osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1", \
+eecap-1.2=, osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1", \
osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0,1.1,1.2"
# Deprecated old-style execution environment properties.
org.osgi.framework.executionenvironment= \
- ${dollar}{ee-${dollar}{java.specification.version}}
+ ${dollar}{ee-${dollar}{java.specification.version}} ${dollar}{ee-${dollar}{felix.detect.jpms}}
-ee-9=JavaSE-9,JavaSE-1.8,JavaSE-1.7,JavaSE-1.6,J2SE-1.5,J2SE-1.4,J2SE-1.3, \
+ee-jpms=JavaSE-9,JavaSE-1.8,JavaSE-1.7,JavaSE-1.6,J2SE-1.5,J2SE-1.4,J2SE-1.3, \
J2SE-1.2,JRE-1.1,JRE-1.0,OSGi/Minimum-1.2,OSGi/Minimum-1.1, \
OSGi/Minimum-1.0
ee-1.8=JavaSE-1.8,JavaSE-1.7,JavaSE-1.6,J2SE-1.5,J2SE-1.4,J2SE-1.3, \
@@ -141,7 +141,8 @@ org.osgi.framework.system.packages=org.o
org.osgi.service.startlevel; version=1.1.0, \
org.osgi.service.url; version=1.0.0, \
org.osgi.util.tracker; version=1.5.1 \
- ${dollar}{jre-${dollar}{java.specification.version}}
+ ${dollar}{jre-${dollar}{java.specification.version}} \
+ ${dollar}{jre-${dollar}{felix.detect.jpms}} \
#
# Java platform package export properties.
@@ -863,7 +864,7 @@ jre-1.8=, \
org.xml.sax.ext;version="0.0.0.1_008_JavaSE";uses:="org.xml.sax,org.xml.sax.helpers", \
org.xml.sax.helpers;version="0.0.0.1_008_JavaSE";uses:="org.xml.sax"
-jre-9=${dollar}{felix.jpms.felix.default}
+jre-jpms=${dollar}{felix.jpms.felix.default}
felix.jpms.java.se= \
${dollar}{felix.jpms.${dollar}{felix.detect.jpms.java.base}} \