You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2005/09/30 00:58:08 UTC

svn commit: r292571 - in /incubator/jackrabbit/trunk: ./ contrib/bdb-persistence/ contrib/db-persistence/ contrib/examples/ contrib/jca/ contrib/jcr-ext/ contrib/jcr-rmi/ contrib/jcr-server/webapp/ contrib/jcr-server/webdav/ contrib/orm-persistence/ co...

Author: jukka
Date: Thu Sep 29 15:57:55 2005
New Revision: 292571

URL: http://svn.apache.org/viewcvs?rev=292571&view=rev
Log:
JCR-223: Use the groupId/artifactId syntax instead of the deprecated id syntax for dependencies.

Modified:
    incubator/jackrabbit/trunk/contrib/bdb-persistence/project.xml
    incubator/jackrabbit/trunk/contrib/db-persistence/project.xml
    incubator/jackrabbit/trunk/contrib/examples/project.xml
    incubator/jackrabbit/trunk/contrib/jca/project.xml
    incubator/jackrabbit/trunk/contrib/jcr-ext/project.xml
    incubator/jackrabbit/trunk/contrib/jcr-rmi/project.xml
    incubator/jackrabbit/trunk/contrib/jcr-server/webapp/project.xml
    incubator/jackrabbit/trunk/contrib/jcr-server/webdav/project.xml
    incubator/jackrabbit/trunk/contrib/orm-persistence/project.xml
    incubator/jackrabbit/trunk/contrib/tck-webapp/project.xml
    incubator/jackrabbit/trunk/project.xml

Modified: incubator/jackrabbit/trunk/contrib/bdb-persistence/project.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/bdb-persistence/project.xml?rev=292571&r1=292570&r2=292571&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/bdb-persistence/project.xml (original)
+++ incubator/jackrabbit/trunk/contrib/bdb-persistence/project.xml Thu Sep 29 15:57:55 2005
@@ -89,7 +89,8 @@
 			in the core project	
 		-->
 		<dependency>
-			<id>concurrent</id>
+			<groupId>concurrent</groupId>
+			<artifactId>concurrent</artifactId>
 			<version>1.3.4</version>
 		</dependency>
 		<dependency>
@@ -98,19 +99,22 @@
 			<version>1.0-M1</version>
 		</dependency>
 		<dependency>
-			<id>log4j</id>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
 			<version>1.2.8</version>
 		</dependency>
 
 		<!--
 			runtime dependencies of jackrabbit/jUnit test-cases 
 		-->
-	        <dependency>
-			<id>commons-collections</id>
+	    <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
 			<version>3.1</version>
-	        </dependency>
+	    </dependency>
 		<dependency>
-			<id>log4j</id>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
 			<version>1.2.8</version>
 		</dependency>
 		<dependency>

Modified: incubator/jackrabbit/trunk/contrib/db-persistence/project.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/db-persistence/project.xml?rev=292571&r1=292570&r2=292571&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/db-persistence/project.xml (original)
+++ incubator/jackrabbit/trunk/contrib/db-persistence/project.xml Thu Sep 29 15:57:55 2005
@@ -54,7 +54,8 @@
           in the core project	
         -->
         <dependency>
-            <id>concurrent</id>
+            <groupId>concurrent</groupId>
+            <artifactId>concurrent</artifactId>
             <version>1.3.4</version>
         </dependency>
         <dependency>
@@ -63,7 +64,8 @@
             <version>1.0-M1</version>
         </dependency>
         <dependency>
-            <id>log4j</id>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
             <version>1.2.8</version>
         </dependency>
         
@@ -81,7 +83,8 @@
             <version>3.0.10</version>
         </dependency>
         <dependency>
-            <id>commons-collections</id>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
             <version>3.1</version>
         </dependency>
         <dependency>

Modified: incubator/jackrabbit/trunk/contrib/examples/project.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/examples/project.xml?rev=292571&r1=292570&r2=292571&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/examples/project.xml (original)
+++ incubator/jackrabbit/trunk/contrib/examples/project.xml Thu Sep 29 15:57:55 2005
@@ -65,11 +65,13 @@
 
     <!--d Runtime dependencies needed by Jackrabbit -->
     <dependency>
