You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by fm...@apache.org on 2008/12/22 22:41:08 UTC
svn commit: r728793 - in /incubator/sling/trunk/extensions: event/pom.xml
event/src/test/test-config/jackrabbit-test-config.xml
jcrinstall/service/pom.xml
jcrinstall/service/src/test/test-config/jackrabbit-test-config.xml
Author: fmeschbe
Date: Mon Dec 22 13:41:08 2008
New Revision: 728793
URL: http://svn.apache.org/viewvc?rev=728793&view=rev
Log:
SLING-769 Explicit Jackrabbit Dependency Versions
SLING-794 Adapt to new commons/testing functionality
Removed:
incubator/sling/trunk/extensions/event/src/test/test-config/jackrabbit-test-config.xml
incubator/sling/trunk/extensions/jcrinstall/service/src/test/test-config/jackrabbit-test-config.xml
Modified:
incubator/sling/trunk/extensions/event/pom.xml
incubator/sling/trunk/extensions/jcrinstall/service/pom.xml
Modified: incubator/sling/trunk/extensions/event/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/event/pom.xml?rev=728793&r1=728792&r2=728793&view=diff
==============================================================================
--- incubator/sling/trunk/extensions/event/pom.xml (original)
+++ incubator/sling/trunk/extensions/event/pom.xml Mon Dec 22 13:41:08 2008
@@ -137,31 +137,14 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-commons</artifactId>
+ <version>1.5.0</version>
<scope>compile</scope>
</dependency>
- <!-- Testing -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock-junit4</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-core</artifactId>
- <scope>test</scope>
- </dependency>
+ <!-- Testing -->
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.testing</artifactId>
- <version>2.0.2-incubator</version>
+ <version>2.0.3-incubator-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: incubator/sling/trunk/extensions/jcrinstall/service/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/jcrinstall/service/pom.xml?rev=728793&r1=728792&r2=728793&view=diff
==============================================================================
--- incubator/sling/trunk/extensions/jcrinstall/service/pom.xml (original)
+++ incubator/sling/trunk/extensions/jcrinstall/service/pom.xml Mon Dec 22 13:41:08 2008
@@ -21,10 +21,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.jcr.jcrinstall.parent</artifactId>
- <version>2.0.3-incubator-SNAPSHOT</version>
- <relativePath>../</relativePath>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.jcr.jcrinstall.parent</artifactId>
+ <version>2.0.3-incubator-SNAPSHOT</version>
+ <relativePath>../</relativePath>
</parent>
<artifactId>org.apache.sling.jcr.jcrinstall</artifactId>
@@ -54,15 +54,15 @@
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
- <instructions>
- <Export-Package>
- org.apache.sling.jcr.jcrinstall.osgi,
- org.apache.sling.jcr.jcrinstall.jcr
- </Export-Package>
- <Private-Package>org.apache.sling.jcr.jcrinstall.*</Private-Package>
- <Sling-Nodetypes>SLING-INF/nodetypes/osgiconfig.cnd</Sling-Nodetypes>
- <Sling-Namespaces>sling=http://sling.apache.org/jcr/sling/1.0</Sling-Namespaces>
- </instructions>
+ <instructions>
+ <Export-Package>
+ org.apache.sling.jcr.jcrinstall.osgi,
+ org.apache.sling.jcr.jcrinstall.jcr
+ </Export-Package>
+ <Private-Package>org.apache.sling.jcr.jcrinstall.*</Private-Package>
+ <Sling-Nodetypes>SLING-INF/nodetypes/osgiconfig.cnd</Sling-Nodetypes>
+ <Sling-Namespaces>sling=http://sling.apache.org/jcr/sling/1.0</Sling-Namespaces>
+ </instructions>
</configuration>
</plugin>
</plugins>
@@ -96,16 +96,12 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.testing</artifactId>
- <version>2.0.2-incubator</version>
+ <version>2.0.3-incubator-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -113,15 +109,5 @@
<artifactId>org.apache.sling.runmode</artifactId>
<version>2.0.3-incubator-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock-junit4</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-core</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>