You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2019/03/01 14:33:37 UTC
[camel] branch master updated (b43fd18 -> 4aa2106)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from b43fd18 Regen
new 48bd797 [CAMEL-13278] Fix log configuration for karaf integration tests
new 4aa2106 [CAMEL-13277] Upgrade to Karaf 4.2.3
The 2 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.
Summary of changes:
.../src/main/java/org/apache/camel/test/karaf/AbstractFeatureTest.java | 3 +++
parent/pom.xml | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
[camel] 01/02: [CAMEL-13278] Fix log configuration for karaf
integration tests
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 48bd797518fe091b7ac7274a62d1024daa78fa0e
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Mar 1 15:19:12 2019 +0100
[CAMEL-13278] Fix log configuration for karaf integration tests
---
.../src/main/java/org/apache/camel/test/karaf/AbstractFeatureTest.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/components/camel-test-karaf/src/main/java/org/apache/camel/test/karaf/AbstractFeatureTest.java b/components/camel-test-karaf/src/main/java/org/apache/camel/test/karaf/AbstractFeatureTest.java
index bbcc6fa..657893e 100644
--- a/components/camel-test-karaf/src/main/java/org/apache/camel/test/karaf/AbstractFeatureTest.java
+++ b/components/camel-test-karaf/src/main/java/org/apache/camel/test/karaf/AbstractFeatureTest.java
@@ -344,6 +344,9 @@ public abstract class AbstractFeatureTest {
// Disable the Karaf shutdown port
editConfigurationFilePut("etc/custom.properties", "karaf.shutdown.port", "-1"),
+ // log config
+ editConfigurationFilePut("etc/custom.properties", "karaf.log", "${karaf.data}/log"),
+
// Assign unique ports for Karaf
// editConfigurationFilePut("etc/org.ops4j.pax.web.cfg", "org.osgi.service.http.port", Integer.toString(AvailablePortFinder.getNextAvailable())),
// editConfigurationFilePut("etc/org.apache.karaf.management.cfg", "rmiRegistryPort", Integer.toString(AvailablePortFinder.getNextAvailable())),
[camel] 02/02: [CAMEL-13277] Upgrade to Karaf 4.2.3
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 4aa2106577253d2e926b65663d98f9a94b8e4d00
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Mar 1 15:19:23 2019 +0100
[CAMEL-13277] Upgrade to Karaf 4.2.3
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 34c81b7..6baa8b5 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -432,7 +432,7 @@
<jzlib-bundle-version>1.1.3_2</jzlib-bundle-version>
<kafka-version>2.1.0</kafka-version>
<kafka-bundle-version>2.1.0_1</kafka-bundle-version>
- <karaf4-version>4.2.1</karaf4-version>
+ <karaf4-version>4.2.3</karaf4-version>
<kie-version>7.17.0.Final</kie-version>
<kubernetes-client-version>4.1.1</kubernetes-client-version>
<kubernetes-model-version>4.1.1</kubernetes-model-version>