Created
August 26, 2015 14:41
-
-
Save bdelacretaz/ddccb87b26486673353c to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: bundles/jcr/oak-server/pom.xml | |
=================================================================== | |
--- bundles/jcr/oak-server/pom.xml (revision 1697914) | |
+++ bundles/jcr/oak-server/pom.xml (working copy) | |
@@ -41,7 +41,7 @@ | |
WARNING make sure oak.version and sling.oak.server.version | |
are in sync with bundles/jcr/it-jackrabbit-oak | |
--> | |
- <oak.version>1.3.3</oak.version> | |
+ <oak.version>1.4-SNAPSHOT</oak.version> | |
</properties> | |
<build> | |
Index: launchpad/builder/src/main/provisioning/boot.txt | |
=================================================================== | |
--- launchpad/builder/src/main/provisioning/boot.txt (revision 1697340) | |
+++ launchpad/builder/src/main/provisioning/boot.txt (working copy) | |
@@ -26,7 +26,7 @@ | |
# 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=jackrabbit,oak|oak_tar,oak_mongo,oak_mongo_mounts | |
repository.home=${sling.home}/repository | |
[artifacts] | |
Index: launchpad/builder/src/main/provisioning/oak.txt | |
=================================================================== | |
--- launchpad/builder/src/main/provisioning/oak.txt (revision 1697340) | |
+++ launchpad/builder/src/main/provisioning/oak.txt (working copy) | |
@@ -20,7 +20,7 @@ | |
[feature name=oak] | |
[variables] | |
- oak.version=1.3.3 | |
+ oak.version=1.4-SNAPSHOT | |
# The segment node store is used via a configuration | |
[artifacts startLevel=10 runModes=oak] | |
@@ -36,6 +36,10 @@ | |
[artifacts startLevel=15 runModes=oak_mongo] | |
org.mongodb/mongo-java-driver/2.13.0 | |
+# TODO clarify the oak run modes to avoid duplicating this | |
+[artifacts startLevel=15 runModes=oak_mongo_mounts] | |
+ org.mongodb/mongo-java-driver/2.13.0 | |
+ | |
# start the Oak server instance after all components have been configured | |
# and started to avoid restarting that component ( see SLING-4556 ) | |
[artifacts startLevel=16 runModes=oak] | |
@@ -82,3 +86,10 @@ | |
org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService | |
mongouri="mongodb://localhost:27017" | |
db="sling" | |
+ | |
+[configurations runModes=oak_mongo_mounts] | |
+ org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService | |
+ mongouri="mongodb://localhost:27017" | |
+ db="sling-with-mounts" | |
+ mounts=["/libs:libs","/apps:apps","/var:var"] | |
+ | |
\ No newline at end of file |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment