flip the version over to make it easier to work on concurrent branches

git-svn-id: https://svn.apache.org/repos/asf/archiva/branches@723576 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/MRM-1025/archiva-cli/pom.xml b/MRM-1025/archiva-cli/pom.xml
index 6fc0f2cc73c8a7af563b5232c8952007e45b8154..b1d36499b98184cae5fbaed8d3264a8771eec4b6 100644 (file)
--- a/MRM-1025/archiva-cli/pom.xml
+++ b/MRM-1025/archiva-cli/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-cli</artifactId>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-dependency-tree-consumer</artifactId>
-      <version>1.2-SNAPSHOT</version>
+      <version>1.2-MRM1025-SNAPSHOT</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-metadata-consumer</artifactId>
-      <version>1.2-SNAPSHOT</version>
+      <version>1.2-MRM1025-SNAPSHOT</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>

diff --git a/MRM-1025/archiva-docs/pom.xml b/MRM-1025/archiva-docs/pom.xml
index fe78803d507432a6bb09478d92fec2709acdf579..1c101bb06cf7400e8a34879c60c30cad113495a9 100644 (file)
--- a/MRM-1025/archiva-docs/pom.xml
+++ b/MRM-1025/archiva-docs/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-docs</artifactId>

diff --git a/MRM-1025/archiva-jetty/pom.xml b/MRM-1025/archiva-jetty/pom.xml
index 09928b1d851ec88e45682cbbbaf2d9438d973874..f4b421b2edbab0edc3d08e3678af1b14db337b6f 100644 (file)
--- a/MRM-1025/archiva-jetty/pom.xml
+++ b/MRM-1025/archiva-jetty/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-jetty</artifactId>
   <packaging>pom</packaging>

diff --git a/MRM-1025/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml b/MRM-1025/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml
index f23ee3a2016e6a0d6f7a436b32f01bc48421b66a..d142b483f8df76b9d0a692364774ab98a7b1144b 100644 (file)
--- a/MRM-1025/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml
+++ b/MRM-1025/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-artifact-converter</artifactId>
   <name>Archiva Artifact Converter</name>

diff --git a/MRM-1025/archiva-modules/archiva-base/archiva-checksum/pom.xml b/MRM-1025/archiva-modules/archiva-base/archiva-checksum/pom.xml
index 0764fcc12af690684f2c1160a9c9937866ab81b4..fb92fb2ad1c377063f15da6fdbf61925bde43743 100644 (file)
--- a/MRM-1025/archiva-modules/archiva-base/archiva-checksum/pom.xml
+++ b/MRM-1025/archiva-modules/archiva-base/archiva-checksum/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-checksum</artifactId>
   <name>Archiva Checksum</name>

diff --git a/MRM-1025/archiva-modules/archiva-base/archiva-common/pom.xml b/MRM-1025/archiva-modules/archiva-base/archiva-common/pom.xml
index 2be6150909259046bb603894febca5ecaee15b78..e5b2f8f60193b7a789b02a9562cd6846ad4c71ab 100644 (file)
--- a/MRM-1025/archiva-modules/archiva-base/archiva-common/pom.xml
+++ b/MRM-1025/archiva-modules/archiva-base/archiva-common/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-common</artifactId>

diff --git a/MRM-1025/archiva-modules/archiva-base/archiva-configuration/pom.xml b/MRM-1025/archiva-modules/archiva-base/archiva-configuration/pom.xml
index 2999766b95400ba0cc63ebba42bd5cf400e9c266..b6dd0fa49d0aa65f947efca27b57e231df421d3e 100644 (file)
--- a/MRM-1025/archiva-modules/archiva-base/archiva-configuration/pom.xml
+++ b/MRM-1025/archiva-modules/archiva-base/archiva-configuration/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-configuration</artifactId>

