You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ff...@apache.org on 2019/04/01 07:25:41 UTC
[karaf] branch jdk13 created (now a33ad72)
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a change to branch jdk13
in repository https://gitbox.apache.org/repos/asf/karaf.git.
at a33ad72 [KARAF-6221]ensure karaf can build and run with JDK13 EA-initial commit
This branch includes the following new commits:
new a33ad72 [KARAF-6221]ensure karaf can build and run with JDK13 EA-initial commit
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[karaf] 01/01: [KARAF-6221]ensure karaf can build and run with
JDK13 EA-initial commit
Posted by ff...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch jdk13
in repository https://gitbox.apache.org/repos/asf/karaf.git
commit a33ad72844dbdcf111edcb1e651a2c8042c5402f
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Mon Apr 1 15:25:21 2019 +0800
[KARAF-6221]ensure karaf can build and run with JDK13 EA-initial commit
---
.../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 ++++++
.../test/java/org/apache/karaf/itests/examples/RestExampleTest.java | 4 +++-
main/src/test/resources/test-karaf-home/etc/config.properties | 6 ++++++
main/src/test/resources/test-karaf-home/etc/jre.properties | 1 +
pom.xml | 6 +++---
8 files changed, 32 insertions(+), 4 deletions(-)
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 03a7c9a..7ae0f7d 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
@@ -123,6 +123,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-13= 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,12.0,13.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,12.0,13.0", \
+ osgi.ee; osgi.ee="JavaSE/compact2"; version:List<Version>="1.8,9.0,10.0,11.0,12.0,13.0", \
+ osgi.ee; osgi.ee="JavaSE/compact3"; version:List<Version>="1.8,9.0,10.0,11.0,12.0,13.0"
eecap-12= 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,12.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 16b38be..c479a7d 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
@@ -725,3 +725,4 @@ jre-9= \
jre-10 = ${jre-9}
jre-11 = ${jre-10}
jre-12 = ${jre-11}
+jre-13 = ${jre-12}
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 ff926f6..05c597d 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
@@ -127,6 +127,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-13= 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,12.0,13.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,12.0,13.0", \
+ osgi.ee; osgi.ee="JavaSE/compact2"; version:List<Version>="1.8,9.0,10.0,11.0,12.0,13.0", \
+ osgi.ee; osgi.ee="JavaSE/compact3"; version:List<Version>="1.8,9.0,10.0,11.0,12.0,13.0"
eecap-12= 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,12.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 f2d7c95..acc5f73 100644
--- a/itests/test/src/test/filtered-resources/etc/config.properties
+++ b/itests/test/src/test/filtered-resources/etc/config.properties
@@ -99,6 +99,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-13= 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,12.0,13.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,12.0,13.0", \
+ osgi.ee; osgi.ee="JavaSE/compact2"; version:List<Version>="1.8,9.0,10.0,11.0,12.0,13.0", \
+ osgi.ee; osgi.ee="JavaSE/compact3"; version:List<Version>="1.8,9.0,10.0,11.0,12.0,13.0"
eecap-12= 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,12.0", \
osgi.ee; osgi.ee="JRE"; version:List<Version>="1.0,1.1", \
diff --git a/itests/test/src/test/java/org/apache/karaf/itests/examples/RestExampleTest.java b/itests/test/src/test/java/org/apache/karaf/itests/examples/RestExampleTest.java
index 0a700a7..06f3c39 100644
--- a/itests/test/src/test/java/org/apache/karaf/itests/examples/RestExampleTest.java
+++ b/itests/test/src/test/java/org/apache/karaf/itests/examples/RestExampleTest.java
@@ -79,9 +79,11 @@ public class RestExampleTest extends KarafTestSupport {
installAndAssertFeature("karaf-rest-example-whiteboard");
String output = executeCommand("http:list");
- while (!output.contains("Deployed")) {
+ int i = 0;
+ while (!output.contains("Deployed") && i < 50) {
Thread.sleep(500);
output = executeCommand("http:list");
+ i++;
}
System.out.println(output);
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 693d424..9bbeca5 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,12 @@ org.osgi.framework.system.packages= \
org.osgi.framework.system.capabilities= \
${eecap-${java.specification.version}}
+eecap-13= 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,12.0,13.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,12.0,13.0", \
+ osgi.ee; osgi.ee="JavaSE/compact2"; version:List<Version>="1.8,9.0,10.0,11.0,12.0,13.0", \
+ osgi.ee; osgi.ee="JavaSE/compact3"; version:List<Version>="1.8,9.0,10.0,11.0,12.0,13.0"
eecap-12= 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,12.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 4c14205..f6525ca 100644
--- a/main/src/test/resources/test-karaf-home/etc/jre.properties
+++ b/main/src/test/resources/test-karaf-home/etc/jre.properties
@@ -739,4 +739,5 @@ jre-9= \
jre-10 = ${jre-9}
jre-11 = ${jre-10}
jre-12 = ${jre-11}
+jre-13 = ${jre-12}
diff --git a/pom.xml b/pom.xml
index 6da0f67..e21508f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -243,7 +243,7 @@
<aries.jndi.url.version>1.1.0</aries.jndi.url.version>
<aries.proxy.version>1.1.5-SNAPSHOT</aries.proxy.version>
<aries.proxy.api.version>1.1.0</aries.proxy.api.version>
- <aries.spifly.version>1.2</aries.spifly.version>
+ <aries.spifly.version>1.2.2-SNAPSHOT</aries.spifly.version>
<aries.subsystem.api.version>2.0.10</aries.subsystem.api.version>
<aries.subsystem.core.version>2.0.10</aries.subsystem.core.version>
<aries.transaction.manager.version>1.3.3</aries.transaction.manager.version>
@@ -287,7 +287,7 @@
<pax.base.version>1.5.0</pax.base.version>
<pax.swissbox.version>1.8.3</pax.swissbox.version>
<pax.url.version>2.6.1</pax.url.version>
- <pax.web.version>7.2.8</pax.web.version>
+ <pax.web.version>7.2.9-SNAPSHOT</pax.web.version>
<pax.tinybundle.version>3.0.0</pax.tinybundle.version>
<pax.jdbc.version>1.3.4</pax.jdbc.version>
<pax.jms.version>1.0.3</pax.jms.version>
@@ -313,7 +313,7 @@
<derby-version>10.12.1.1</derby-version>
<directory-version>2.0.0-M24</directory-version>
<struts.bundle.version>1.3.10_1</struts.bundle.version>
- <xbean.version>4.12</xbean.version>
+ <xbean.version>4.14-SNAPSHOT</xbean.version>
<xerces.bundle.version>2.12.0_1</xerces.bundle.version>
<xalan.bundle.version>2.7.2_3</xalan.bundle.version>
<xalan-serializer.bundle.version>2.7.2_1</xalan-serializer.bundle.version>