move the derby version to a property

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

diff --git a/archiva-jetty/pom.xml b/archiva-jetty/pom.xml
index db68d095c6b185177549b7e5c2d2ae454aafad8e..76ab05d9e8f8ebc557f9d9723b1704a9e8f11581 100644 (file)
--- a/archiva-jetty/pom.xml
+++ b/archiva-jetty/pom.xml
@@ -72,7 +72,6 @@
     <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derby</artifactId>
-      <version>10.1.3.1</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>

diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index 99ec0b42775d8e621e5049ef30f3d13bd732f57a..5c03a966dfcaba44fbc4d1b6443c41ac05f684f2 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -644,7 +644,7 @@
           <dependency>
             <groupId>org.apache.derby</groupId>
             <artifactId>derby</artifactId>
-            <version>10.1.3.1</version>
+            <version>${derbyVersion}</version>
           </dependency>
           <dependency>
             <groupId>javax.mail</groupId>
@@ -695,7 +695,7 @@
           <dependency>
             <groupId>org.apache.derby</groupId>
             <artifactId>derby</artifactId>
-            <version>10.1.3.1</version>
+            <version>${derbyVersion}</version>
           </dependency>
         </dependencies>
       </plugin>
@@ -1027,7 +1027,7 @@
               <dependency>
                 <groupId>org.apache.derby</groupId>
                 <artifactId>derby</artifactId>
-                <version>10.1.3.1</version>
+                <version>${derbyVersion}</version>
               </dependency>
               <dependency>
                 <groupId>javax.mail</groupId>
@@ -1056,7 +1056,7 @@
               <dependency>
                 <groupId>org.apache.derby</groupId>
                 <artifactId>derby</artifactId>
-                <version>10.1.3.1</version>
+                <version>${derbyVersion}</version>
               </dependency>
               <dependency>
                 <groupId>javax.mail</groupId>

diff --git a/archiva-tomcat/pom.xml b/archiva-tomcat/pom.xml
index 228d96bc66f51dbcd076ea187bb5ad20ecacd197..aa9c50e820d10e1f379debbcde77167b4439b380 100644 (file)
--- a/archiva-tomcat/pom.xml
+++ b/archiva-tomcat/pom.xml
@@ -46,7 +46,6 @@
     <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derby</artifactId>
-      <version>10.1.3.1</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
@@ -87,7 +86,7 @@
                 <extraDependency>
                   <groupId>org.apache.derby</groupId>
                   <artifactId>derby</artifactId>
-                  <version>10.1.3.1</version>
+                  <version>${derbyVersion}</version>
                 </extraDependency>
                 <extraDependency>
                   <groupId>javax.mail</groupId>

diff --git a/pom.xml b/pom.xml
index 5fc2be8780075cb7524b4a08d9df7f70fe64a37b..e27f46f128b3ff4303a0c434ed4c340693e22c3d 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -68,6 +68,7 @@
     <surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile>
     <lucene.version>3.0.3</lucene.version>
     <cxfVersion>2.4.3</cxfVersion>
+    <derbyVersion>10.1.3.1</derbyVersion>
   </properties>
 
   <dependencyManagement>
@@ -557,12 +558,12 @@
       <dependency>
         <groupId>org.apache.derby</groupId>
         <artifactId>derby</artifactId>
-        <version>10.1.3.1</version>
+        <version>${derbyVersion}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.derby</groupId>
         <artifactId>derbytools</artifactId>
-        <version>10.1.3.1</version>
+        <version>${derbyVersion}</version>
       </dependency>
       <dependency>
         <groupId>dom4j</groupId>