diff --git a/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml b/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml
index 9d4777d45e06d166aa2b634b96bcfef416dd34fb..94f29a0589b406f4ccb7827f85f721644d90b7a9 100644 (file)
--- a/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml
+++ b/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-consumers</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml b/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
index cbf3e0557c9eff246342c1a539970ad65bcad25f..40b5aa0dd01a2995d40e359810146248769216dc 100644 (file)
--- a/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
+++ b/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-consumers</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml b/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml
index 798ee845ab962cf10b23a20191471fa41d99dca0..d1be9c93d8e20dc971ec389e90729dc809752142 100644 (file)
--- a/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml
+++ b/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-consumers</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml b/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml
index e417bcd5a45cd4af8105382817e891376b0931d3..d8cc39e1513e3d7b792d2ed44d7d7e3bff71ea7a 100644 (file)
--- a/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml
+++ b/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-consumers</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-dependency-tree-consumer</artifactId>
   <name>Archiva Consumers :: Dependency Tree Consumer</name>

diff --git a/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml b/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
index cc346c21842f4a8b673c344b9109f25e238fcbfa..f26574969f5d413d1d3dbf14b98ef37814cdf6ed 100644 (file)
--- a/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
+++ b/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-consumers</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml b/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml
index 98fb3565689786a5bcdeb8402dccae031af4e5f2..3e1778df5419832f50a1ba242d35195cb1cbb250 100644 (file)
--- a/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml
+++ b/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>archiva-consumers</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-metadata-consumer</artifactId>
   <name>Archiva Metadata Consumer</name>
@@ -35,17 +35,17 @@
     <dependency> <!--  TODO: version into parent -->
       <groupId>org.apache.archiva</groupId>
       <artifactId>metadata-model</artifactId>
-      <version>1.2-SNAPSHOT</version>
+      <version>1.2-MRM1025-SNAPSHOT</version>
     </dependency>
     <dependency> <!--  TODO: version into parent -->
       <groupId>org.apache.archiva</groupId>
       <artifactId>metadata-repository-api</artifactId>
-      <version>1.2-SNAPSHOT</version>
+      <version>1.2-MRM1025-SNAPSHOT</version>
     </dependency>
     <dependency> <!--  TODO: version into parent, temporary coupling to file based repo -->
       <groupId>org.apache.archiva</groupId>
       <artifactId>metadata-repository-file</artifactId>
-      <version>1.2-SNAPSHOT</version>
+      <version>1.2-MRM1025-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>

diff --git a/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml b/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml
index 965fbea0073ccd68d0160712042c784abf1e036a..e089ffb9c62bfc395da7b0666a78ab3e72f6c61a 100644 (file)
--- a/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml
+++ b/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-consumers</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/MRM-1025/archiva-modules/archiva-base/archiva-consumers/pom.xml b/MRM-1025/archiva-modules/archiva-base/archiva-consumers/pom.xml
index 5ffbb940666e95c87a22b3239105a8320d0911e6..2d0e558acca51f03248f1f8c616c5a963a1a5206 100644 (file)
--- a/MRM-1025/archiva-modules/archiva-base/archiva-consumers/pom.xml
+++ b/MRM-1025/archiva-modules/archiva-base/archiva-consumers/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/MRM-1025/archiva-modules/archiva-base/archiva-converter/pom.xml b/MRM-1025/archiva-modules/archiva-base/archiva-converter/pom.xml
index c4c1504bb4973ca2794ec52baf31e9f904ef3d66..59c514c34b4e379de8a6dd6c394655a3864d39e9 100644 (file)
--- a/MRM-1025/archiva-modules/archiva-base/archiva-converter/pom.xml
+++ b/MRM-1025/archiva-modules/archiva-base/archiva-converter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-converter</artifactId>

diff --git a/MRM-1025/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml b/MRM-1025/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml
index a03cebe34f4b4282db7ff5c5e1849f9fb6b4f2be..6ee51096aa0fe4a98e528aab0c783463b45998ab 100644 (file)
--- a/MRM-1025/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml
+++ b/MRM-1025/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-dependency-graph</artifactId>

