Author: chetanm
Date: Sun Jan 4 09:07:47 2015
New Revision: 1649298
URL: http://svn.apache.org/r1649298
Log:
SLING-3479 - Upgrade to Oak 1.0
Upgraded Oak to 1.0.9
-- Removed oak-mk, oak-mk-remote modules
-- Moved commons-io to Start level 15 as it is required by Oak
Modified:
sling/trunk/launchpad/builder/pom.xml
sling/trunk/launchpad/builder/src/main/bundles/list.xml
Modified: sling/trunk/launchpad/builder/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/pom.xml?rev=1649298&r1=1649297&r2=1649298&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/pom.xml (original)
+++ sling/trunk/launchpad/builder/pom.xml Sun Jan 4 09:07:47 2015
@@ -37,6 +37,7 @@
<properties>
+ <oak.version>1.0.9</oak.version>
<!--
Jetty default port (override with -D)
-->
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=1649298&r1=1649297&r2=1649298&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original)
+++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Sun Jan 4 09:07:47
2015
@@ -82,11 +82,6 @@
<startLevel level="0">
<!-- Default Start Level -->
<bundle>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.4</version>
- </bundle>
- <bundle>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.3.1</version>
@@ -544,6 +539,11 @@
</startLevel>
<startLevel level="15">
+ <bundle>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.4</version>
+ </bundle>
<!-- Oak-specific bundles -->
<bundle>
<groupId>org.apache.sling</groupId>
@@ -560,7 +560,7 @@
<bundle>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-core</artifactId>
- <version>1.0.7</version>
+ <version>${oak.version}</version>
<runModes>oak</runModes>
</bundle>
<!-- embedded in oak.server for now
@@ -574,37 +574,25 @@
<bundle>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-commons</artifactId>
- <version>1.0.7</version>
- <runModes>oak</runModes>
- </bundle>
- <bundle>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>oak-mk</artifactId>
- <version>1.0.7</version>
+ <version>${oak.version}</version>
<runModes>oak</runModes>
</bundle>
<bundle>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-mk-api</artifactId>
- <version>1.0.7</version>
- <runModes>oak</runModes>
- </bundle>
- <bundle>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>oak-mk-remote</artifactId>
- <version>1.0.7</version>
+ <version>${oak.version}</version>
<runModes>oak</runModes>
</bundle>
<bundle>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-lucene</artifactId>
- <version>1.0.7</version>
+ <version>${oak.version}</version>
<runModes>oak</runModes>
</bundle>
<bundle>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-blob</artifactId>
- <version>1.0.7</version>
+ <version>${oak.version}</version>
<runModes>oak</runModes>
</bundle>
</startLevel>
