You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/01/21 14:15:28 UTC

[camel] branch master updated: CAMEL-13084 - Centralized the servlet api version for the moment, thanks Dmitry Volodin for noticing this

This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new b9694ef  CAMEL-13084 - Centralized the servlet api version for the moment, thanks Dmitry Volodin for noticing this
b9694ef is described below

commit b9694efd12a64100da2a9b5efaaa07b9d6f41ce1
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Jan 21 15:04:54 2019 +0100

    CAMEL-13084 - Centralized the servlet api version for the moment, thanks Dmitry Volodin for noticing this
---
 examples/camel-example-fhir-auth-tx-spring-boot/pom.xml                 | 2 +-
 examples/camel-example-fhir-spring-boot/pom.xml                         | 2 +-
 examples/camel-example-rabbitmq/pom.xml                                 | 2 +-
 examples/camel-example-rest-producer/pom.xml                            | 2 +-
 .../cluster-node/pom.xml                                                | 2 +-
 examples/camel-example-spring-boot-health-checks/application/pom.xml    | 2 +-
 examples/camel-example-spring-boot-health-checks/service/pom.xml        | 2 +-
 examples/camel-example-spring-boot-master/pom.xml                       | 2 +-
 examples/camel-example-spring-boot-rest-swagger/pom.xml                 | 2 +-
 examples/camel-example-spring-boot-servicecall/consumer/pom.xml         | 2 +-
 examples/camel-example-spring-boot-supervising-route-controller/pom.xml | 2 +-
 examples/camel-example-spring-boot-xml/pom.xml                          | 2 +-
 examples/camel-example-spring-boot/pom.xml                              | 2 +-
 examples/camel-example-spring-cloud-servicecall/consumer/pom.xml        | 2 +-
 examples/camel-example-spring-cloud-servicecall/service/pom.xml         | 2 +-
 examples/camel-example-spring-cloud-serviceregistry/consumer/pom.xml    | 2 +-
 examples/camel-example-spring-cloud-serviceregistry/service/pom.xml     | 2 +-
 examples/camel-example-twitter-salesforce/pom.xml                       | 2 +-
 examples/camel-example-validator-spring-boot/pom.xml                    | 2 +-
 examples/pom.xml                                                        | 1 +
 20 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/examples/camel-example-fhir-auth-tx-spring-boot/pom.xml b/examples/camel-example-fhir-auth-tx-spring-boot/pom.xml
