You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2007/09/26 11:26:29 UTC
svn commit: r579532 - in /incubator/sling/trunk: assembly/ cache/
component-standard/ content/ core/ event/ jackrabbit-classloader/
jackrabbit-client/ jackrabbit-server/ parent/ scheduler/ scripting-core/
scripting-jsp-taglib/ scripting-jsp/ sling-serv...
Author: cziegeler
Date: Wed Sep 26 02:26:28 2007
New Revision: 579532
URL: http://svn.apache.org/viewvc?rev=579532&view=rev
Log:
Remove sling module versions from parent pom to make release management easier.
Add some more versions of dependencies to parent pom.
Modified:
incubator/sling/trunk/assembly/pom.xml
incubator/sling/trunk/cache/pom.xml
incubator/sling/trunk/component-standard/pom.xml
incubator/sling/trunk/content/pom.xml
incubator/sling/trunk/core/pom.xml
incubator/sling/trunk/event/pom.xml
incubator/sling/trunk/jackrabbit-classloader/pom.xml
incubator/sling/trunk/jackrabbit-client/pom.xml
incubator/sling/trunk/jackrabbit-server/pom.xml
incubator/sling/trunk/parent/pom.xml
incubator/sling/trunk/scheduler/pom.xml
incubator/sling/trunk/scripting-core/pom.xml
incubator/sling/trunk/scripting-jsp-taglib/pom.xml
incubator/sling/trunk/scripting-jsp/pom.xml
incubator/sling/trunk/sling-servlet/pom.xml
incubator/sling/trunk/webmanager/pom.xml
Modified: incubator/sling/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/assembly/pom.xml?rev=579532&r1=579531&r2=579532&view=diff
==============================================================================
--- incubator/sling/trunk/assembly/pom.xml (original)
+++ incubator/sling/trunk/assembly/pom.xml Wed Sep 26 02:26:28 2007
@@ -78,8 +78,6 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.bundlerepository</artifactId>
- <version>1.0.0</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Modified: incubator/sling/trunk/cache/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/cache/pom.xml?rev=579532&r1=579531&r2=579532&view=diff
==============================================================================
--- incubator/sling/trunk/cache/pom.xml (original)
+++ incubator/sling/trunk/cache/pom.xml Wed Sep 26 02:26:28 2007
@@ -80,6 +80,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>sling-component-api</artifactId>
+ <version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: incubator/sling/trunk/component-standard/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/component-standard/pom.xml?rev=579532&r1=579531&r2=579532&view=diff
==============================================================================
--- incubator/sling/trunk/component-standard/pom.xml (original)
+++ incubator/sling/trunk/component-standard/pom.xml Wed Sep 26 02:26:28 2007
@@ -83,7 +83,9 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>sling-jackrabbit-api</artifactId>
+ <version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
+
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
@@ -92,14 +94,17 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>sling-component-api</artifactId>
+ <version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>sling-core</artifactId>
+ <version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>sling-content-jcr</artifactId>
+ <version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
<dependency>
Modified: incubator/sling/trunk/content/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/content/pom.xml?rev=579532&r1=579531&r2=579532&view=diff
==============================================================================
--- incubator/sling/trunk/content/pom.xml (original)
+++ incubator/sling/trunk/content/pom.xml Wed Sep 26 02:26:28 2007
@@ -129,59 +129,37 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>sling-component-api</artifactId>
+ <version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>sling-mime</artifactId>
+ <version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>sling-jackrabbit-api</artifactId>
+ <version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-ocm</artifactId>
- <version>1.4-SNAPSHOT</version>
- <!-- <scope>compile</scope> -->
</dependency>
<dependency>
<groupId>net.sf.kxml</groupId>
<artifactId>kxml2</artifactId>
- <version>2.2.2</version>
- <exclusions>
- <exclusion>
- <groupId>xmlpull</groupId>
- <artifactId>xmlpull</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-io</artifactId>
</dependency>
- <!--
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.7.0</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- </dependency>
- -->
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified: incubator/sling/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/core/pom.xml?rev=579532&r1=579531&r2=579532&view=diff
==============================================================================
--- incubator/sling/trunk/core/pom.xml (original)
+++ incubator/sling/trunk/core/pom.xml Wed Sep 26 02:26:28 2007
@@ -104,14 +104,17 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>sling-component-api</artifactId>
+ <version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>sling-content-jcr</artifactId>
+ <version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>sling-mime</artifactId>
+ <version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
@@ -120,6 +123,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>sling-jackrabbit-api</artifactId>
+ <version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -132,8 +136,6 @@
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.1.1</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Modified: incubator/sling/trunk/event/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/event/pom.xml?rev=579532&r1=579531&r2=579532&view=diff
==============================================================================
--- incubator/sling/trunk/event/pom.xml (original)
+++ incubator/sling/trunk/event/pom.xml Wed Sep 26 02:26:28 2007
@@ -95,10 +95,12 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>sling-core</artifactId>
+ <version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>sling-jackrabbit-api</artifactId>
+ <version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
Modified: incubator/sling/trunk/jackrabbit-classloader/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jackrabbit-classloader/pom.xml?rev=579532&r1=579531&r2=579532&view=diff
==============================================================================
--- incubator/sling/trunk/jackrabbit-classloader/pom.xml (original)
+++ incubator/sling/trunk/jackrabbit-classloader/pom.xml Wed Sep 26 02:26:28 2007
@@ -87,6 +87,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>sling-jackrabbit-api</artifactId>
+ <version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
Modified: incubator/sling/trunk/jackrabbit-client/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jackrabbit-client/pom.xml?rev=579532&r1=579531&r2=579532&view=diff
==============================================================================
--- incubator/sling/trunk/jackrabbit-client/pom.xml (original)
+++ incubator/sling/trunk/jackrabbit-client/pom.xml Wed Sep 26 02:26:28 2007
@@ -87,13 +87,13 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-rmi</artifactId>
- <version>1.3.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>sling-jackrabbit-api</artifactId>
+ <version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
<dependency>
Modified: incubator/sling/trunk/jackrabbit-server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jackrabbit-server/pom.xml?rev=579532&r1=579531&r2=579532&view=diff
==============================================================================
--- incubator/sling/trunk/jackrabbit-server/pom.xml (original)
+++ incubator/sling/trunk/jackrabbit-server/pom.xml Wed Sep 26 02:26:28 2007
@@ -179,17 +179,16 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>sling-jackrabbit-api</artifactId>
+ <version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-rmi</artifactId>
- <version>1.3.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-core</artifactId>
- <version>1.3.1</version>
<scope>compile</scope>
</dependency>
Modified: incubator/sling/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/parent/pom.xml?rev=579532&r1=579531&r2=579532&view=diff
==============================================================================
--- incubator/sling/trunk/parent/pom.xml (original)
+++ incubator/sling/trunk/parent/pom.xml Wed Sep 26 02:26:28 2007
@@ -377,61 +377,6 @@
</dependency>
<dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>sling-component-api</artifactId>
- <version>2.0.0-incubator-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>sling-content-jcr</artifactId>
- <version>2.0.0-incubator-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>sling-core</artifactId>
- <version>2.0.0-incubator-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>sling-cache</artifactId>
- <version>2.0.0-incubator-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>sling-component-standard</artifactId>
- <version>2.0.0-incubator-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>sling-mime</artifactId>
- <version>2.0.0-incubator-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>sling-scripting-core</artifactId>
- <version>2.0.0-incubator-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>sling-scripting-jsp</artifactId>
- <version>2.0.0-incubator-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>sling-scripting-jsp-taglib</artifactId>
- <version>2.0.0-incubator-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
@@ -480,18 +425,10 @@
<version>1.8</version>
<scope>provided</scope>
</dependency>
-
- <!-- includes and provides JCR API, Jackrabbit API, and Jackrabbit-JCR-Commons -->
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>sling-jackrabbit-api</artifactId>
- <version>2.0.0-incubator-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
<dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>sling-jackrabbit-classloader</artifactId>
- <version>2.0.0-incubator-SNAPSHOT</version>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.1.1</version>
<scope>provided</scope>
</dependency>
@@ -532,6 +469,24 @@
<version>1.3.1</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-ocm</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ <!-- <scope>compile</scope> -->
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.kxml</groupId>
+ <artifactId>kxml2</artifactId>
+ <version>2.2.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xmlpull</groupId>
+ <artifactId>xmlpull</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -564,7 +519,15 @@
<version>3.8.1</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.bundlerepository</artifactId>
+ <version>1.0.0</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
+
</dependencyManagement>
Modified: incubator/sling/trunk/scheduler/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scheduler/pom.xml?rev=579532&r1=579531&r2=579532&view=diff
==============================================================================
--- incubator/sling/trunk/scheduler/pom.xml (original)
+++ incubator/sling/trunk/scheduler/pom.xml Wed Sep 26 02:26:28 2007
@@ -97,15 +97,20 @@
<artifactId>osgi_R4_compendium</artifactId>
</dependency>
<dependency>
- <groupId>quartz</groupId>
- <artifactId>quartz</artifactId>
- <version>1.5.2</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>sling-core</artifactId>
<version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
+ <!-- The following dependencies will be replaced by using the quartz wrapper bundle -->
+ <dependency>
+ <groupId>quartz</groupId>
+ <artifactId>quartz</artifactId>
+ <version>1.5.2</version>
+ </dependency>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
@@ -115,10 +120,6 @@
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
<version>1.2.2</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
</dependency>
</dependencies>
</project>
Modified: incubator/sling/trunk/scripting-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting-core/pom.xml?rev=579532&r1=579531&r2=579532&view=diff
==============================================================================
--- incubator/sling/trunk/scripting-core/pom.xml (original)
+++ incubator/sling/trunk/scripting-core/pom.xml Wed Sep 26 02:26:28 2007
@@ -89,10 +89,12 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>sling-component-api</artifactId>
+ <version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>sling-core</artifactId>
+ <version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -101,6 +103,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>sling-content-jcr</artifactId>
+ <version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: incubator/sling/trunk/scripting-jsp-taglib/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting-jsp-taglib/pom.xml?rev=579532&r1=579531&r2=579532&view=diff
==============================================================================
--- incubator/sling/trunk/scripting-jsp-taglib/pom.xml (original)
+++ incubator/sling/trunk/scripting-jsp-taglib/pom.xml Wed Sep 26 02:26:28 2007
@@ -74,26 +74,32 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>sling-component-api</artifactId>
+ <version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>sling-content-jcr</artifactId>
+ <version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>sling-core</artifactId>
+ <version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>sling-jackrabbit-api</artifactId>
+ <version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>sling-scripting-core</artifactId>
+ <version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>sling-scripting-jsp</artifactId>
+ <version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Modified: incubator/sling/trunk/scripting-jsp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting-jsp/pom.xml?rev=579532&r1=579531&r2=579532&view=diff
==============================================================================
--- incubator/sling/trunk/scripting-jsp/pom.xml (original)
+++ incubator/sling/trunk/scripting-jsp/pom.xml Wed Sep 26 02:26:28 2007
@@ -80,26 +80,32 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>sling-component-api</artifactId>
+ <version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>sling-content-jcr</artifactId>
+ <version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>sling-core</artifactId>
+ <version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>sling-jackrabbit-api</artifactId>
+ <version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>sling-scripting-core</artifactId>
+ <version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>sling-jackrabbit-classloader</artifactId>
+ <version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
Modified: incubator/sling/trunk/sling-servlet/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling-servlet/pom.xml?rev=579532&r1=579531&r2=579532&view=diff
==============================================================================
--- incubator/sling/trunk/sling-servlet/pom.xml (original)
+++ incubator/sling/trunk/sling-servlet/pom.xml Wed Sep 26 02:26:28 2007
@@ -209,8 +209,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>provided</scope>
</dependency>
</dependencies>
Modified: incubator/sling/trunk/webmanager/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/webmanager/pom.xml?rev=579532&r1=579531&r2=579532&view=diff
==============================================================================
--- incubator/sling/trunk/webmanager/pom.xml (original)
+++ incubator/sling/trunk/webmanager/pom.xml Wed Sep 26 02:26:28 2007
@@ -89,16 +89,12 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>provided</scope>
</dependency>
<!-- This adds commons-io transitively -->
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.1.1</version>
- <scope>compile</scope>
</dependency>
<dependency>