From commits-return-36058-archive-asf-public=cust-asf.ponee.io@karaf.apache.org Wed Mar 27 03:33:55 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 1CE1E180627 for ; Wed, 27 Mar 2019 04:33:53 +0100 (CET) Received: (qmail 76270 invoked by uid 500); 27 Mar 2019 03:33:49 -0000 Mailing-List: contact commits-help@karaf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@karaf.apache.org Delivered-To: mailing list commits@karaf.apache.org Received: (qmail 76260 invoked by uid 99); 27 Mar 2019 03:33:49 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Mar 2019 03:33:49 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id C59D585854; Wed, 27 Mar 2019 03:33:48 +0000 (UTC) Date: Wed, 27 Mar 2019 03:33:48 +0000 To: "commits@karaf.apache.org" Subject: [karaf] branch jdk12 updated: [KARAF-6203]ensure karaf can build and run with JDK12-fix MavenResolverRegisteredBeforeConfigAdminTest MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <155365762846.10079.10930149143207229615@gitbox.apache.org> From: ffang@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: karaf X-Git-Refname: refs/heads/jdk12 X-Git-Reftype: branch X-Git-Oldrev: 5842db73d6e40129cce16c25abcb244564edb2ce X-Git-Newrev: 63f046fb703bfcabae7d246e29a6822a1be37656 X-Git-Rev: 63f046fb703bfcabae7d246e29a6822a1be37656 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated 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 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="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,11.0,12.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,11.0,12.0", \ + osgi.ee; osgi.ee="JavaSE/compact2"; version:List="1.8,9.0,10.0,11.0,12.0", \ + osgi.ee; osgi.ee="JavaSE/compact3"; version:List="1.8,9.0,10.0,11.0,12.0" eecap-11= 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,11.0", \ osgi.ee; osgi.ee="JRE"; version:List="1.0,1.1", \