-      <id>concurrent</id>
+      <groupId>concurrent</groupId>
+      <artifactId>concurrent</artifactId>
       <version>1.3.4</version>
     </dependency>
     <dependency>
-      <id>commons-collections</id>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
       <version>3.1</version>
     </dependency>
     <dependency>
@@ -78,7 +80,8 @@
       <version>1.0-M1</version>
     </dependency>
     <dependency>
-      <id>log4j</id>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
       <version>1.2.8</version>
     </dependency>
     <dependency>
@@ -114,7 +117,8 @@
       <url>http://www.day.com/maven/cqfs/jars/cqfs-3.5.6-SNAPSHOT.jar</url>
     </dependency>
     <dependency>
-      <id>commons-logging</id>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
       <version>1.0</version>
     </dependency>
   </dependencies>

Modified: incubator/jackrabbit/trunk/contrib/jca/project.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jca/project.xml?rev=292571&r1=292570&r2=292571&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jca/project.xml (original)
+++ incubator/jackrabbit/trunk/contrib/jca/project.xml Thu Sep 29 15:57:55 2005
@@ -25,14 +25,16 @@
 	    </properties>
 	</dependency>
 	<dependency>
-	    <id>concurrent</id>
+	    <groupId>concurrent</groupId>
+	    <artifactId>concurrent</artifactId>
 	    <version>1.3.4</version>
 	    <properties>
 		<rar.bundle>true</rar.bundle>
 	    </properties>	    
 	</dependency>  
 	<dependency>
-	    <id>commons-collections</id>
+	    <groupId>commons-collections</groupId>
+	    <artifactId>commons-collections</artifactId>
 	    <version>3.1</version>
 	    <properties>
 		<rar.bundle>true</rar.bundle>
@@ -48,7 +50,8 @@
 	    </properties>	    
 	</dependency> 
 	<dependency>
-	    <id>log4j</id>
+	    <artifactId>log4j</artifactId>
+	    <groupId>log4j</groupId>
 	    <version>1.2.8</version>
 	    <properties>
 		<rar.bundle>true</rar.bundle>
@@ -79,7 +82,8 @@
 	    </properties>	    
 	</dependency> 
 	<dependency>
-	    <id>commons-logging</id>
+	    <groupId>commons-logging</groupId>
+	    <artifactId>commons-logging</artifactId>
 	    <version>1.0</version>
 	    <properties>
 		<rar.bundle>true</rar.bundle>

