camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [1/2] git commit: Fix for CAMEL-7726 added property for camel-test-spring artifactId to Fix the test failures of spring4 profile
Date Fri, 05 Sep 2014 06:54:44 GMT
Repository: camel
Updated Branches:
  refs/heads/master fd818acb5 -> c3d69ce40


Fix for CAMEL-7726 added property for camel-test-spring artifactId to Fix the test failures
of spring4 profile


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

Branch: refs/heads/master
Commit: 3adf0b700a9808472816b332f92e167efeed806f
Parents: b8e9430
Author: Kevin Earls <kevin@kevinearls.com>
Authored: Thu Aug 21 14:21:15 2014 +0200
Committer: Kevin Earls <kevin@kevinearls.com>
Committed: Thu Aug 21 14:21:15 2014 +0200

----------------------------------------------------------------------
 components/camel-metrics/pom.xml           | 2 +-
 components/camel-spring-javaconfig/pom.xml | 2 +-
 components/camel-testng/pom.xml            | 2 +-
 parent/pom.xml                             | 2 ++
 4 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/3adf0b70/components/camel-metrics/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-metrics/pom.xml b/components/camel-metrics/pom.xml
index 52ce3b1..ba3b157 100644
--- a/components/camel-metrics/pom.xml
+++ b/components/camel-metrics/pom.xml
@@ -79,7 +79,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-test-spring3</artifactId>
+      <artifactId>${camel-test-spring-artifactId}</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

http://git-wip-us.apache.org/repos/asf/camel/blob/3adf0b70/components/camel-spring-javaconfig/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring-javaconfig/pom.xml b/components/camel-spring-javaconfig/pom.xml
index 61aa8b0..d14fe3f 100644
--- a/components/camel-spring-javaconfig/pom.xml
+++ b/components/camel-spring-javaconfig/pom.xml
@@ -66,7 +66,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-test-spring3</artifactId>
+      <artifactId>${camel-test-spring-artifactId}</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

http://git-wip-us.apache.org/repos/asf/camel/blob/3adf0b70/components/camel-testng/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-testng/pom.xml b/components/camel-testng/pom.xml
index a27eb17..9b10a70 100644
--- a/components/camel-testng/pom.xml
+++ b/components/camel-testng/pom.xml
@@ -45,7 +45,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test-spring3</artifactId>
+            <artifactId>${camel-test-spring-artifactId}</artifactId>
         </dependency>
         <dependency>
             <groupId>org.testng</groupId>

http://git-wip-us.apache.org/repos/asf/camel/blob/3adf0b70/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 385de18..98c6a01 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -73,6 +73,7 @@
     <boxjavalibv2.version>3.0.9</boxjavalibv2.version>
     <build-helper-maven-plugin-version>1.8</build-helper-maven-plugin-version>
     <c3p0-version>0.9.1.2</c3p0-version>
+    <camel-test-spring-artifactId>camel-test-spring3</camel-test-spring-artifactId>
     <castor-bundle-version>1.3.2_2</castor-bundle-version>
     <cglib-bundle-version>2.1_3_7</cglib-bundle-version>
     <cglib-version>2.2</cglib-version>
@@ -2874,6 +2875,7 @@
       <id>spring4</id>
       <properties>
         <spring-version>${spring4-version}</spring-version>
+        <camel-test-spring-artifactId>camel-test-spring</camel-test-spring-artifactId>
       </properties>
     </profile>
 


Mime
View raw message