diff --git a/MRM-1025/archiva-modules/archiva-base/archiva-indexer/pom.xml b/MRM-1025/archiva-modules/archiva-base/archiva-indexer/pom.xml
index f887db81b37aa6c71c5c4217be85fa89d849ed1d..acdb895b2f9a8ad0344f48a1d48d46c950131020 100644 (file)
--- a/MRM-1025/archiva-modules/archiva-base/archiva-indexer/pom.xml
+++ b/MRM-1025/archiva-modules/archiva-base/archiva-indexer/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-indexer</artifactId>

diff --git a/MRM-1025/archiva-modules/archiva-base/archiva-model/pom.xml b/MRM-1025/archiva-modules/archiva-base/archiva-model/pom.xml
index 1318d53a26fdd71ce1bfd06297ae84dc5c8221f7..eaa37a4b7a113d0c3601f12b1a79c6ac4fe73592 100755 (executable)
--- a/MRM-1025/archiva-modules/archiva-base/archiva-model/pom.xml
+++ b/MRM-1025/archiva-modules/archiva-base/archiva-model/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-model</artifactId>

diff --git a/MRM-1025/archiva-modules/archiva-base/archiva-policies/pom.xml b/MRM-1025/archiva-modules/archiva-base/archiva-policies/pom.xml
index 7489f08bca5d2269e28d566e2d80bcd4995f70da..6076615960b1de21ca797773ea1eb2d09983fbbc 100644 (file)
--- a/MRM-1025/archiva-modules/archiva-base/archiva-policies/pom.xml
+++ b/MRM-1025/archiva-modules/archiva-base/archiva-policies/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-policies</artifactId>

diff --git a/MRM-1025/archiva-modules/archiva-base/archiva-proxy/pom.xml b/MRM-1025/archiva-modules/archiva-base/archiva-proxy/pom.xml
index 5e5e2d2d99751ce95bf4ee3fab8b4c53d659ae46..1609cfb32566bfbc9dc4e75a404ef2d5a34af436 100644 (file)
--- a/MRM-1025/archiva-modules/archiva-base/archiva-proxy/pom.xml
+++ b/MRM-1025/archiva-modules/archiva-base/archiva-proxy/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-proxy</artifactId>

diff --git a/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/pom.xml b/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
index de93e0429aa749ea66231dd25faa3f8468c3f08d..9873baaba560cdf2c97723f615272766c01d2d5a 100644 (file)
--- a/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
+++ b/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-repository-layer</artifactId>

diff --git a/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml b/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml
index 976ce56c459587539956a8bc730b358be036aeb8..3ccad967095c0ba51188265f083cf7dcdc582090 100644 (file)
--- a/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml
+++ b/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>archiva-base</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-repository-scanner</artifactId>
   <name>Archiva Repository Scanner</name>

diff --git a/MRM-1025/archiva-modules/archiva-base/archiva-transaction/pom.xml b/MRM-1025/archiva-modules/archiva-base/archiva-transaction/pom.xml
index c9655ca902c1ef4c366f007a128b3f379b64586c..c80a93e453a9b1ac3a8c2547f8ef46010a78a0f2 100644 (file)
--- a/MRM-1025/archiva-modules/archiva-base/archiva-transaction/pom.xml
+++ b/MRM-1025/archiva-modules/archiva-base/archiva-transaction/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-transaction</artifactId>
   <name>Archiva Transactions</name>

diff --git a/MRM-1025/archiva-modules/archiva-base/archiva-xml-tools/pom.xml b/MRM-1025/archiva-modules/archiva-base/archiva-xml-tools/pom.xml
index 80177618d68dd7b4553b93377506196cafec8bf5..ea667306f3b2097947d6aa4badc51859f99a6cad 100644 (file)
--- a/MRM-1025/archiva-modules/archiva-base/archiva-xml-tools/pom.xml
+++ b/MRM-1025/archiva-modules/archiva-base/archiva-xml-tools/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-xml-tools</artifactId>

diff --git a/MRM-1025/archiva-modules/archiva-base/pom.xml b/MRM-1025/archiva-modules/archiva-base/pom.xml
index 6fe1fb5a41dd5bfe31ed8d749ec835d496ebb577..41553f74ac525b1882595815d25ea1118e6b4ba4 100644 (file)
--- a/MRM-1025/archiva-modules/archiva-base/pom.xml
+++ b/MRM-1025/archiva-modules/archiva-base/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-modules</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
   </parent>
 
   <artifactId>archiva-base</artifactId>

