Author: rombert
Date: Mon Jul 29 15:29:37 2013
New Revision: 1508099
URL: http://svn.apache.org/r1508099
Log:
SLING-2789 - deploying Sling 7-SNAPSHOT on Karaf fails
Applied patch SLING-2789.2013-07-25.a.patch from Oliver Lietz.
- removed 'BUILD' component from versions
- misc version updates
Modified:
sling/trunk/contrib/launchpad/karaf/README.txt
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/pom.xml
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/BootstrapTest.java
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/pom.xml
sling/trunk/contrib/launchpad/karaf/pom.xml
Modified: sling/trunk/contrib/launchpad/karaf/README.txt
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/README.txt?rev=1508099&r1=1508098&r2=1508099&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/README.txt (original)
+++ sling/trunk/contrib/launchpad/karaf/README.txt Mon Jul 29 15:29:37 2013
@@ -39,7 +39,7 @@ How to deploy this
2) Add the Apache Sling features repository and install:
- karaf@root()> feature:repo-add
mvn:org.apache.sling/org.apache.sling.launchpad.karaf-features/0.1.0.BUILD-SNAPSHOT/xml/features
+ karaf@root()> feature:repo-add
mvn:org.apache.sling/org.apache.sling.launchpad.karaf-features/0.1.0-SNAPSHOT/xml/features
karaf@root()> feature:install sling-karaf
3) Install Launchpad content and Explorer:
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/pom.xml?rev=1508099&r1=1508098&r2=1508099&view=diff
==============================================================================
---
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/pom.xml
(original)
+++
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/pom.xml
Mon Jul 29 15:29:37 2013
@@ -24,12 +24,12 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>16</version>
+ <version>17</version>
<relativePath>../../../../parent/pom.xml</relativePath>
</parent>
<artifactId>org.apache.sling.launchpad.karaf-features</artifactId>
- <version>0.1.0.BUILD-SNAPSHOT</version>
+ <version>0.1.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>Apache Sling Launchpad Karaf - Features</name>
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml?rev=1508099&r1=1508098&r2=1508099&view=diff
==============================================================================
---
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
(original)
+++
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
Mon Jul 29 15:29:37 2013
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<features name="sling-launchpad-karaf"
xmlns="http://karaf.apache.org/xmlns/features/v1.2.0";>
- <feature name="sling-karaf-requirements" version="0.1.0.BUILD-SNAPSHOT">
+ <feature name="sling-karaf-requirements" version="${project.version}">
<!-- features (some are part of Karaf's defaults)-->
<feature>config</feature>
<feature>eventadmin</feature>
@@ -31,7 +31,7 @@
<bundle
dependency="true">mvn:org.apache.felix/org.apache.felix.webconsole.plugins.memoryusage/1.0.4</bundle>
<bundle
dependency="true">mvn:org.apache.felix/org.apache.felix.webconsole.plugins.packageadmin/1.0.0</bundle>
</feature>
- <feature name="sling-karaf" version="0.1.0.BUILD-SNAPSHOT">
+ <feature name="sling-karaf" version="${project.version}">
<feature>sling-karaf-requirements</feature>
<!-- Apache Commons -->
<bundle dependency="true">mvn:commons-codec/commons-codec/1.6</bundle>
@@ -87,12 +87,12 @@
<bundle>mvn:org.apache.sling/org.apache.sling.installer.provider.jcr/3.1.6</bundle>
<!-- Apache Sling Launchpad -->
<bundle>mvn:org.apache.sling/org.apache.sling.launchpad.api/1.1.0</bundle>
-
<bundle>mvn:org.apache.sling/org.apache.sling.launchpad.karaf/0.1.0.BUILD-SNAPSHOT</bundle>
+
<bundle>mvn:org.apache.sling/org.apache.sling.launchpad.karaf/${project.version}</bundle>
<!-- Apache Sling JCR -->
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.api/2.1.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.base/2.1.2</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.classloader/3.1.12</bundle>
-
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.contentloader/2.1.7-SNAPSHOT</bundle>
+
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.contentloader/2.1.6</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.davex/1.1.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.jcr-wrapper/2.0.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.ocm/2.0.4-incubator</bundle>
@@ -129,7 +129,7 @@
<bundle
dependency="true">mvn:org.apache.geronimo.bundles/json/20090211_1</bundle>
<bundle dependency="true">mvn:org.codehaus.groovy/groovy-all/1.8.2</bundle>
</feature>
- <feature name="sling-karaf-demo" version="0.1.0.BUILD-SNAPSHOT">
+ <feature name="sling-karaf-demo" version="${project.version}">
<feature>sling-karaf</feature>
<bundle>mvn:org.apache.sling/org.apache.sling.launchpad.content/2.0.6</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.extensions.explorer/1.0.2</bundle>
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml?rev=1508099&r1=1508098&r2=1508099&view=diff
==============================================================================
---
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml
(original)
+++
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml
Mon Jul 29 15:29:37 2013
@@ -24,12 +24,12 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>16</version>
+ <version>17</version>
<relativePath>../../../../parent/pom.xml</relativePath>
</parent>
<artifactId>org.apache.sling.launchpad.karaf-integration-tests</artifactId>
- <version>0.1.0.BUILD-SNAPSHOT</version>
+ <version>0.1.0-SNAPSHOT</version>
<name>Apache Sling Launchpad Karaf - Integration Tests</name>
<description>Integration Tests for Apache Sling Launchpad Karaf</description>
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/BootstrapTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/BootstrapTest.java?rev=1508099&r1=1508098&r2=1508099&view=diff
==============================================================================
---
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/BootstrapTest.java
(original)
+++
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/BootstrapTest.java
Mon Jul 29 15:29:37 2013
@@ -56,7 +56,7 @@ public class BootstrapTest extends Karaf
karafDistributionConfiguration().frameworkUrl(maven().groupId(karafGroupId()).artifactId(karafArtifactId()).version(karafVersion()).type("tar.gz")).karafVersion(karafVersion()).name(karafName()).unpackDirectory(new
File("target/paxexam/")),
keepRuntimeFolder(),
logLevel(LogLevelOption.LogLevel.INFO),
- editConfigurationFileExtend("etc/org.apache.karaf.features.cfg",
"featuresRepositories",
",mvn:org.apache.sling/org.apache.sling.launchpad.karaf-features/0.1.0.BUILD-SNAPSHOT/xml/features"),
+ editConfigurationFileExtend("etc/org.apache.karaf.features.cfg",
"featuresRepositories",
",mvn:org.apache.sling/org.apache.sling.launchpad.karaf-features/0.1.0-SNAPSHOT/xml/features"),
editConfigurationFileExtend("etc/org.apache.karaf.features.cfg",
"featuresBoot", ",sling-karaf"),
editConfigurationFilePut("etc/org.ops4j.pax.logging.cfg",
"log4j.rootLogger", "log4j.rootLogger=DEBUG, sift, osgi:*")
};
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/pom.xml?rev=1508099&r1=1508098&r2=1508099&view=diff
==============================================================================
---
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/pom.xml
(original)
+++
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/pom.xml
Mon Jul 29 15:29:37 2013
@@ -24,12 +24,12 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>16</version>
+ <version>17</version>
<relativePath>../../../../parent/pom.xml</relativePath>
</parent>
<artifactId>org.apache.sling.launchpad.karaf</artifactId>
- <version>0.1.0.BUILD-SNAPSHOT</version>
+ <version>0.1.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Sling Launchpad Karaf</name>
Modified: sling/trunk/contrib/launchpad/karaf/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/pom.xml?rev=1508099&r1=1508098&r2=1508099&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/pom.xml (original)
+++ sling/trunk/contrib/launchpad/karaf/pom.xml Mon Jul 29 15:29:37 2013
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>16</version>
+ <version>17</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
