You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2019/08/07 07:59:44 UTC
[camel] 01/03: CAMEL-13738: parent/pom.xml - use dash in version
properties
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b2d3b543d0eb4f8601130ba309480d724cdd0d4d
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Aug 7 09:33:10 2019 +0200
CAMEL-13738: parent/pom.xml - use dash in version properties
---
components/camel-ahc/pom.xml | 2 +-
components/camel-atmosphere-websocket/pom.xml | 2 +-
components/camel-bean-validator/pom.xml | 4 +-
components/camel-cm-sms/pom.xml | 4 +-
components/camel-cxf/pom.xml | 2 +-
components/camel-dozer/pom.xml | 4 +-
components/camel-google-sheets/pom.xml | 6 +--
components/camel-http-common/pom.xml | 2 +-
components/camel-http/pom.xml | 2 +-
components/camel-jetty-common/pom.xml | 2 +-
components/camel-netty4-http/pom.xml | 2 +-
components/camel-restlet/pom.xml | 2 +-
components/camel-servlet/pom.xml | 2 +-
components/camel-spring-ws/pom.xml | 2 +-
components/camel-undertow/pom.xml | 2 +-
parent/pom.xml | 12 +++---
.../karaf/features/src/main/resources/features.xml | 44 +++++++++++-----------
17 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/components/camel-ahc/pom.xml b/components/camel-ahc/pom.xml
index e070f4c..8395944 100644
--- a/components/camel-ahc/pom.xml
+++ b/components/camel-ahc/pom.xml
@@ -49,7 +49,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet-api-version}</version>
+ <version>${javax-servlet-api-version}</version>
</dependency>
<dependency>
<groupId>org.asynchttpclient</groupId>
diff --git a/components/camel-atmosphere-websocket/pom.xml b/components/camel-atmosphere-websocket/pom.xml
index 3fa4468..49cd796 100644
--- a/components/camel-atmosphere-websocket/pom.xml
+++ b/components/camel-atmosphere-websocket/pom.xml
@@ -62,7 +62,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet-api-version}</version>
+ <version>${javax-servlet-api-version}</version>
</dependency>
<!-- atmosphere -->
diff --git a/components/camel-bean-validator/pom.xml b/components/camel-bean-validator/pom.xml
index 231d2f7..cb3688a 100644
--- a/components/camel-bean-validator/pom.xml
+++ b/components/camel-bean-validator/pom.xml
@@ -60,12 +60,12 @@
<dependency>
<groupId>javax.el</groupId>
<artifactId>javax.el-api</artifactId>
- <version>${javax.el-api-hibernate-validator-version}</version>
+ <version>${javax-el-api-hibernate-validator-version}</version>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.el</artifactId>
- <version>${javax.el-hibernate-validator-version}</version>
+ <version>${javax-el-hibernate-validator-version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/components/camel-cm-sms/pom.xml b/components/camel-cm-sms/pom.xml
index 304f319..08be559 100644
--- a/components/camel-cm-sms/pom.xml
+++ b/components/camel-cm-sms/pom.xml
@@ -67,7 +67,7 @@
<dependency>
<groupId>javax.el</groupId>
<artifactId>javax.el-api</artifactId>
- <version>${javax.el-api-hibernate-validator-version}</version>
+ <version>${javax-el-api-hibernate-validator-version}</version>
</dependency>
<dependency>
<groupId>org.hibernate.validator</groupId>
@@ -104,7 +104,7 @@
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.el</artifactId>
- <version>${javax.el-hibernate-validator-version}</version>
+ <version>${javax-el-hibernate-validator-version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-cxf/pom.xml b/components/camel-cxf/pom.xml
index 68cef82..260d173 100644
--- a/components/camel-cxf/pom.xml
+++ b/components/camel-cxf/pom.xml
@@ -96,7 +96,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet-api-version}</version>
+ <version>${javax-servlet-api-version}</version>
</dependency>
<dependency>
diff --git a/components/camel-dozer/pom.xml b/components/camel-dozer/pom.xml
index 4a33dcf..c08a8cc 100644
--- a/components/camel-dozer/pom.xml
+++ b/components/camel-dozer/pom.xml
@@ -51,12 +51,12 @@
<dependency>
<groupId>javax.el</groupId>
<artifactId>javax.el-api</artifactId>
- <version>${javax.el3-version}</version>
+ <version>${javax-el3-version}</version>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.el</artifactId>
- <version>${javax.el3-version}</version>
+ <version>${javax-el3-version}</version>
</dependency>
<!-- Testing -->
diff --git a/components/camel-google-sheets/pom.xml b/components/camel-google-sheets/pom.xml
index 7c3ac61..6067380 100644
--- a/components/camel-google-sheets/pom.xml
+++ b/components/camel-google-sheets/pom.xml
@@ -63,19 +63,19 @@
<dependency>
<groupId>com.consol.citrus</groupId>
<artifactId>citrus-core</artifactId>
- <version>${citrus.version}</version>
+ <version>${citrus-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.consol.citrus</groupId>
<artifactId>citrus-java-dsl</artifactId>
- <version>${citrus.version}</version>
+ <version>${citrus-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.consol.citrus</groupId>
<artifactId>citrus-http</artifactId>
- <version>${citrus.version}</version>
+ <version>${citrus-version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-http-common/pom.xml b/components/camel-http-common/pom.xml
index 430f1e8..242b1be 100644
--- a/components/camel-http-common/pom.xml
+++ b/components/camel-http-common/pom.xml
@@ -58,7 +58,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet-api-version}</version>
+ <version>${javax-servlet-api-version}</version>
<scope>provided</scope>
</dependency>
diff --git a/components/camel-http/pom.xml b/components/camel-http/pom.xml
index f484e28..cd77acc 100644
--- a/components/camel-http/pom.xml
+++ b/components/camel-http/pom.xml
@@ -56,7 +56,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet-api-version}</version>
+ <version>${javax-servlet-api-version}</version>
</dependency>
<dependency>
diff --git a/components/camel-jetty-common/pom.xml b/components/camel-jetty-common/pom.xml
index 8b4b9f1..806362d 100644
--- a/components/camel-jetty-common/pom.xml
+++ b/components/camel-jetty-common/pom.xml
@@ -53,7 +53,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet-api-version}</version>
+ <version>${javax-servlet-api-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
diff --git a/components/camel-netty4-http/pom.xml b/components/camel-netty4-http/pom.xml
index 0576f25..c1ef35f 100644
--- a/components/camel-netty4-http/pom.xml
+++ b/components/camel-netty4-http/pom.xml
@@ -52,7 +52,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet-api-version}</version>
+ <version>${javax-servlet-api-version}</version>
</dependency>
<!-- testing -->
diff --git a/components/camel-restlet/pom.xml b/components/camel-restlet/pom.xml
index b3e90b9..2bcadeb 100644
--- a/components/camel-restlet/pom.xml
+++ b/components/camel-restlet/pom.xml
@@ -60,7 +60,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet-api-version}</version>
+ <version>${javax-servlet-api-version}</version>
</dependency>
<dependency>
diff --git a/components/camel-servlet/pom.xml b/components/camel-servlet/pom.xml
index b82d1a5..d875abd 100644
--- a/components/camel-servlet/pom.xml
+++ b/components/camel-servlet/pom.xml
@@ -72,7 +72,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet-api-version}</version>
+ <version>${javax-servlet-api-version}</version>
<scope>provided</scope>
</dependency>
diff --git a/components/camel-spring-ws/pom.xml b/components/camel-spring-ws/pom.xml
index 2fc2800..91c7093 100644
--- a/components/camel-spring-ws/pom.xml
+++ b/components/camel-spring-ws/pom.xml
@@ -68,7 +68,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet-api-version}</version>
+ <version>${javax-servlet-api-version}</version>
<scope>provided</scope>
</dependency>
diff --git a/components/camel-undertow/pom.xml b/components/camel-undertow/pom.xml
index 7b6c959..8f9cbac 100644
--- a/components/camel-undertow/pom.xml
+++ b/components/camel-undertow/pom.xml
@@ -50,7 +50,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet-api-version}</version>
+ <version>${javax-servlet-api-version}</version>
</dependency>
<dependency>
<groupId>io.undertow</groupId>
diff --git a/parent/pom.xml b/parent/pom.xml
index 143c0ed..beb710f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -115,7 +115,7 @@
<cglib-version>3.2.12</cglib-version>
<chunk-templates-version>3.5.0</chunk-templates-version>
<chunk-templates-bundle-version>3.5.0_1</chunk-templates-bundle-version>
- <citrus.version>2.8.0</citrus.version>
+ <citrus-version>2.8.0</citrus-version>
<cmis-version>1.1.0</cmis-version>
<cometd-java-client-version>4.0.4</cometd-java-client-version>
<cometd-java-server-bundle-version>2.3.1_2</cometd-java-server-bundle-version>
@@ -310,15 +310,15 @@
<javacrumbs-version>0.22</javacrumbs-version>
<javapoet-version>1.11.1</javapoet-version>
<javassist-version>3.20.0-GA</javassist-version>
- <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-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>
- <javax.servlet-api-version>3.1.0</javax.servlet-api-version>
+ <javax-servlet-api-version>3.1.0</javax-servlet-api-version>
<jaxb-bundle-version>2.3.1_1</jaxb-bundle-version>
<jakarta-api-version>2.1.5</jakarta-api-version>
<jakarta-jaxb-version>2.3.2</jakarta-jaxb-version>
@@ -4454,7 +4454,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet-api-version}</version>
+ <version>${javax-servlet-api-version}</version>
</dependency>
<!-- Optional Spring Support -->
<dependency>
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index b39fbdd..58ac0fe 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -145,7 +145,7 @@
<bundle dependency='true'>mvn:io.netty/netty-handler-proxy/${netty-version}</bundle>
<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 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>
@@ -240,7 +240,7 @@
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:org.apache.commons/commons-compress/${commons-compress-version}</bundle>
- <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
+ <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax-servlet-api-version}</bundle>
<bundle dependency='true'>mvn:io.netty/netty/${netty3-version}</bundle>
<bundle dependency='true'>mvn:org.apache.commons/commons-lang3/${commons-lang3-version}</bundle>
<bundle>mvn:org.apache.camel/camel-avro/${project.version}</bundle>
@@ -668,7 +668,7 @@
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.libphonenumber/${libphonenumber-bundle-version}</bundle>
<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 dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax-servlet-api-version}</bundle>
<bundle>mvn:org.apache.camel/camel-cm-sms/${project.version}</bundle>
</feature>
<feature name='camel-cmis' version='${project.version}' start-level='50'>
@@ -695,7 +695,7 @@
<details>camel-cometd currently requires jetty 9</details>
<feature version="[9,10)">jetty</feature>
<feature version='${project.version}'>camel-core</feature>
- <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
+ <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax-servlet-api-version}</bundle>
<bundle dependency='true'>mvn:org.cometd.java/cometd-java-server/${cometd-java-server}</bundle>
<bundle dependency='true'>mvn:org.cometd.java/bayeux-api/${cometd-java-server}</bundle>
<bundle dependency='true'>mvn:org.cometd.java/cometd-java-common/${cometd-java-server}</bundle>
@@ -735,7 +735,7 @@
<bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
<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 dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax-servlet-api-version}</bundle>
<bundle>mvn:org.apache.camel/camel-couchdb/${project.version}</bundle>
</feature>
<feature name='camel-couchbase' version='${project.version}' start-level='50'>
@@ -849,8 +849,8 @@
<bundle dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
<bundle dependency='true'>mvn:commons-beanutils/commons-beanutils/${commons-beanutils-version}</bundle>
<bundle dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle>
- <bundle dependency='true'>mvn:javax.el/javax.el-api/${javax.el3-version}</bundle>
- <bundle dependency='true'>mvn:org.glassfish/javax.el/${javax.el3-version}</bundle>
+ <bundle dependency='true'>mvn:javax.el/javax.el-api/${javax-el3-version}</bundle>
+ <bundle dependency='true'>mvn:org.glassfish/javax.el/${javax-el3-version}</bundle>
<bundle dependency='true'>mvn:org.objenesis/objenesis/${objenesis-version}</bundle>
<bundle>mvn:org.apache.camel/camel-dozer/${project.version}</bundle>
</feature>
@@ -858,7 +858,7 @@
<feature version="${project.version}">camel-core</feature>
<bundle dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
- <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
+ <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax-servlet-api-version}</bundle>
<bundle dependency='true'>mvn:com.dropbox.core/dropbox-core-sdk/${dropbox-version}</bundle>
<!-- sadly dropbox-core-sdk include test scoped dependencies in its MANIFEST.MF OSGi import
so we need a bunch of other bundles here -->
@@ -1024,7 +1024,7 @@
<bundle dependency='true'>mvn:org.eclipse.jgit/org.eclipse.jgit/${jgit-version}</bundle>
<bundle dependency='true'>mvn:com.googlecode.javaewah/JavaEWAH/${java-ewah-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsch/${jsch-bundle-version}</bundle>
- <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
+ <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax-servlet-api-version}</bundle>
<bundle dependency='true'>mvn:org.bouncycastle/bcprov-jdk15on/${bouncycastle-version}</bundle>
<bundle dependency='true'>mvn:org.bouncycastle/bcpg-jdk15on/${bouncycastle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle>
@@ -1052,7 +1052,7 @@
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
<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 dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax-servlet-api-version}</bundle>
<bundle dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle>
<bundle>mvn:org.apache.camel/camel-google-bigquery/${project.version}</bundle>
</feature>
@@ -1127,7 +1127,7 @@
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
<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 dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax-servlet-api-version}</bundle>
<bundle dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle>
<bundle>mvn:org.apache.camel/camel-google-pubsub/${project.version}</bundle>
</feature>
@@ -1260,7 +1260,7 @@
<feature version='${project.version}'>camel-core</feature>
<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 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-http/${project.version}</bundle>
@@ -1270,7 +1270,7 @@
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.hystrix/${hystrix-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.hystrix-event-stream/${hystrix-bundle-version}</bundle>
- <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
+ <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax-servlet-api-version}</bundle>
<bundle dependency='true'>mvn:commons-configuration/commons-configuration/${commons-configuration-version}</bundle>
<bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
<bundle dependency='true'>mvn:io.reactivex/rxjava/${rxjava-version}</bundle>
@@ -1536,7 +1536,7 @@
<feature version='${spring-version-range}'>spring-tx</feature>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${geronimo-annotation-1.0-spec-version}</bundle>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jpa_2.1_spec/${geronimo-jpa-spec-version}</bundle>
- <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
+ <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax-servlet-api-version}</bundle>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/${geronimo-el-spec-version}</bundle>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
<bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
@@ -1579,7 +1579,7 @@
<feature name='camel-jt400' version='${project.version}' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<feature>transaction</feature>
- <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
+ <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax-servlet-api-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jt400/${jt400-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-jt400/${project.version}</bundle>
</feature>
@@ -1849,7 +1849,7 @@
<bundle dependency='true'>mvn:io.netty/netty-transport-native-unix-common/${netty-version}</bundle>
<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 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>
@@ -2092,7 +2092,7 @@
<bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle>
<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 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>
@@ -2168,7 +2168,7 @@
<bundle dependency='true'>mvn:javax.validation/validation-api/${validation-1-api-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream-java8/${xstream-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}</bundle>
- <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
+ <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax-servlet-api-version}</bundle>
<bundle dependency='true'>mvn:org.cometd.java/cometd-java-client/${cometd-java-client-version}</bundle>
<bundle dependency='true'>mvn:org.cometd.java/bayeux-api/${cometd-java-client-version}</bundle>
<bundle dependency='true'>mvn:org.cometd.java/cometd-java-common/${cometd-java-client-version}</bundle>
@@ -2251,7 +2251,7 @@
<bundle dependency='true'>mvn:org.apache.camel/camel-util-json/${project.version}</bundle>
<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 dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax-servlet-api-version}</bundle>
<bundle>mvn:org.apache.camel/camel-slack/${project.version}</bundle>
</feature>
<feature name='camel-smpp' version='${project.version}' start-level='50'>
@@ -2573,7 +2573,7 @@
<bundle dependency='true'>mvn:io.undertow/undertow-core/${undertow-version}</bundle>
<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 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>
@@ -2619,7 +2619,7 @@
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient-bundle-version}</bundle>
<bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
- <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
+ <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax-servlet-api-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle>
@@ -2628,7 +2628,7 @@
<feature name='camel-websocket' version='${project.version}' start-level='50'>
<feature>jetty</feature>
<feature version='${project.version}'>camel-core</feature>
- <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
+ <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax-servlet-api-version}</bundle>
<bundle>mvn:org.apache.camel/camel-websocket/${project.version}</bundle>
</feature>
<feature name='camel-websocket-jsr356' version='${project.version}' start-level='50'>