Author: fmeschbe
Date: Mon Dec 22 13:36:45 2008
New Revision: 728789
URL: http://svn.apache.org/viewvc?rev=728789&view=rev
Log:
SLING-794 Adapt to new commons/testing functionality
Removed:
incubator/sling/trunk/scripting/freemarker/src/test/test-config/
incubator/sling/trunk/scripting/javascript/src/test/test-config/
Modified:
incubator/sling/trunk/scripting/freemarker/pom.xml
incubator/sling/trunk/scripting/javascript/pom.xml
Modified: incubator/sling/trunk/scripting/freemarker/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/freemarker/pom.xml?rev=728789&r1=728788&r2=728789&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/freemarker/pom.xml (original)
+++ incubator/sling/trunk/scripting/freemarker/pom.xml Mon Dec 22 13:36:45 2008
@@ -104,17 +104,16 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.jcr.resource</artifactId>
<version>2.0.2-incubator</version>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.testing</artifactId>
- <version>2.0.2-incubator</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-core</artifactId>
- <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-jcr-commons</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-classloader</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -135,12 +134,9 @@
</dependency>
<!-- Testing -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.commons.testing</artifactId>
+ <version>2.0.3-incubator-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: incubator/sling/trunk/scripting/javascript/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/javascript/pom.xml?rev=728789&r1=728788&r2=728789&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/javascript/pom.xml (original)
+++ incubator/sling/trunk/scripting/javascript/pom.xml Mon Dec 22 13:36:45 2008
@@ -100,17 +100,16 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.jcr.resource</artifactId>
<version>2.0.2-incubator</version>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.testing</artifactId>
- <version>2.0.2-incubator</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-core</artifactId>
- <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-jcr-commons</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-classloader</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
@@ -143,12 +142,9 @@
</dependency>
<!-- Testing -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.commons.testing</artifactId>
+ <version>2.0.3-incubator-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