diff --git a/MRM-1025/archiva-modules/archiva-database/pom.xml b/MRM-1025/archiva-modules/archiva-database/pom.xml
index fad154168f1fefa3ca9ba29385149d4da88215eb..edfada4284233adc250dd8ed172e042ea2652e24 100755 (executable)
--- a/MRM-1025/archiva-modules/archiva-database/pom.xml
+++ b/MRM-1025/archiva-modules/archiva-database/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-modules</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-database</artifactId>

diff --git a/MRM-1025/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml b/MRM-1025/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml
index 30969cb237ccb750b4422397c11751ee06c121bf..f1e47ec8785e7c14c9b21d606c9a9b5c315c6df4 100755 (executable)
--- a/MRM-1025/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml
+++ b/MRM-1025/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-reporting</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-artifact-reports</artifactId>

diff --git a/MRM-1025/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml b/MRM-1025/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml
index 6d50ef3ee9e6dbef0abd3a9dce6277ce08f6a8c5..cd2bace28ad184d78883ffdd419b3611a53a5eaa 100755 (executable)
--- a/MRM-1025/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml
+++ b/MRM-1025/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-reporting</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-metadata-reports</artifactId>

diff --git a/MRM-1025/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml b/MRM-1025/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml
index b8be1ec3491bbff478d4e5dcf98fbaa3ec7a4456..9517e38d5dc7a7be8011c9c7e09fad549f7d7d60 100755 (executable)
--- a/MRM-1025/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml
+++ b/MRM-1025/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-reporting</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-project-reports</artifactId>

diff --git a/MRM-1025/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml b/MRM-1025/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml
index cf94e84b8c28c559fb2f24b6f3df98404144642c..2cb508e2061bcda2a0cce08e6a82ecd098dfc650 100755 (executable)
--- a/MRM-1025/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml
+++ b/MRM-1025/archiva-modules/archiva-reporting/archiva-report-manager/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-reporting</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-report-manager</artifactId>

diff --git a/MRM-1025/archiva-modules/archiva-reporting/pom.xml b/MRM-1025/archiva-modules/archiva-reporting/pom.xml
index bb2193438784111383d3823905460bec60c9c958..32a66cc8876dbe0c9f052ac742c481b344e6ee5b 100644 (file)
--- a/MRM-1025/archiva-modules/archiva-reporting/pom.xml
+++ b/MRM-1025/archiva-modules/archiva-reporting/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-modules</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/MRM-1025/archiva-modules/archiva-scheduled/pom.xml b/MRM-1025/archiva-modules/archiva-scheduled/pom.xml
index 674341f36e38cdd5602eab3ac127ef2733f051c9..c9d617e73e5337b13574b41c1b979fffaf0d29e1 100644 (file)
--- a/MRM-1025/archiva-modules/archiva-scheduled/pom.xml
+++ b/MRM-1025/archiva-modules/archiva-scheduled/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-modules</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-scheduled</artifactId>

diff --git a/MRM-1025/archiva-modules/archiva-web/archiva-applet/pom.xml b/MRM-1025/archiva-modules/archiva-web/archiva-applet/pom.xml
index 47c84891097fffa5d5241710c5fad447527257e7..95f92160a62c86b0b2d81b782dee3e4b360910da 100644 (file)
--- a/MRM-1025/archiva-modules/archiva-web/archiva-applet/pom.xml
+++ b/MRM-1025/archiva-modules/archiva-web/archiva-applet/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-web</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-applet</artifactId>
   <name>Archiva Web :: Applet</name>

diff --git a/MRM-1025/archiva-modules/archiva-web/archiva-rss/pom.xml b/MRM-1025/archiva-modules/archiva-web/archiva-rss/pom.xml
index be70c4a21d4a103a17877087ddb5b3d06e663810..4ce1fb9283372aa03220d9b335064c93e48b2eee 100644 (file)
--- a/MRM-1025/archiva-modules/archiva-web/archiva-rss/pom.xml
+++ b/MRM-1025/archiva-modules/archiva-web/archiva-rss/pom.xml
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>archiva-web</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-rss</artifactId>

