You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2015/10/06 22:24:21 UTC
svn commit: r1707133 - in /sling/trunk/launchpad:
builder/src/main/provisioning/boot.txt
builder/src/main/provisioning/jackrabbit.txt testing/pom.xml
Author: rombert
Date: Tue Oct 6 20:24:20 2015
New Revision: 1707133
URL: http://svn.apache.org/viewvc?rev=1707133&view=rev
Log:
SLING-5098 - Remove Jackrabbit from the launchpad
- remove the jackrabbit runmode
- remove the jackrabbit feature
- remove the oak and jackrabbit profiles from launchpad/testing and
merge the oak properties into the main profile
Removed:
sling/trunk/launchpad/builder/src/main/provisioning/jackrabbit.txt
Modified:
sling/trunk/launchpad/builder/src/main/provisioning/boot.txt
sling/trunk/launchpad/testing/pom.xml
Modified: sling/trunk/launchpad/builder/src/main/provisioning/boot.txt
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/boot.txt?rev=1707133&r1=1707132&r2=1707133&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/provisioning/boot.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/boot.txt Tue Oct 6 20:24:20 2015
@@ -22,11 +22,10 @@
# additional entries for sling.properties
# ---------------------------------------
-# jackrabbit and oak run modes are mutually exclusive,
+# oak_tar and oak_mongo run modes are mutually exclusive,
# and cannot be changed after the first startup
-# the same goes for the oak_tar and oak_mongo runmodes
[settings]
- sling.run.mode.install.options=jackrabbit,oak|oak_tar,oak_mongo
+ sling.run.mode.install.options=oak|oak_tar,oak_mongo
repository.home=${sling.home}/repository
[artifacts]
@@ -47,4 +46,4 @@
org.apache.felix/org.apache.felix.configadmin/1.8.8
org.apache.felix/org.apache.felix.eventadmin/1.4.4
# dependency with javax.inject - required for Sling Models (SLING-4710)
- org.apache.geronimo.specs/geronimo-atinject_1.0_spec/1.0
\ No newline at end of file
+ org.apache.geronimo.specs/geronimo-atinject_1.0_spec/1.0
Modified: sling/trunk/launchpad/testing/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/testing/pom.xml?rev=1707133&r1=1707132&r2=1707133&view=diff
==============================================================================
--- sling/trunk/launchpad/testing/pom.xml (original)
+++ sling/trunk/launchpad/testing/pom.xml Tue Oct 6 20:24:20 2015
@@ -137,7 +137,7 @@
<excludes>
<exclude>${failsafe.exclude}</exclude>
</excludes>
- <excludedGroups>${sling.it.excludedGroups}</excludedGroups>
+ <excludedGroups>org.apache.sling.commons.testing.junit.categories.JackrabbitOnly</excludedGroups>
<systemPropertyVariables>
<launchpad.http.server.url>http://${test.host}:${http.port}/</launchpad.http.server.url>
<launchpad.webdav.server.url>http://${test.host}:${http.port}/${webdav.workspace.path}</launchpad.webdav.server.url>
@@ -150,31 +150,6 @@
<profiles>
<profile>
- <id>jackrabbit</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- <property>
- <name>sling.run.modes</name>
- <value>!oak</value>
- </property>
- </activation>
- <properties>
- <sling.it.excludedGroups>org.apache.sling.commons.testing.junit.categories.OakOnly</sling.it.excludedGroups>
- </properties>
- </profile>
- <profile>
- <id>oak</id>
- <activation>
- <property>
- <name>sling.run.modes</name>
- <value>oak</value>
- </property>
- </activation>
- <properties>
- <sling.it.excludedGroups>org.apache.sling.commons.testing.junit.categories.JackrabbitOnly</sling.it.excludedGroups>
- </properties>
- </profile>
- <profile>
<id>port-java6</id>
<activation>
<activeByDefault>false</activeByDefault>