diff --git a/itests/src/test/filtered-resources/etc/config.properties b/itests/src/test/filtered-resources/etc/config.properties index 723b46d..7fd438e 100644 --- a/itests/src/test/filtered-resources/etc/config.properties +++ b/itests/src/test/filtered-resources/etc/config.properties @@ -98,7 +98,12 @@ 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-10= osgi.ee; osgi.ee="OSGi/Minimum"; version:List="1.0,1.1,1.2", \ + osgi.ee; osgi.ee="JavaSE"; version:List="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9.0,10.0", \ + osgi.ee; osgi.ee="JRE"; version:List="1.0,1.1", \ + osgi.ee; osgi.ee="JavaSE/compact1"; version:List="1.8,9.0,10.0", \ + osgi.ee; osgi.ee="JavaSE/compact2"; version:List="1.8,9.0,10.0", \ + osgi.ee; osgi.ee="JavaSE/compact3"; version:List="1.8,9.0,10.0" eecap-9= osgi.ee; osgi.ee="OSGi/Minimum"; version:List="1.0,1.1,1.2", \ osgi.ee; osgi.ee="JavaSE"; version:List="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9" eecap-1.8= osgi.ee; osgi.ee="OSGi/Minimum"; version:List="1.0,1.1,1.2", \ diff --git a/itests/src/test/java/org/apache/karaf/itests/HttpTest.java b/itests/src/test/java/org/apache/karaf/itests/HttpTest.java index e90a65e..a0a8c85 100644 --- a/itests/src/test/java/org/apache/karaf/itests/HttpTest.java +++ b/itests/src/test/java/org/apache/karaf/itests/HttpTest.java @@ -37,6 +37,7 @@ public class HttpTest extends KarafTestSupport { @Before public void installHttpFeature() throws Exception { + installAndAssertFeature("aries-proxy");//ensure asm6.1 get installed installAndAssertFeature("webconsole"); } 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 c30059b..556f01f 100755 --- a/main/src/test/resources/test-karaf-home/etc/config.properties +++ b/main/src/test/resources/test-karaf-home/etc/config.properties @@ -64,7 +64,12 @@ org.osgi.framework.system.packages= \ org.osgi.framework.system.capabilities= \ ${eecap-${java.specification.version}} - +eecap-10= osgi.ee; osgi.ee="OSGi/Minimum"; version:List="1.0,1.1,1.2", \ + osgi.ee; osgi.ee="JavaSE"; version:List="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9.0,10.0", \ + osgi.ee; osgi.ee="JRE"; version:List="1.0,1.1", \ + osgi.ee; osgi.ee="JavaSE/compact1"; version:List="1.8,9.0,10.0", \ + osgi.ee; osgi.ee="JavaSE/compact2"; version:List="1.8,9.0,10.0", \ + osgi.ee; osgi.ee="JavaSE/compact3"; version:List="1.8,9.0,10.0" eecap-9= osgi.ee; osgi.ee="OSGi/Minimum"; version:List="1.0,1.1,1.2", \ osgi.ee; osgi.ee="JavaSE"; version:List="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,1.9" eecap-1.8= osgi.ee; osgi.ee="OSGi/Minimum"; version:List="1.0,1.1,1.2", \ 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 3bc13ec..189ee96 100644 --- a/main/src/test/resources/test-karaf-home/etc/jre.properties +++ b/main/src/test/resources/test-karaf-home/etc/jre.properties @@ -736,3 +736,4 @@ jre-9= \ org.xml.sax, \ org.xml.sax.ext, \ org.xml.sax.helpers +jre-10 = ${jre-9} diff --git a/pom.xml b/pom.xml index 81c3ec5..bd9b63f 100644 --- a/pom.xml +++ b/pom.xml @@ -145,7 +145,7 @@ 1.7.4_1 1.9.7_1 2.7.7_5 - 6.0 + 6.1 3.1.0 3.2.4_1 2.2.0 @@ -236,7 +236,7 @@ 1.1.0 1.0.2 1.1.0 - 1.1.1 + 1.1.2-SNAPSHOT 1.1.0 1.0.10 2.0.10 @@ -273,7 +273,7 @@ 5.0.0 1.0.0 - 4.11.0 + 4.12.0-SNAPSHOT 1.10.1 1.5.0 1.8.3 @@ -1864,7 +1864,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.20.1 + 2.21.0 once ${surefire.argLine} @@ -2363,9 +2363,8 @@ - java9 + java9-plus - 3.5 --add-opens java.base/java.security=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED @@ -2375,7 +2374,7 @@ --add-modules java.activation,java.xml.ws.annotation,java.corba,java.transaction,java.xml.bind,java.xml.ws - 9 + [9,) diff --git a/tooling/karaf-maven-plugin/pom.xml b/tooling/karaf-maven-plugin/pom.xml index 2872122..46487e3 100644 --- a/tooling/karaf-maven-plugin/pom.xml +++ b/tooling/karaf-maven-plugin/pom.xml @@ -392,7 +392,7 @@ - java9 + java9-plus 3.1.0 --add-exports=java.base/sun.net.www.protocol.http=ALL-UNNAMED --add-exports=java.base/sun.net.www.protocol.https=ALL-UNNAMED --add-exports=java.xml.bind/com.sun.xml.internal.bind.v2.runtime=ALL-UNNAMED --add-exports=jdk.xml.dom/org.w3c.dom.html=ALL-UNNAMED --add-modules java.activation,java.xml.ws.annotation,java.corba,java.transaction,java.xml.bind,java.xml.ws -Djava.io.tmpdir=${project.build.directory} @@ -452,7 +452,7 @@ - 9 + [9,)