Modified: incubator/jackrabbit/trunk/contrib/jcr-ext/project.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-ext/project.xml?rev=292571&r1=292570&r2=292571&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-ext/project.xml (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-ext/project.xml Thu Sep 29 15:57:55 2005
@@ -67,12 +67,14 @@
       <version>2.6.2</version>
     </dependency>
     <dependency>
-      <id>log4j</id>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
       <version>1.2.8</version>
     </dependency>
     <dependency>
       <!-- Commons Codec is used for Base64 support -->
-      <id>commons-codec</id>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
       <version>1.3</version>
     </dependency>
   </dependencies>

Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/project.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/project.xml?rev=292571&r1=292570&r2=292571&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/project.xml (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/project.xml Thu Sep 29 15:57:55 2005
@@ -82,15 +82,18 @@
       <version>2.6.2</version>
     </dependency>
     <dependency>
-      <id>easymock</id>
+      <groupId>easymock</groupId>
+      <artifactId>easymock</artifactId>
       <version>1.1</version>
     </dependency>
     <dependency>
-      <id>junit</id>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
       <version>3.8.1</version>
     </dependency>
     <dependency>
-      <id>commons-logging</id>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
       <version>1.0</version>
     </dependency>
   </dependencies>

Modified: incubator/jackrabbit/trunk/contrib/jcr-server/webapp/project.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-server/webapp/project.xml?rev=292571&r1=292570&r2=292571&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-server/webapp/project.xml (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-server/webapp/project.xml Thu Sep 29 15:57:55 2005
@@ -91,39 +91,45 @@
         
         <!-- non-jackrabbit dependencies -->
         <dependency>
-            <id>jdom</id>
+            <groupId>jdom</groupId>
+            <artifactId>jdom</artifactId>
             <version>1.0</version>
             <properties>
                 <war.bundle>true</war.bundle>
             </properties>
         </dependency>
         <dependency>
-            <id>log4j</id>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
             <version>1.2.8</version>
             <properties>
                 <war.bundle>true</war.bundle>
             </properties>
         </dependency>
         <dependency>
-            <id>junit</id>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
             <version>3.8.1</version>
         </dependency>
         <dependency>
-            <id>commons-chain</id>
+            <groupId>commons-chain</groupId>
+            <artifactId>commons-chain</artifactId>
             <version>1.0</version>
             <properties>
                 <war.bundle>true</war.bundle>
             </properties>
         </dependency>
         <dependency>
-            <id>commons-digester</id>
+            <groupId>commons-digester</groupId>
+            <artifactId>commons-digester</artifactId>
             <version>1.6</version>
             <properties>
                 <war.bundle>true</war.bundle>
             </properties>
         </dependency>
         <dependency>
-            <id>commons-beanutils</id>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
             <version>1.7.0</version>
             <properties>
                 <war.bundle>true</war.bundle>
@@ -132,14 +138,16 @@
 
         <!-- dependencies of jackrabbit -->
         <dependency>
-          <id>concurrent</id>
+          <groupId>concurrent</groupId>
+          <artifactId>concurrent</artifactId>
           <version>1.3.4</version>
             <properties>
                 <war.bundle>true</war.bundle>
             </properties>
         </dependency>
         <dependency>
-          <id>commons-collections</id>
+          <groupId>commons-collections</groupId>
+          <artifactId>commons-collections</artifactId>
           <version>3.1</version>
             <properties>
                 <war.bundle>true</war.bundle>
@@ -194,7 +202,8 @@
             </properties>
         </dependency>
         <dependency>
-          <id>commons-logging</id>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
           <version>1.0</version>
             <properties>
                 <war.bundle>true</war.bundle>
@@ -202,7 +211,8 @@
         </dependency>
         <!-- used for eventual compiling -->
         <dependency>
-            <id>servletapi</id>
+            <groupId>servletapi</groupId>
+            <artifactId>servletapi</artifactId>
             <version>2.3</version>
         </dependency>
         

Modified: incubator/jackrabbit/trunk/contrib/jcr-server/webdav/project.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-server/webdav/project.xml?rev=292571&r1=292570&r2=292571&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-server/webdav/project.xml (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-server/webdav/project.xml Thu Sep 29 15:57:55 2005
@@ -42,15 +42,18 @@
         
         <!-- non-jackrabbit dependencies -->
         <dependency>
-            <id>jdom</id>
+            <groupId>jdom</groupId>
+            <artifactId>jdom</artifactId>
             <version>1.0</version>
         </dependency>
         <dependency>
-            <id>log4j</id>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
             <version>1.2.8</version>
         </dependency>
         <dependency>
-            <id>servletapi</id>
+            <groupId>servletapi</groupId>
+            <artifactId>servletapi</artifactId>
             <version>2.3</version>
         </dependency>
     </dependencies>

Modified: incubator/jackrabbit/trunk/contrib/orm-persistence/project.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/orm-persistence/project.xml?rev=292571&r1=292570&r2=292571&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/orm-persistence/project.xml (original)
+++ incubator/jackrabbit/trunk/contrib/orm-persistence/project.xml Thu Sep 29 15:57:55 2005
@@ -55,19 +55,23 @@
         <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <id>concurrent</id>
+      <groupId>concurrent</groupId>
+      <artifactId>concurrent</artifactId>
       <version>1.3.4</version>
     </dependency>
     <dependency>
-      <id>junit</id>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
       <version>3.8.1</version>
     </dependency>
     <dependency>
-      <id>commons-collections</id>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
       <version>3.1</version>
     </dependency>
     <dependency>
-      <id>jdom</id>
+      <groupId>jdom</groupId>
+      <artifactId>jdom</artifactId>
       <version>1.0</version>
     </dependency>
     <dependency>
@@ -82,7 +86,8 @@
       <url>http://www.day.com/maven/jsr170/jars/jcr-0.16.4.1.jar</url>
     </dependency>
     <dependency>
-      <id>log4j</id>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
       <version>1.2.8</version>
     </dependency>
     <dependency>
@@ -101,7 +106,8 @@
       <version>2.6.2</version>
     </dependency>
     <dependency>
-      <id>commons-logging</id>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
       <version>1.0</version>
     </dependency>
     

Modified: incubator/jackrabbit/trunk/contrib/tck-webapp/project.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/tck-webapp/project.xml?rev=292571&r1=292570&r2=292571&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/tck-webapp/project.xml (original)
+++ incubator/jackrabbit/trunk/contrib/tck-webapp/project.xml Thu Sep 29 15:57:55 2005
@@ -32,14 +32,16 @@
 
         <!-- dependencies from jackrabbit that we want to bundle -->
         <dependency>
-            <id>concurrent</id>
+            <groupId>concurrent</groupId>
+            <artifactId>concurrent</artifactId>
             <version>1.3.4</version>
             <properties>
                 <war.bundle>true</war.bundle>
             </properties>
         </dependency>
         <dependency>
-            <id>commons-collections</id>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
             <version>3.1</version>
             <properties>
                 <war.bundle>true</war.bundle>
@@ -79,7 +81,8 @@
         </dependency>
 
         <dependency>
-            <id>commons-logging</id>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
             <version>1.0</version>
             <properties>
                 <war.bundle>true</war.bundle>
@@ -89,21 +92,24 @@
 
     <!-- own dependencies -->    
         <dependency>
-            <id>jdom</id>
+            <groupId>jdom</groupId>
+            <artifactId>jdom</artifactId>
             <version>1.0</version>
             <properties>
                 <war.bundle>true</war.bundle>
             </properties>
         </dependency>
         <dependency>
-            <id>log4j</id>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
             <version>1.2.8</version>
             <properties>
                 <war.bundle>true</war.bundle>
             </properties>
         </dependency>
         <dependency>
-            <id>commons-fileupload</id>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
             <version>1.0</version>
             <properties>
                 <war.bundle>true</war.bundle>
@@ -113,11 +119,13 @@
     
     <!-- own dependencies (build only) -->
         <dependency>
-            <id>servletapi</id>
+            <groupId>servletapi</groupId>
+            <artifactId>servletapi</artifactId>
             <version>2.3</version>
         </dependency>
         <dependency>
-            <id>junit</id>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
             <version>3.8.1</version>
             <properties>
                 <war.bundle>true</war.bundle>

Modified: incubator/jackrabbit/trunk/project.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/project.xml?rev=292571&r1=292570&r2=292571&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/project.xml (original)
+++ incubator/jackrabbit/trunk/project.xml Thu Sep 29 15:57:55 2005
@@ -308,19 +308,23 @@
 
     <dependencies>
         <dependency>
-            <id>concurrent</id>
+            <groupId>concurrent</groupId>
+            <artifactId>concurrent</artifactId>
             <version>1.3.4</version>
         </dependency>
         <dependency>
-            <id>junit</id>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
             <version>3.8.1</version>
         </dependency>
         <dependency>
-            <id>commons-collections</id>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
             <version>3.1</version>
         </dependency>
         <dependency>
-            <id>javacc</id>
+            <groupId>javacc</groupId>
+            <artifactId>javacc</artifactId>
             <version>3.2</version>
         </dependency>
         <dependency>
@@ -335,7 +339,8 @@
             <url>http://jcp.org/en/jsr/detail?id=170</url>
         </dependency>
         <dependency>
-            <id>log4j</id>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
             <version>1.2.8</version>
         </dependency>
         <dependency>
@@ -371,7 +376,8 @@
             <url>http://www.day.com/maven/cqfs/jars/cqfs-3.5.6-SNAPSHOT.jar</url>
         </dependency>
         <dependency>
-            <id>commons-logging</id>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
             <version>1.0</version>
         </dependency>
     </dependencies>