diff --git a/MRM-1025/archiva-modules/archiva-web/archiva-security/pom.xml b/MRM-1025/archiva-modules/archiva-web/archiva-security/pom.xml
index e61b0b47b41c7410ee7e0292eda87c0e340f5c91..cff57ebad389fda2d891fcd7b306de147892e0ed 100644 (file)
--- a/MRM-1025/archiva-modules/archiva-web/archiva-security/pom.xml
+++ b/MRM-1025/archiva-modules/archiva-web/archiva-security/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-web</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-security</artifactId>

diff --git a/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/pom.xml b/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
index 4d996f96aef52889348271d38233a3a27a59efbe..b6c557a32456d6f44fdeae6b394ffe318f5126d3 100644 (file)
--- a/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
+++ b/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-web</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-webapp-test</artifactId>
   <packaging>pom</packaging>
@@ -318,4 +318,4 @@
       </properties>
     </profile>
   </profiles>
-</project>
\ No newline at end of file
+</project>

diff --git a/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/projects/bad-dependency/pom.xml b/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/projects/bad-dependency/pom.xml
index 24fc2aa462572094114c6a3334e3f454e5d31a06..f21615fd9f246b90fdf15d1b9ac2ff04e81b37ac 100644 (file)
--- a/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/projects/bad-dependency/pom.xml
+++ b/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/projects/bad-dependency/pom.xml
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.apache.archiva.web.test</groupId>
       <artifactId>foo-bar</artifactId>
-      <version>1.2-SNAPSHOT</version>
+      <version>1.2-MRM1025-SNAPSHOT</version>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>

diff --git a/MRM-1025/archiva-modules/archiva-web/archiva-webapp/pom.xml b/MRM-1025/archiva-modules/archiva-web/archiva-webapp/pom.xml
index 768236b3d6478913ffa59f92a9b19757eeb4f689..c6bc1715a8ffc31c529dffb03e05b9c5fc5e11cc 100644 (file)
--- a/MRM-1025/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/MRM-1025/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-web</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>archiva-webapp</artifactId>
@@ -73,7 +73,7 @@
     <dependency>
       <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-metadata-consumer</artifactId>
-      <version>1.2-SNAPSHOT</version>
+      <version>1.2-MRM1025-SNAPSHOT</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>

diff --git a/MRM-1025/archiva-modules/archiva-web/archiva-webdav/pom.xml b/MRM-1025/archiva-modules/archiva-web/archiva-webdav/pom.xml
index 3e5a3199413bcc40e380dbff74e69970d1ca7226..9c25866ca7accbf166197f4fba7e9221ed2dc448 100644 (file)
--- a/MRM-1025/archiva-modules/archiva-web/archiva-webdav/pom.xml
+++ b/MRM-1025/archiva-modules/archiva-web/archiva-webdav/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-web</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
   </parent>
 
   <artifactId>archiva-webdav</artifactId>

diff --git a/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml b/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml
index 12dd0224cb5f3283fd7425b4e97e1ae32e69c6e6..c76c9389d477bc7a477408371a493b8d008f07ac 100644 (file)
--- a/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml
+++ b/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-xmlrpc</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>archiva-xmlrpc-api</artifactId>
@@ -19,4 +19,4 @@
       <artifactId>atlassian-xmlrpc-binder-annotations</artifactId>
     </dependency>
   </dependencies>  
-</project>
\ No newline at end of file
+</project>

diff --git a/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml b/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml
index 07c668a9910c95352126fd2f962b8490707a652c..c39e34d7043c40209e7dce9ea6c899b58dcdbb72 100644 (file)
--- a/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml
+++ b/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>archiva-xmlrpc</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-xmlrpc-client</artifactId>

diff --git a/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml b/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml
index e2d5279af72550531d715b42896ecccc19d3e65a..148d546d503975dee4c6b3feb1be916144c41efd 100644 (file)
--- a/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml
+++ b/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-xmlrpc</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>archiva-xmlrpc-security</artifactId>
@@ -61,4 +61,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>

