From: Olivier Lamy <olamy@apache.org>
Date: Wed, 26 Oct 2011 14:19:14 +0000 (+0000)
Subject: move the derby version to a property
X-Git-Tag: archiva-1.4-M2~216
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e77de4841f49bfbcb8bbd1dda898838a9ee3b60c;p=archiva.git

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 db68d095c..76ab05d9e 100644
--- 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 99ec0b427..5c03a966d 100644
--- 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 228d96bc6..aa9c50e82 100644
--- 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 5fc2be878..e27f46f12 100644
--- 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>