From commits-return-36059-archive-asf-public=cust-asf.ponee.io@karaf.apache.org Wed Mar 27 05:54:15 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 3BB7F180648 for ; Wed, 27 Mar 2019 06:54:15 +0100 (CET) Received: (qmail 69887 invoked by uid 500); 27 Mar 2019 05:54:14 -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 69872 invoked by uid 99); 27 Mar 2019 05:54:14 -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 05:54:14 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 76D7F85861; Wed, 27 Mar 2019 05:54:13 +0000 (UTC) Date: Wed, 27 Mar 2019 05:54:13 +0000 To: "commits@karaf.apache.org" Subject: [karaf] branch jdk12 updated: [KARAF-6203]ensure karaf can build and run with JDK12-fix JpaExampleTest MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <155366605298.29645.13792448361616793429@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: 63f046fb703bfcabae7d246e29a6822a1be37656 X-Git-Newrev: f35b3826ee29d479d614174ceee3e67468048d3e X-Git-Rev: f35b3826ee29d479d614174ceee3e67468048d3e 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 f35b382 [KARAF-6203]ensure karaf can build and run with JDK12-fix JpaExampleTest f35b382 is described below commit f35b3826ee29d479d614174ceee3e67468048d3e Author: Freeman Fang AuthorDate: Wed Mar 27 13:53:58 2019 +0800 [KARAF-6203]ensure karaf can build and run with JDK12-fix JpaExampleTest --- .../main/java/org/apache/karaf/itests/KarafTestSupport.java | 1 + .../src/test/resources/etc/org.apache.karaf.features.xml | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/itests/common/src/main/java/org/apache/karaf/itests/KarafTestSupport.java b/itests/common/src/main/java/org/apache/karaf/itests/KarafTestSupport.java index 83f316d..b92cd55 100644 --- a/itests/common/src/main/java/org/apache/karaf/itests/KarafTestSupport.java +++ b/itests/common/src/main/java/org/apache/karaf/itests/KarafTestSupport.java @@ -197,6 +197,7 @@ public class KarafTestSupport { CoreOptions.mavenBundle().groupId("javax.annotation").artifactId("javax.annotation-api").versionAsInProject(), KarafDistributionOption.replaceConfigurationFile("etc/org.ops4j.pax.logging.cfg", getConfigFile("/etc/org.ops4j.pax.logging.cfg")), //replaceConfigurationFile("etc/host.key", getConfigFile("/etc/host.key")), + KarafDistributionOption.replaceConfigurationFile("etc/org.apache.karaf.features.xml", getConfigFile("/etc/org.apache.karaf.features.xml")), KarafDistributionOption.editConfigurationFilePut("etc/org.apache.karaf.features.cfg", "updateSnapshots", "none"), KarafDistributionOption.editConfigurationFilePut("etc/org.ops4j.pax.web.cfg", "org.osgi.service.http.port", httpPort), KarafDistributionOption.editConfigurationFilePut("etc/org.apache.karaf.management.cfg", "rmiRegistryPort", rmiRegistryPort), diff --git a/itests/test/src/test/resources/etc/org.apache.karaf.features.xml b/itests/test/src/test/resources/etc/org.apache.karaf.features.xml new file mode 100644 index 0000000..0fcbf11 --- /dev/null +++ b/itests/test/src/test/resources/etc/org.apache.karaf.features.xml @@ -0,0 +1,12 @@ + + + + + + + + + +