karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject [karaf] branch jdk12 updated: [KARAF-6203]ensure karaf can build and run with JDK12-fix JpaExampleTest
Date Wed, 27 Mar 2019 05:54:13 GMT
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 <freeman.fang@gmail.com>
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Configuration generated by Karaf Assembly Builder
+-->
+<featuresProcessing xmlns="http://karaf.apache.org/xmlns/features-processing/v1.0.0" xmlns:f="http://karaf.apache.org/xmlns/features/v1.5.0">
+
+
+    <!-- A list of bundle URI replacements that allows changing external feature definitions
-->
+    <bundleReplacements>
+        <bundle originalUri="mvn:org.javassist/javassist/[3,4)" replacement="mvn:org.javassist/javassist/3.23.1-GA"
mode="maven"/>
+    </bundleReplacements>
+</featuresProcessing>


Mime
View raw message