This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13678
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c557c4ffbdb44e7d7d6f3b3c10e6f380ce8ec9e9
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Mon Jul 8 15:49:43 2019 +0200
CAMEL-13678: Move attachments out of camel-core into camel-attachments.
---
components/camel-atmosphere-websocket/pom.xml | 1 +
components/camel-attachments/pom.xml | 6 ++++--
components/camel-cxf/pom.xml | 3 ++-
components/camel-http-common/pom.xml | 2 +-
components/camel-jetty/pom.xml | 3 ++-
components/camel-mail/pom.xml | 3 +++
components/camel-servlet/pom.xml | 1 +
components/camel-spring-ws/pom.xml | 1 +
components/camel-undertow/pom.xml | 3 +++
parent/pom.xml | 3 ++-
platforms/karaf/features/src/main/resources/features.xml | 10 ++++++++++
11 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/components/camel-atmosphere-websocket/pom.xml
b/components/camel-atmosphere-websocket/pom.xml
index f22db11..3fa4468 100644
--- a/components/camel-atmosphere-websocket/pom.xml
+++ b/components/camel-atmosphere-websocket/pom.xml
@@ -36,6 +36,7 @@
<properties>
<camel.osgi.import.pkg>
!org.apache.camel.component.atmosphere.websocket.*,
+ javax.activation.*;version="${javax-activation-version-range}",
javax.servlet.*;version="${servlet-version-range}",
org.atmosphere.*;version="${atmosphere-version-range}",
org.apache.catalina;resolution:=optional,
diff --git a/components/camel-attachments/pom.xml
b/components/camel-attachments/pom.xml
index 4f8151e..4a9be30 100644
--- a/components/camel-attachments/pom.xml
+++ b/components/camel-attachments/pom.xml
@@ -34,6 +34,9 @@
<description>Java Attachments support for Camel Message</description>
<properties>
+ <camel.osgi.import.before.defaults>
+ javax.activation.*;version="${javax-activation-version-range}"
+ </camel.osgi.import.before.defaults>
<firstVersion>3.0.0</firstVersion>
<label>core</label>
</properties>
@@ -50,8 +53,7 @@
<dependency>
<groupId>com.sun.activation</groupId>
<artifactId>javax.activation</artifactId>
- <version>1.2.0</version>
- <!-- TODO: move version to parent -->
+ <version>${javax-activation-version}</version>
</dependency>
<!-- testing -->
diff --git a/components/camel-cxf/pom.xml b/components/camel-cxf/pom.xml
index e636a86..fe5d008 100644
--- a/components/camel-cxf/pom.xml
+++ b/components/camel-cxf/pom.xml
@@ -47,7 +47,7 @@
!org.apache.camel.component.cxf.spring,
!org.apache.camel.component.cxf.util,
!org.apache.camel.blueprint,
- javax.activation*;version="[0.0,2)",
+ javax.activation.*;version="${javax-activation-version-range}",
javax.jws*;version="[0.0,3)",
javax.ws.rs*;version="[0.0,3)",
javax.xml.soap*;version="[1.3,2)",
@@ -68,6 +68,7 @@
*
</camel.osgi.import>
<camel.osgi.failok>true</camel.osgi.failok>
+
</properties>
<dependencies>
diff --git a/components/camel-http-common/pom.xml
b/components/camel-http-common/pom.xml
index 0e08ff4..430f1e8 100644
--- a/components/camel-http-common/pom.xml
+++ b/components/camel-http-common/pom.xml
@@ -35,13 +35,13 @@
<properties>
<camel.osgi.import.before.defaults>
+ javax.activation.*;version="${javax-activation-version-range}",
javax.servlet.*;version="${servlet-version-range}"
</camel.osgi.import.before.defaults>
</properties>
<dependencies>
- <!-- TODO: requires camel-core due camel.cloud is not in camel-support
-->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-cloud</artifactId>
diff --git a/components/camel-jetty/pom.xml b/components/camel-jetty/pom.xml
index e23dc21..f5c7c09 100644
--- a/components/camel-jetty/pom.xml
+++ b/components/camel-jetty/pom.xml
@@ -35,7 +35,8 @@
<properties>
<camel.osgi.import.before.defaults>
- org.eclipse.jetty.*;version="[9.3,10)",
+ org.eclipse.jetty.*;version="[9.4,10)",
+ javax.activation.*;version="${javax-activation-version-range}",
javax.servlet.*;version="${servlet-version-range}"
</camel.osgi.import.before.defaults>
</properties>
diff --git a/components/camel-mail/pom.xml b/components/camel-mail/pom.xml
index 253350b..152c288 100644
--- a/components/camel-mail/pom.xml
+++ b/components/camel-mail/pom.xml
@@ -33,6 +33,9 @@
<description>Camel Mail support</description>
<properties>
+ <camel.osgi.import.before.defaults>
+ javax.activation.*;version="${javax-activation-version-range}"
+ </camel.osgi.import.before.defaults>
</properties>
<dependencies>
diff --git a/components/camel-servlet/pom.xml b/components/camel-servlet/pom.xml
index 53f12d7..2f030aa 100644
--- a/components/camel-servlet/pom.xml
+++ b/components/camel-servlet/pom.xml
@@ -35,6 +35,7 @@
<properties>
<camel.osgi.import.before.defaults>
+ javax.activation.*;version="${javax-activation-version-range}",
javax.servlet.*;version="${servlet-version-range}"
</camel.osgi.import.before.defaults>
diff --git a/components/camel-spring-ws/pom.xml
b/components/camel-spring-ws/pom.xml
index af8adb9..2fc2800 100644
--- a/components/camel-spring-ws/pom.xml
+++ b/components/camel-spring-ws/pom.xml
@@ -39,6 +39,7 @@
org.springframework.util.*;version="${spring-version-range}",
org.springframework.ws.*;version="[3,4)",
org.springframework.xml.*;version="[3,4)",
+ javax.activation.*;version="${javax-activation-version-range}",
javax.xml.soap*;version="[1.3,2)"
</camel.osgi.import.before.defaults>
<!-- for some weird reason org.springframework.ws and
org.springframework.xml
diff --git a/components/camel-undertow/pom.xml
b/components/camel-undertow/pom.xml
index b8f5318..c46c522 100644
--- a/components/camel-undertow/pom.xml
+++ b/components/camel-undertow/pom.xml
@@ -33,6 +33,9 @@
<name>Camel :: Undertow</name>
<properties>
+ <camel.osgi.import.before.defaults>
+ javax.activation.*;version="${javax-activation-version-range}"
+ </camel.osgi.import.before.defaults>
</properties>
<dependencies>
diff --git a/parent/pom.xml b/parent/pom.xml
index 0316376..01343ee 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -41,7 +41,6 @@
<cxf.xjc.jvmArgs/>
<!-- dependency versions -->
<abdera-version>1.1.3</abdera-version>
- <javax-activation-version-range>[0,2)</javax-activation-version-range>
<!-- Note that activemq dependency is only used for testing! -->
<activemq-version>5.15.9</activemq-version>
<activemq-artemis-version>2.9.0</activemq-artemis-version>
@@ -345,6 +344,8 @@
<javax.el3-version>3.0.0</javax.el3-version>
<javax.el-api-hibernate-validator-version>3.0.1-b04</javax.el-api-hibernate-validator-version>
<javax.el-hibernate-validator-version>3.0.1-b10</javax.el-hibernate-validator-version>
+ <javax-activation-version-range>[0,2)</javax-activation-version-range>
+ <javax-activation-version>1.2.0</javax-activation-version>
<javax-annotation-api-version>1.3.2</javax-annotation-api-version>
<javax-inject-bundle-version>1_2</javax-inject-bundle-version>
<javax-mail-version>1.6.1</javax-mail-version>
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index 419d14c..0046fd4 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -146,6 +146,7 @@
<bundle
dependency='true'>wrap:mvn:com.typesafe.netty/netty-reactive-streams/${netty-reactive-streams-version}</bundle>
<bundle
dependency='true'>mvn:org.reactivestreams/reactive-streams/${reactive-streams-version}</bundle>
<bundle
dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-attachments/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-http-common/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-ahc/${project.version}</bundle>
</feature>
@@ -779,6 +780,7 @@
<feature version='${cxf-version-range}'>cxf-databinding-jaxb</feature>
<feature version='${cxf-version-range}'>cxf-bindings-soap</feature>
<feature version='${cxf-version-range}'>cxf-features-logging</feature>
+ <bundle>mvn:org.apache.camel/camel-attachments/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-http-common/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-cxf-transport/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-cxf/${project.version}</bundle>
@@ -1259,6 +1261,7 @@
<bundle
dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle>
<bundle
dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-attachments/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-http-common/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-http4/${project.version}</bundle>
</feature>
@@ -1465,6 +1468,7 @@
<feature name='camel-jetty' version='${project.version}' start-level='50'>
<feature>jetty</feature>
<feature version='${project.version}'>camel-core</feature>
+ <bundle>mvn:org.apache.camel/camel-attachments/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-http-common/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-jetty-common/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-jetty/${project.version}</bundle>
@@ -1717,6 +1721,7 @@
<feature name='camel-mail' version='${project.version}' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle
dependency='true'>mvn:com.sun.mail/javax.mail/${javax-mail-version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-attachments/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-mail/${project.version}</bundle>
</feature>
<feature name='camel-master' version='${project.version}' start-level='50'>
@@ -1845,6 +1850,7 @@
<bundle
dependency='true'>mvn:io.netty/netty-codec/${netty-version}</bundle>
<bundle
dependency='true'>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
<bundle
dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-attachments/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-http-common/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-netty4/${project.version}</bundle>
</feature>
@@ -2087,6 +2093,7 @@
<bundle
dependency='true'>mvn:https://maven.restlet.com@id=restlet!org.restlet.osgi/org.restlet/${restlet-version}</bundle>
<bundle
dependency='true'>mvn:https://maven.restlet.com@id=restlet!org.restlet.osgi/org.restlet.ext.httpclient/${restlet-version}</bundle>
<bundle
dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-attachments/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-http-common/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-restlet/${project.version}</bundle>
</feature>
@@ -2201,6 +2208,7 @@
<feature name='camel-servlet' version='${project.version}' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<feature>http</feature>
+ <bundle>mvn:org.apache.camel/camel-attachments/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-http-common/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-servlet/${project.version}</bundle>
</feature>
@@ -2410,6 +2418,7 @@
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-ws-security/${spring-ws-bundle-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-xml/${spring-xml-bundle-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix-specs-version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-attachments/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-spring-ws/${project.version}</bundle>
</feature>
<feature name='camel-sql' version='${project.version}' start-level='50'>
@@ -2562,6 +2571,7 @@
<bundle
dependency='true'>mvn:org.jboss.xnio/xnio-api/${jboss-xnio-version}</bundle>
<bundle
dependency='true'>mvn:org.jboss.xnio/xnio-nio/${jboss-xnio-version}</bundle>
<bundle
dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-attachments/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-http-common/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-undertow/${project.version}</bundle>
</feature>
