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/03/27 03:33:48 UTC

[karaf] branch jdk12 updated: [KARAF-6203]ensure karaf can build and run with JDK12-fix MavenResolverRegisteredBeforeConfigAdminTest

This is an automated email from the ASF dual-hosted git repository.

ffang pushed a commit to branch jdk12
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/jdk12 by this push:
     new 63f046f  [KARAF-6203]ensure karaf can build and run with JDK12-fix MavenResolverRegisteredBeforeConfigAdminTest
63f046f is described below

commit 63f046fb703bfcabae7d246e29a6822a1be37656
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Wed Mar 27 11:33:34 2019 +0800

    [KARAF-6203]ensure karaf can build and run with JDK12-fix MavenResolverRegisteredBeforeConfigAdminTest
---
 itests/test/src/test/filtered-resources/etc/config.properties | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/itests/test/src/test/filtered-resources/etc/config.properties b/itests/test/src/test/filtered-resources/etc/config.properties
index a563ca5..f2d7c95 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-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", \
+ osgi.ee; osgi.ee="JavaSE/compact1"; version:List<Version>="1.8,9.0,10.0,11.0,12.0", \
+ osgi.ee; osgi.ee="JavaSE/compact2"; version:List<Version>="1.8,9.0,10.0,11.0,12.0", \
+ osgi.ee; osgi.ee="JavaSE/compact3"; version:List<Version>="1.8,9.0,10.0,11.0,12.0"
 eecap-11= 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", \
  osgi.ee; osgi.ee="JRE"; version:List<Version>="1.0,1.1", \