diff --git a/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml b/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml
index 0d7e136b1d39481fe1a89dbbc77e2d4f966f047c..c6b877343948f1329c4ceb323e239246f598d95d 100644 (file)
--- a/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml
+++ b/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-xmlrpc</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>archiva-xmlrpc-services</artifactId>
@@ -46,4 +46,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>

diff --git a/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml b/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml
index df9b70aed902e68fc82acced11f3807e88e6ad31..de1bf6b7e6d01561d75c15650beeefc6e2ce425d 100644 (file)
--- a/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml
+++ b/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-web</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>archiva-xmlrpc</artifactId>

diff --git a/MRM-1025/archiva-modules/archiva-web/pom.xml b/MRM-1025/archiva-modules/archiva-web/pom.xml
index e3421d23e6fcedb4eb97bffedf5611f2415222b8..03c756d097b437caa5d7c709782c75f9986f74c0 100644 (file)
--- a/MRM-1025/archiva-modules/archiva-web/pom.xml
+++ b/MRM-1025/archiva-modules/archiva-web/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-modules</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/MRM-1025/archiva-modules/metadata/metadata-model/pom.xml b/MRM-1025/archiva-modules/metadata/metadata-model/pom.xml
index e702fb89a91b15c2f8308175099ff4cf6c314f0b..149930cedd06428c7c8a66de512803afa52a9b51 100644 (file)
--- a/MRM-1025/archiva-modules/metadata/metadata-model/pom.xml
+++ b/MRM-1025/archiva-modules/metadata/metadata-model/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>metadata</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
   </parent>
   <artifactId>metadata-model</artifactId>
   <name>Archiva Metadata Model</name>

diff --git a/MRM-1025/archiva-modules/metadata/metadata-repository-api/pom.xml b/MRM-1025/archiva-modules/metadata/metadata-repository-api/pom.xml
index 62e3afe8fa76843e71f95784f57d15bf2a3184f9..1993e9f6be2d2b89b400b315dc21da5d9f9ccc73 100644 (file)
--- a/MRM-1025/archiva-modules/metadata/metadata-repository-api/pom.xml
+++ b/MRM-1025/archiva-modules/metadata/metadata-repository-api/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>metadata</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
   </parent>
   <artifactId>metadata-repository-api</artifactId>
   <name>Archiva Metadata Repository API</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>org.apache.archiva</groupId>
       <artifactId>metadata-model</artifactId>
-      <version>1.2-SNAPSHOT</version> <!--  TODO: dep mgmt -->
+      <version>1.2-MRM1025-SNAPSHOT</version> <!--  TODO: dep mgmt -->
     </dependency>
   </dependencies>
 </project>

diff --git a/MRM-1025/archiva-modules/metadata/pom.xml b/MRM-1025/archiva-modules/metadata/pom.xml
index 7474c7c88f0056c7d98569bd91aba494052855ba..b2894809139aa0ed68c2c850daa1cd983c8806f7 100644 (file)
--- a/MRM-1025/archiva-modules/metadata/pom.xml
+++ b/MRM-1025/archiva-modules/metadata/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>archiva-modules</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
   </parent>
   <artifactId>metadata</artifactId>
   <name>Archiva Metadata</name>
@@ -30,4 +30,4 @@
     <module>metadata-model</module>
     <module>metadata-repository-api</module>
   </modules>
-</project>
\ No newline at end of file
+</project>

diff --git a/MRM-1025/archiva-modules/plugins/metadata-repository-file/pom.xml b/MRM-1025/archiva-modules/plugins/metadata-repository-file/pom.xml
index 47bdeaee89bc01750d933456a10ce2b531c0a9a0..580c8cd0fce5a816c2287596d49aed9f56250358 100644 (file)
--- a/MRM-1025/archiva-modules/plugins/metadata-repository-file/pom.xml
+++ b/MRM-1025/archiva-modules/plugins/metadata-repository-file/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>plugins</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
   </parent>
   <artifactId>metadata-repository-file</artifactId>
   <name>File System Backed Metadata Repository</name>
