You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2013/10/22 15:36:11 UTC
svn commit: r1534632 - in /sling/trunk/launchpad:
builder/src/main/bundles/list.xml test-bundles/pom.xml testing-war/pom.xml
testing/pom.xml
Author: bdelacretaz
Date: Tue Oct 22 13:36:11 2013
New Revision: 1534632
URL: http://svn.apache.org/r1534632
Log:
SLING-3155 - run mode switch between jackrabbit and oak
Modified:
sling/trunk/launchpad/builder/src/main/bundles/list.xml
sling/trunk/launchpad/test-bundles/pom.xml
sling/trunk/launchpad/testing-war/pom.xml
sling/trunk/launchpad/testing/pom.xml
Modified: sling/trunk/launchpad/builder/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/bundles/list.xml?rev=1534632&r1=1534631&r2=1534632&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original)
+++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Tue Oct 22 13:36:11 2013
@@ -465,17 +465,19 @@
<bundle>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-api</artifactId>
- <version>2.4.2</version>
+ <version>2.7.1</version>
</bundle>
<bundle>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>10.5.3.0_1</version>
+ <runModes>jackrabbit</runModes>
</bundle>
<bundle>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.jcr.jackrabbit.server</artifactId>
<version>2.1.3-SNAPSHOT</version>
+ <runModes>jackrabbit</runModes>
</bundle>
<bundle>
<groupId>org.apache.sling</groupId>
@@ -490,27 +492,27 @@
<bundle>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-commons</artifactId>
- <version>2.4.2</version>
+ <version>2.7.1</version>
</bundle>
<bundle>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-spi</artifactId>
- <version>2.4.2</version>
+ <version>2.7.1</version>
</bundle>
<bundle>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-spi-commons</artifactId>
- <version>2.4.2</version>
+ <version>2.7.1</version>
</bundle>
<bundle>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-webdav</artifactId>
- <version>2.4.2</version>
+ <version>2.7.1</version>
</bundle>
<bundle>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-rmi</artifactId>
- <version>2.4.2</version>
+ <version>2.7.1</version>
</bundle>
<bundle>
<groupId>org.apache.sling</groupId>
@@ -523,4 +525,70 @@
<version>1.1.0</version>
</bundle>
</startLevel>
+
+ <startLevel level="15">
+ <!-- Oak-specific bundles -->
+ <bundle>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.jcr.oak.server</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <runModes>oak</runModes>
+ </bundle>
+ <bundle>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>14.0.1</version>
+ <runModes>oak</runModes>
+ </bundle>
+ <bundle>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ <version>2.0.0</version>
+ <runModes>oak</runModes>
+ </bundle>
+ <bundle>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-core</artifactId>
+ <version>0.9</version>
+ <runModes>oak</runModes>
+ </bundle>
+ <!-- embedded in oak.server for now
+ <bundle>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-jcr</artifactId>
+ <version>0.9</version>
+ <runModes>oak</runModes>
+ </bundle>
+ -->
+ <bundle>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-commons</artifactId>
+ <version>0.9</version>
+ <runModes>oak</runModes>
+ </bundle>
+ <bundle>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-mk</artifactId>
+ <version>0.9</version>
+ <runModes>oak</runModes>
+ </bundle>
+ <bundle>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-mk-api</artifactId>
+ <version>0.9</version>
+ <runModes>oak</runModes>
+ </bundle>
+ <bundle>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-mk-remote</artifactId>
+ <version>0.9</version>
+ <runModes>oak</runModes>
+ </bundle>
+ <bundle>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-lucene</artifactId>
+ <version>0.9</version>
+ <runModes>oak</runModes>
+ </bundle>
+ </startLevel>
</bundles>
Modified: sling/trunk/launchpad/test-bundles/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/test-bundles/pom.xml?rev=1534632&r1=1534631&r2=1534632&view=diff
==============================================================================
--- sling/trunk/launchpad/test-bundles/pom.xml (original)
+++ sling/trunk/launchpad/test-bundles/pom.xml Tue Oct 22 13:36:11 2013
@@ -39,9 +39,9 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-launchpad-plugin</artifactId>
- <version>2.1.2</version>
+ <version>2.2.0</version>
<extensions>true</extensions>
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: sling/trunk/launchpad/testing-war/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/testing-war/pom.xml?rev=1534632&r1=1534631&r2=1534632&view=diff
==============================================================================
--- sling/trunk/launchpad/testing-war/pom.xml (original)
+++ sling/trunk/launchpad/testing-war/pom.xml Tue Oct 22 13:36:11 2013
@@ -149,7 +149,7 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-launchpad-plugin</artifactId>
- <version>2.1.2</version>
+ <version>2.2.0</version>
<extensions>true</extensions>
<executions>
<execution>
Modified: sling/trunk/launchpad/testing/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/testing/pom.xml?rev=1534632&r1=1534631&r2=1534632&view=diff
==============================================================================
--- sling/trunk/launchpad/testing/pom.xml (original)
+++ sling/trunk/launchpad/testing/pom.xml Tue Oct 22 13:36:11 2013
@@ -133,7 +133,7 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-launchpad-plugin</artifactId>
- <version>2.1.2</version>
+ <version>2.2.0</version>
<extensions>true</extensions>
<executions>
<execution>