index 6a9483e..eb95990 100644
--- a/examples/camel-example-fhir-auth-tx-spring-boot/pom.xml
+++ b/examples/camel-example-fhir-auth-tx-spring-boot/pom.xml
@@ -61,7 +61,7 @@
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>javax.servlet-api</artifactId>
-        <version>4.0.1</version>
+        <version>${javax.servlet.api.version}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/examples/camel-example-fhir-spring-boot/pom.xml b/examples/camel-example-fhir-spring-boot/pom.xml
index 66501b6..5d27f6f 100644
--- a/examples/camel-example-fhir-spring-boot/pom.xml
+++ b/examples/camel-example-fhir-spring-boot/pom.xml
@@ -61,7 +61,7 @@
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>javax.servlet-api</artifactId>
-        <version>4.0.1</version>
+        <version>${javax.servlet.api.version}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/examples/camel-example-rabbitmq/pom.xml b/examples/camel-example-rabbitmq/pom.xml
index 488dfda..7d7c8e7 100644
--- a/examples/camel-example-rabbitmq/pom.xml
+++ b/examples/camel-example-rabbitmq/pom.xml
@@ -61,7 +61,7 @@
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>javax.servlet-api</artifactId>
-        <version>4.0.1</version>
+        <version>${javax.servlet.api.version}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/examples/camel-example-rest-producer/pom.xml b/examples/camel-example-rest-producer/pom.xml
index 8166ad4..ea0f08f 100644
--- a/examples/camel-example-rest-producer/pom.xml
+++ b/examples/camel-example-rest-producer/pom.xml
@@ -61,7 +61,7 @@
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>javax.servlet-api</artifactId>
-        <version>4.0.1</version>
+        <version>${javax.servlet.api.version}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/examples/camel-example-spring-boot-clustered-route-controller/cluster-node/pom.xml b/examples/camel-example-spring-boot-clustered-route-controller/cluster-node/pom.xml
index ea020ed..870b0c0 100644
--- a/examples/camel-example-spring-boot-clustered-route-controller/cluster-node/pom.xml
+++ b/examples/camel-example-spring-boot-clustered-route-controller/cluster-node/pom.xml
@@ -54,7 +54,7 @@
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>javax.servlet-api</artifactId>
-        <version>4.0.1</version>
+        <version>${javax.servlet.api.version}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/examples/camel-example-spring-boot-health-checks/application/pom.xml b/examples/camel-example-spring-boot-health-checks/application/pom.xml
index dd52582..ad17bb6 100644
--- a/examples/camel-example-spring-boot-health-checks/application/pom.xml
+++ b/examples/camel-example-spring-boot-health-checks/application/pom.xml
@@ -58,7 +58,7 @@
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>javax.servlet-api</artifactId>
-        <version>4.0.1</version>
+        <version>${javax.servlet.api.version}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/examples/camel-example-spring-boot-health-checks/service/pom.xml b/examples/camel-example-spring-boot-health-checks/service/pom.xml
index 42b6c26..8979790 100644
--- a/examples/camel-example-spring-boot-health-checks/service/pom.xml
+++ b/examples/camel-example-spring-boot-health-checks/service/pom.xml
@@ -50,7 +50,7 @@
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>javax.servlet-api</artifactId>
-        <version>4.0.1</version>
+        <version>${javax.servlet.api.version}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/examples/camel-example-spring-boot-master/pom.xml b/examples/camel-example-spring-boot-master/pom.xml
index 0a5efaf..48b0053 100644
--- a/examples/camel-example-spring-boot-master/pom.xml
+++ b/examples/camel-example-spring-boot-master/pom.xml
@@ -62,7 +62,7 @@
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>javax.servlet-api</artifactId>
-        <version>4.0.1</version>
+        <version>${javax.servlet.api.version}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/examples/camel-example-spring-boot-rest-swagger/pom.xml b/examples/camel-example-spring-boot-rest-swagger/pom.xml
index f2f904a..1aa9d56 100644
--- a/examples/camel-example-spring-boot-rest-swagger/pom.xml
+++ b/examples/camel-example-spring-boot-rest-swagger/pom.xml
@@ -56,7 +56,7 @@
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>javax.servlet-api</artifactId>
-        <version>4.0.1</version>
+        <version>${javax.servlet.api.version}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/examples/camel-example-spring-boot-servicecall/consumer/pom.xml b/examples/camel-example-spring-boot-servicecall/consumer/pom.xml
index 696f2cc..93cc65c 100644
--- a/examples/camel-example-spring-boot-servicecall/consumer/pom.xml
+++ b/examples/camel-example-spring-boot-servicecall/consumer/pom.xml
@@ -62,7 +62,7 @@
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>javax.servlet-api</artifactId>
-        <version>4.0.1</version>
+        <version>${javax.servlet.api.version}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/examples/camel-example-spring-boot-supervising-route-controller/pom.xml b/examples/camel-example-spring-boot-supervising-route-controller/pom.xml
index 955bdcd..974a22a 100644
--- a/examples/camel-example-spring-boot-supervising-route-controller/pom.xml
+++ b/examples/camel-example-spring-boot-supervising-route-controller/pom.xml
@@ -61,7 +61,7 @@
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>javax.servlet-api</artifactId>
-        <version>4.0.1</version>
+        <version>${javax.servlet.api.version}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/examples/camel-example-spring-boot-xml/pom.xml b/examples/camel-example-spring-boot-xml/pom.xml
index 9432b88..021924c 100644
--- a/examples/camel-example-spring-boot-xml/pom.xml
+++ b/examples/camel-example-spring-boot-xml/pom.xml
@@ -62,7 +62,7 @@
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>javax.servlet-api</artifactId>
-        <version>4.0.1</version>
+        <version>${javax.servlet.api.version}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/examples/camel-example-spring-boot/pom.xml b/examples/camel-example-spring-boot/pom.xml
index bf5a1fc..5dc0ec2 100644
--- a/examples/camel-example-spring-boot/pom.xml
+++ b/examples/camel-example-spring-boot/pom.xml
@@ -61,7 +61,7 @@
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>javax.servlet-api</artifactId>
-        <version>4.0.1</version>
+        <version>${javax.servlet.api.version}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/examples/camel-example-spring-cloud-servicecall/consumer/pom.xml b/examples/camel-example-spring-cloud-servicecall/consumer/pom.xml
index 7612e7f..d4cfe79 100644
--- a/examples/camel-example-spring-cloud-servicecall/consumer/pom.xml
+++ b/examples/camel-example-spring-cloud-servicecall/consumer/pom.xml
@@ -69,7 +69,7 @@
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>javax.servlet-api</artifactId>
-        <version>4.0.1</version>
+        <version>${javax.servlet.api.version}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/examples/camel-example-spring-cloud-servicecall/service/pom.xml b/examples/camel-example-spring-cloud-servicecall/service/pom.xml
index fe6cff8..dd36cb2 100644
--- a/examples/camel-example-spring-cloud-servicecall/service/pom.xml
+++ b/examples/camel-example-spring-cloud-servicecall/service/pom.xml
@@ -62,7 +62,7 @@
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>javax.servlet-api</artifactId>
-        <version>4.0.1</version>
+        <version>${javax.servlet.api.version}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/examples/camel-example-spring-cloud-serviceregistry/consumer/pom.xml b/examples/camel-example-spring-cloud-serviceregistry/consumer/pom.xml
index 7e20bae..c34b336 100644
--- a/examples/camel-example-spring-cloud-serviceregistry/consumer/pom.xml
+++ b/examples/camel-example-spring-cloud-serviceregistry/consumer/pom.xml
@@ -69,7 +69,7 @@
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>javax.servlet-api</artifactId>
-        <version>4.0.1</version>
+        <version>${javax.servlet.api.version}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/examples/camel-example-spring-cloud-serviceregistry/service/pom.xml b/examples/camel-example-spring-cloud-serviceregistry/service/pom.xml
index caaae39..42b56d4 100644
--- a/examples/camel-example-spring-cloud-serviceregistry/service/pom.xml
+++ b/examples/camel-example-spring-cloud-serviceregistry/service/pom.xml
@@ -69,7 +69,7 @@
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>javax.servlet-api</artifactId>
-        <version>4.0.1</version>
+        <version>${javax.servlet.api.version}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/examples/camel-example-twitter-salesforce/pom.xml b/examples/camel-example-twitter-salesforce/pom.xml
index 1b3fe59..f688ae9 100644
--- a/examples/camel-example-twitter-salesforce/pom.xml
+++ b/examples/camel-example-twitter-salesforce/pom.xml
@@ -58,7 +58,7 @@
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>javax.servlet-api</artifactId>
-        <version>4.0.1</version>
+        <version>${javax.servlet.api.version}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/examples/camel-example-validator-spring-boot/pom.xml b/examples/camel-example-validator-spring-boot/pom.xml
index 7da23d3..84ffc95 100644
--- a/examples/camel-example-validator-spring-boot/pom.xml
+++ b/examples/camel-example-validator-spring-boot/pom.xml
@@ -62,7 +62,7 @@
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>javax.servlet-api</artifactId>
-        <version>4.0.1</version>
+        <version>${javax.servlet.api.version}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/examples/pom.xml b/examples/pom.xml
index 1977f23..60a3534 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -145,6 +145,7 @@
     <!-- as having org.apache.camel as prefix is not needed and makes the name very long -->
     <camel.osgi.symbolic.name>${project.artifactId}</camel.osgi.symbolic.name>
     <skip.starting.camel.context>false</skip.starting.camel.context>
+    <javax.servlet.api.version>4.0.1</javax.servlet.api.version>
     <camel.osgi.export.pkg/>
   </properties>