@@ -31,11 +31,11 @@
     <dependency>
       <groupId>org.apache.archiva</groupId>
       <artifactId>metadata-repository-api</artifactId>
-      <version>1.2-SNAPSHOT</version>    
+      <version>1.2-MRM1025-SNAPSHOT</version>    
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>

diff --git a/MRM-1025/archiva-modules/plugins/pom.xml b/MRM-1025/archiva-modules/plugins/pom.xml
index 2dfb21796219b589d1075c3cc15bb1b4ec95eb16..a2f07ffa1f3b9e53523cc0fbf61b78f77ccd5864 100644 (file)
--- a/MRM-1025/archiva-modules/plugins/pom.xml
+++ b/MRM-1025/archiva-modules/plugins/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>archiva-modules</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
   </parent>
   <artifactId>plugins</artifactId>
   <name>Archiva Core Plugins</name>
@@ -29,4 +29,4 @@
   <modules>
     <module>metadata-repository-file</module>
   </modules>
-</project>
\ No newline at end of file
+</project>

diff --git a/MRM-1025/archiva-modules/pom.xml b/MRM-1025/archiva-modules/pom.xml
index d925ff4b618e5f1be4aa1a1029e6c712e6dcb016..d300c4c44be0b4d293ab6a6c33990c5003b77b50 100644 (file)
--- a/MRM-1025/archiva-modules/pom.xml
+++ b/MRM-1025/archiva-modules/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>archiva</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2-MRM1025-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-modules</artifactId>
@@ -203,4 +203,4 @@
       <url>${siteBaseDeployment}/ref/${project.version}</url>
     </site>
   </distributionManagement>
-</project>
\ No newline at end of file
+</project>

diff --git a/MRM-1025/pom.xml b/MRM-1025/pom.xml
index 3ae763ea527d27b8c22ac87f3d98e6ca7d690036..e74f63af3be3926a83eb8295d1121e68c139bece 100644 (file)
--- a/MRM-1025/pom.xml
+++ b/MRM-1025/pom.xml
@@ -34,7 +34,7 @@
   <name>Archiva</name>
   <artifactId>archiva</artifactId>
   <packaging>pom</packaging>
-  <version>1.2-SNAPSHOT</version>
+  <version>1.2-MRM1025-SNAPSHOT</version>
   <url>http://archiva.apache.org</url>
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/archiva/trunk</connection>
@@ -248,47 +248,47 @@
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-applet</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.2-MRM1025-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-artifact-converter</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.2-MRM1025-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-artifact-reports</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.2-MRM1025-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-checksum</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.2-MRM1025-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-common</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.2-MRM1025-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-configuration</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.2-MRM1025-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-consumer-api</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.2-MRM1025-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-converter</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.2-MRM1025-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-dependency-graph</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.2-MRM1025-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
@@ -298,120 +298,120 @@
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-core-consumers</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.2-MRM1025-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-database</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.2-MRM1025-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-database-consumers</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.2-MRM1025-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-indexer</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.2-MRM1025-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-lucene-consumers</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.2-MRM1025-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-model</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.2-MRM1025-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-policies</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.2-MRM1025-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-proxy</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.2-MRM1025-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-report-manager</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.2-MRM1025-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-repository-layer</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.2-MRM1025-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-repository-scanner</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.2-MRM1025-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-scheduled</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.2-MRM1025-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-security</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.2-MRM1025-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-signature-consumers</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.2-MRM1025-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-transaction</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.2-MRM1025-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-docs</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.2-MRM1025-SNAPSHOT</version>
         <type>zip</type>
         <classifier>docs</classifier>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-webapp</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.2-MRM1025-SNAPSHOT</version>
         <type>war</type>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-xml-tools</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.2-MRM1025-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-webdav</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.2-MRM1025-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-rss</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.2-MRM1025-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>      
         <artifactId>archiva-xmlrpc-api</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.2-MRM1025-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-xmlrpc-services</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.2-MRM1025-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-xmlrpc-security</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.2-MRM1025-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>