This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf-decanter.git
The following commit(s) were added to refs/heads/master by this push:
new b5d0921 [KARAF-6657] Upgrade to Camel 2.25.0
new 892e3bf Merge pull request #148 from jbonofre/KARAF-6657
b5d0921 is described below
commit b5d09213ddc841c161260b0bf40520a38148ea97
Author: jbonofre <[email protected]>
AuthorDate: Mon Mar 30 14:50:29 2020 +0200
[KARAF-6657] Upgrade to Camel 2.25.0
---
alerting/alerter/camel/pom.xml | 16 ++++++++++++++++
appender/camel/pom.xml | 1 +
collector/camel/pom.xml | 4 ++++
.../collector/camel/DecanterEventNotifierTest.java | 6 +++---
pom.xml | 2 +-
5 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/alerting/alerter/camel/pom.xml b/alerting/alerter/camel/pom.xml
index 5e36f76..8f39c4c 100644
--- a/alerting/alerter/camel/pom.xml
+++ b/alerting/alerter/camel/pom.xml
@@ -44,6 +44,22 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>!*</Export-Package>
+ <Import-Package>
+ org.apache.camel*;version="[2,4)",
+ *
+ </Import-Package>
+ <Private-Package>
+ org.apache.karaf.decanter.alerting.camel
+ </Private-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
diff --git a/appender/camel/pom.xml b/appender/camel/pom.xml
index b139010..b4ee633 100644
--- a/appender/camel/pom.xml
+++ b/appender/camel/pom.xml
@@ -65,6 +65,7 @@
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>!*</Export-Package>
<Import-Package>
+ org.apache.camel*;version="[2,4)",
*
</Import-Package>
<Private-Package>
diff --git a/collector/camel/pom.xml b/collector/camel/pom.xml
index 6729cc7..239c568 100644
--- a/collector/camel/pom.xml
+++ b/collector/camel/pom.xml
@@ -70,6 +70,10 @@
<Export-Package>
org.apache.karaf.decanter.collector.camel
</Export-Package>
+ <Import-Package>
+ org.apache.camel*;version="[2,4)",
+ *
+ </Import-Package>
</instructions>
</configuration>
</plugin>
diff --git
a/collector/camel/src/test/java/org/apache/karaf/decanter/collector/camel/DecanterEventNotifierTest.java
b/collector/camel/src/test/java/org/apache/karaf/decanter/collector/camel/DecanterEventNotifierTest.java
index 6916bc1..5313a80 100644
---
a/collector/camel/src/test/java/org/apache/karaf/decanter/collector/camel/DecanterEventNotifierTest.java
+++
b/collector/camel/src/test/java/org/apache/karaf/decanter/collector/camel/DecanterEventNotifierTest.java
@@ -40,7 +40,7 @@ public class DecanterEventNotifierTest {
ProducerTemplate producerTemplate =
camelContext.createProducerTemplate();
producerTemplate.sendBodyAndHeader("direct:start", "TEST", "foo",
"bar");
- Assert.assertEquals(10, eventAdmin.getPostEvents().size());
+ Assert.assertEquals(7, eventAdmin.getPostEvents().size());
Event camelContextStartingEvent = eventAdmin.getPostEvents().get(0);
Assert.assertEquals("test-context",
camelContextStartingEvent.getProperty("camelContextName"));
@@ -123,7 +123,7 @@ public class DecanterEventNotifierTest {
ProducerTemplate producerTemplate =
camelContext.createProducerTemplate();
producerTemplate.sendBodyAndHeader("direct:start", "TEST", "foo",
"bar");
- Assert.assertEquals(8, eventAdmin.getPostEvents().size());
+ Assert.assertEquals(5, eventAdmin.getPostEvents().size());
}
@Test
@@ -140,7 +140,7 @@ public class DecanterEventNotifierTest {
ProducerTemplate producerTemplate =
camelContext.createProducerTemplate();
producerTemplate.sendBodyAndHeader("direct:start", "TEST", "foo",
"bar");
- Assert.assertEquals(6, eventAdmin.getPostEvents().size());
+ Assert.assertEquals(3, eventAdmin.getPostEvents().size());
Assert.assertEquals("test",
eventAdmin.getPostEvents().get(0).getProperty("extender-test"));
}
diff --git a/pom.xml b/pom.xml
index 4fb7804..96f7020 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
<baseline>1.0.0</baseline>
<baseline.skip>true</baseline.skip>
<activemq.version>5.15.12</activemq.version>
- <camel.version>2.16.2</camel.version>
+ <camel.version>2.25.0</camel.version>
<cassandra.driver.version>4.1.0</cassandra.driver.version>
<glassfish-json.version>1.1.4</glassfish-json.version>
<json-api.version>1.1.4</json-api.version>
