camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [3/8] camel git commit: CAMEL-10561: camel-catalog - Add REST JAX-RS application
Date Tue, 06 Dec 2016 11:57:47 GMT
CAMEL-10561: camel-catalog - Add REST JAX-RS application


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/799f90fa
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/799f90fa
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/799f90fa

Branch: refs/heads/master
Commit: 799f90fa289fe3ab091a3b9e2d111ec1f5d0bdd8
Parents: 05f7248
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Tue Dec 6 10:51:15 2016 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Tue Dec 6 10:51:15 2016 +0100

----------------------------------------------------------------------
 parent/pom.xml                 | 1 +
 platforms/catalog-rest/pom.xml | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/799f90fa/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 0d65bf3..bf2feb0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -305,6 +305,7 @@
     <javax-inject-bundle-version>1_2</javax-inject-bundle-version>
     <javax-mail-version>1.5.5</javax-mail-version>
     <javax.servlet-api-version>3.1.0</javax.servlet-api-version>
+    <javax.ws.rs-api-version>2.0.1</javax.ws.rs-api-version>
     <jaxb-bundle-version>2.2.11_1</jaxb-bundle-version>
     <jaxen-version>1.1.6</jaxen-version>
     <jbpm-version>6.5.0.Final</jbpm-version>

http://git-wip-us.apache.org/repos/asf/camel/blob/799f90fa/platforms/catalog-rest/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/catalog-rest/pom.xml b/platforms/catalog-rest/pom.xml
index 3cc899e..e1e7e45 100644
--- a/platforms/catalog-rest/pom.xml
+++ b/platforms/catalog-rest/pom.xml
@@ -40,8 +40,7 @@
     <dependency>
       <groupId>javax.ws.rs</groupId>
       <artifactId>javax.ws.rs-api</artifactId>
-      <!-- TODO: put in parent -->
-      <version>2.0.1</version>
+      <version>${javax.ws.rs-api-version}</version>
     </dependency>
 
     <!-- cxf -->
@@ -103,7 +102,7 @@
     <dependency>
       <groupId>io.rest-assured</groupId>
       <artifactId>rest-assured</artifactId>
-      <version>3.0.1</version>
+      <version>${rest-assured-version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>


Mime
View raw message