cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject [03/12] git commit: Move pax.exam.version to parent pom
Date Fri, 12 Sep 2014 18:19:20 GMT
Move pax.exam.version to parent pom


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/985c1421
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/985c1421
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/985c1421

Branch: refs/heads/3.0.x-fixes
Commit: 985c14213ba4d60d911ea7b9bfb705455d85081c
Parents: a34df25
Author: Daniel Kulp <dkulp@apache.org>
Authored: Tue Sep 2 16:08:37 2014 -0400
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Fri Sep 12 13:56:26 2014 -0400

----------------------------------------------------------------------
 osgi/itests-felix/pom.xml         |  7 +++----
 osgi/itests/pom.xml               |  9 ++++-----
 parent/pom.xml                    |  1 +
 services/xkms/xkms-itests/pom.xml | 11 ++++-------
 4 files changed, 12 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/985c1421/osgi/itests-felix/pom.xml
----------------------------------------------------------------------
diff --git a/osgi/itests-felix/pom.xml b/osgi/itests-felix/pom.xml
index 9f39608..2a39044 100644
--- a/osgi/itests-felix/pom.xml
+++ b/osgi/itests-felix/pom.xml
@@ -29,7 +29,6 @@
     <name>Apache CXF :: OSGi :: Integration Tests pure felix</name>
     <packaging>jar</packaging>
     <properties>
-        <pax.exam.version>3.4.0</pax.exam.version>
         <pax.url.version>1.2.8</pax.url.version>
     </properties>
     <dependencies>
@@ -91,19 +90,19 @@
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
             <artifactId>pax-exam-container-native</artifactId>
-            <version>${pax.exam.version}</version>
+            <version>${cxf.pax.exam.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
             <artifactId>pax-exam-junit4</artifactId>
-            <version>${pax.exam.version}</version>
+            <version>${cxf.pax.exam.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
             <artifactId>pax-exam-link-mvn</artifactId>
-            <version>${pax.exam.version}</version>
+            <version>${cxf.pax.exam.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

http://git-wip-us.apache.org/repos/asf/cxf/blob/985c1421/osgi/itests/pom.xml
----------------------------------------------------------------------
diff --git a/osgi/itests/pom.xml b/osgi/itests/pom.xml
index 054f1e2..d2c53d4 100644
--- a/osgi/itests/pom.xml
+++ b/osgi/itests/pom.xml
@@ -29,7 +29,6 @@
     <name>Apache CXF :: OSGi :: Integration Tests</name>
     <packaging>jar</packaging>
     <properties>
-        <pax.exam.version>3.4.0</pax.exam.version>
         <cxf.surefire.fork.mode>once</cxf.surefire.fork.mode>
     </properties>
     <dependencies>
@@ -100,28 +99,28 @@
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
             <artifactId>pax-exam-junit4</artifactId>
-            <version>${pax.exam.version}</version>
+            <version>${cxf.pax.exam.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
             <artifactId>pax-exam</artifactId>
-            <version>${pax.exam.version}</version>
+            <version>${cxf.pax.exam.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
             <artifactId>pax-exam-container-karaf</artifactId>
-            <version>${pax.exam.version}</version>
+            <version>${cxf.pax.exam.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
             <artifactId>pax-exam-link-mvn</artifactId>
-            <version>${pax.exam.version}</version>
+            <version>${cxf.pax.exam.version}</version>
             <scope>test</scope>
         </dependency>
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/985c1421/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 1749879..0cf8b2a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -178,6 +178,7 @@
         <cxf.osgi.version>4.2.0</cxf.osgi.version>
         <cxf.karaf.version>2.3.6</cxf.karaf.version>
         <cxf.pax.logging.version>1.6.0</cxf.pax.logging.version>
+        <cxf.pax.exam.version>3.4.0</cxf.pax.exam.version>
         <cxf.felix.framework.version>2.0.5</cxf.felix.framework.version>
         <cxf.felix.configadmin.version>1.2.4</cxf.felix.configadmin.version>
         <cxf.xmlbeans.bundle.version>2.6.0_2</cxf.xmlbeans.bundle.version>

http://git-wip-us.apache.org/repos/asf/cxf/blob/985c1421/services/xkms/xkms-itests/pom.xml
----------------------------------------------------------------------
diff --git a/services/xkms/xkms-itests/pom.xml b/services/xkms/xkms-itests/pom.xml
index b761f54..64debcf 100644
--- a/services/xkms/xkms-itests/pom.xml
+++ b/services/xkms/xkms-itests/pom.xml
@@ -21,9 +21,6 @@
         <version>3.0.2-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
-    <properties>
-        <pax.exam.version>3.4.0</pax.exam.version>
-    </properties>
     <dependencies>
         <dependency>
             <groupId>org.apache.cxf.services.xkms</groupId>
@@ -65,28 +62,28 @@
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
             <artifactId>pax-exam-junit4</artifactId>
-            <version>${pax.exam.version}</version>
+            <version>${cxf.pax.exam.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
             <artifactId>pax-exam</artifactId>
-            <version>${pax.exam.version}</version>
+            <version>${cxf.pax.exam.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
             <artifactId>pax-exam-container-karaf</artifactId>
-            <version>${pax.exam.version}</version>
+            <version>${cxf.pax.exam.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
             <artifactId>pax-exam-link-mvn</artifactId>
-            <version>${pax.exam.version}</version>
+            <version>${cxf.pax.exam.version}</version>
             <scope>test</scope>
         </dependency>
 


Mime
View raw message