Skip to site navigation (Press enter)

[xstream-scm] [2187] trunk: Fix version management in POMs (merge from branch).

joehni Thu, 12 Dec 2013 13:07:53 -0800

Title: [2187] trunk: Fix version management in POMs (merge from branch).

Revision: 2187
Author: joehni
Date: 2013-12-12 15:07:27 -0600 (Thu, 12 Dec 2013)

Log Message

Fix version management in POMs (merge from branch).

Modified Paths

trunk/pom.xml
trunk/xstream-benchmark/pom.xml
trunk/xstream-distribution/pom.xml
trunk/xstream-hibernate/pom.xml


Property Changed

trunk/

Diff

Property changes: trunk

Modified: svn:mergeinfo

+ /branches/v-1.4.x:2169,2179,2181,2183

Modified: trunk/pom.xml (2186 => 2187)


--- trunk/pom.xml	2013-12-12 17:53:41 UTC (rev 2186)
+++ trunk/pom.xml	2013-12-12 21:07:27 UTC (rev 2187)
@@ -105,6 +105,51 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
+        <groupId>com.thoughtworks.xstream</groupId>
+        <artifactId>xstream</artifactId>
+        <version>1.5.0-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>com.thoughtworks.xstream</groupId>
+        <artifactId>xstream</artifactId>
+        <version>1.5.0-SNAPSHOT</version>
+        <classifier>tests</classifier>
+        <type>test-jar</type>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>com.thoughtworks.xstream</groupId>
+        <artifactId>xstream</artifactId>
+        <version>1.5.0-SNAPSHOT</version>
+        <classifier>javadoc</classifier>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>com.thoughtworks.xstream</groupId>
+        <artifactId>xstream-hibernate</artifactId>
+        <version>1.5.0-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>com.thoughtworks.xstream</groupId>
+        <artifactId>xstream-hibernate</artifactId>
+        <version>1.5.0-SNAPSHOT</version>
+        <classifier>javadoc</classifier>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>com.thoughtworks.xstream</groupId>
+        <artifactId>xstream-benchmark</artifactId>
+        <version>1.5.0-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>com.thoughtworks.xstream</groupId>
+        <artifactId>xstream-benchmark</artifactId>
+        <version>1.5.0-SNAPSHOT</version>
+        <classifier>javadoc</classifier>
+        <scope>provided</scope>
+      </dependency>
+            
+      <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>
         <version>${version.commons.io}</version>

Modified: trunk/xstream-benchmark/pom.xml (2186 => 2187)


--- trunk/xstream-benchmark/pom.xml	2013-12-12 17:53:41 UTC (rev 2186)
+++ trunk/xstream-benchmark/pom.xml	2013-12-12 21:07:27 UTC (rev 2187)
@@ -118,7 +118,6 @@
     <dependency>
       <groupId>com.thoughtworks.xstream</groupId>
       <artifactId>xstream</artifactId>
-      <version>1.5.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sf.kxml</groupId>

Modified: trunk/xstream-distribution/pom.xml (2186 => 2187)


--- trunk/xstream-distribution/pom.xml	2013-12-12 17:53:41 UTC (rev 2186)
+++ trunk/xstream-distribution/pom.xml	2013-12-12 21:07:27 UTC (rev 2187)
@@ -27,19 +27,16 @@
     <dependency>
       <groupId>com.thoughtworks.xstream</groupId>
       <artifactId>xstream</artifactId>
-      <version>1.5.0-SNAPSHOT</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>com.thoughtworks.xstream</groupId>
       <artifactId>xstream-hibernate</artifactId>
-      <version>1.5.0-SNAPSHOT</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>com.thoughtworks.xstream</groupId>
       <artifactId>xstream-benchmark</artifactId>
-      <version>1.5.0-SNAPSHOT</version>
       <scope>runtime</scope>
     </dependency>
   </dependencies>
@@ -108,23 +105,17 @@
         <dependency>
           <groupId>com.thoughtworks.xstream</groupId>
           <artifactId>xstream</artifactId>
-          <version>1.4.5-SNAPSHOT</version>
           <classifier>javadoc</classifier>
-          <scope>provided</scope>
         </dependency>
         <dependency>
           <groupId>com.thoughtworks.xstream</groupId>
           <artifactId>xstream-hibernate</artifactId>
-          <version>1.4.5-SNAPSHOT</version>
           <classifier>javadoc</classifier>
-          <scope>provided</scope>
         </dependency>
         <dependency>
           <groupId>com.thoughtworks.xstream</groupId>
           <artifactId>xstream-benchmark</artifactId>
-          <version>1.4.5-SNAPSHOT</version>
           <classifier>javadoc</classifier>
-          <scope>provided</scope>
         </dependency>
       </dependencies>
     </profile>

Modified: trunk/xstream-hibernate/pom.xml (2186 => 2187)


--- trunk/xstream-hibernate/pom.xml	2013-12-12 17:53:41 UTC (rev 2186)
+++ trunk/xstream-hibernate/pom.xml	2013-12-12 21:07:27 UTC (rev 2187)
@@ -145,15 +145,12 @@
     <dependency>
       <groupId>com.thoughtworks.xstream</groupId>
       <artifactId>xstream</artifactId>
-      <version>1.5.0-SNAPSHOT</version>
       <classifier>tests</classifier>
       <type>test-jar</type>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.thoughtworks.xstream</groupId>
       <artifactId>xstream</artifactId>
-      <version>1.5.0-SNAPSHOT</version>
     </dependency>
     <dependency>
         <groupId>org.hibernate</groupId>

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email