Author: cziegeler
Date: Wed Jun 4 11:27:07 2008
New Revision: 663336
URL: http://svn.apache.org/viewvc?rev=663336&view=rev
Log:
Add versions to dependency management in parent pom.
Modified:
incubator/sling/trunk/launchpad/webapp/pom.xml
incubator/sling/trunk/parent/pom.xml
Modified: incubator/sling/trunk/launchpad/webapp/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/pom.xml?rev=663336&r1=663335&r2=663336&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/pom.xml (original)
+++ incubator/sling/trunk/launchpad/webapp/pom.xml Wed Jun 4 11:27:07 2008
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>1-incubator</version>
+ <version>2-incubator-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
@@ -425,14 +425,11 @@
<dependency>
<groupId>org.eclipse.equinox.http</groupId>
<artifactId>servlet</artifactId>
- <version>1.0.0-v20070606</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.3</version>
<scope>test</scope>
</dependency>
@@ -445,9 +442,7 @@
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
- <artifactId>
- org.apache.sling.scripting.javascript
- </artifactId>
+ <artifactId>org.apache.sling.scripting.javascript</artifactId>
<version>2.0.1-incubator-SNAPSHOT</version>
<scope>test</scope>
<optional>true</optional>
@@ -456,39 +451,23 @@
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
<scope>test</scope>
- <exclusions>
- <!--
- Same problem as JCR-683: commons-httpclient depends on
commons-logging. Since
- this webapp uses log4j (see the slf4j-log4j12 dependency
below), we need to
- override this dependency with jcl104-over-sflf4j, found
below
- -->
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.3.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.3.0</version>
- <scope>test</scope>
- </dependency>
-
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ <scope>test</scope>
+ </dependency>
<!-- The servlet container will have to provide these API classes -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
-
</dependencies>
</project>
\ No newline at end of file
Modified: incubator/sling/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/parent/pom.xml?rev=663336&r1=663335&r2=663336&view=diff
==============================================================================
--- incubator/sling/trunk/parent/pom.xml (original)
+++ incubator/sling/trunk/parent/pom.xml Wed Jun 4 11:27:07 2008
@@ -509,6 +509,23 @@
<version>3.2.1</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.1</version>
+ <scope>provided</scope>
+ <exclusions>
+ <!--
+ Same problem as JCR-683: commons-httpclient depends
on commons-logging. Since
+ this webapp uses log4j (see the slf4j-log4j12
dependency below), we need to
+ override this dependency with jcl104-over-sflf4j,
found below
+ -->
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
@@ -620,6 +637,12 @@
<version>1.5.0</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.5.0</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
