You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2011/10/26 16:19:14 UTC

svn commit: r1189229 - in /archiva/trunk: archiva-jetty/pom.xml archiva-modules/archiva-web/archiva-webapp/pom.xml archiva-tomcat/pom.xml pom.xml

Author: olamy
Date: Wed Oct 26 14:19:14 2011
New Revision: 1189229

URL: http://svn.apache.org/viewvc?rev=1189229&view=rev
Log:
move the derby version to a property

Modified:
    archiva/trunk/archiva-jetty/pom.xml
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
    archiva/trunk/archiva-tomcat/pom.xml
    archiva/trunk/pom.xml

Modified: archiva/trunk/archiva-jetty/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-jetty/pom.xml?rev=1189229&r1=1189228&r2=1189229&view=diff
==============================================================================
--- archiva/trunk/archiva-jetty/pom.xml (original)
+++ archiva/trunk/archiva-jetty/pom.xml Wed Oct 26 14:19:14 2011
@@ -72,7 +72,6 @@
     <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derby</artifactId>
-      <version>10.1.3.1</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=1189229&r1=1189228&r2=1189229&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Wed Oct 26 14:19:14 2011
@@ -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>

Modified: archiva/trunk/archiva-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-tomcat/pom.xml?rev=1189229&r1=1189228&r2=1189229&view=diff
==============================================================================
--- archiva/trunk/archiva-tomcat/pom.xml (original)
+++ archiva/trunk/archiva-tomcat/pom.xml Wed Oct 26 14:19:14 2011
@@ -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>

Modified: archiva/trunk/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1189229&r1=1189228&r2=1189229&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Wed Oct 26 14:19:14 2011
@@ -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>