Author: olli
Date: Fri Dec 27 16:24:00 2013
New Revision: 1553688
URL: http://svn.apache.org/r1553688
Log:
SLING-3027 update Karaf to 3.0.0 and Pax Exam to 3.4.0
Modified:
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/main/java/org/apache/sling/launchpad/karaf/testing/KarafTestSupport.java
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/BootstrapSlingIT.java
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/BootstrapSlingLaunchpadJackrabbitIT.java
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=1553688&r1=1553687&r2=1553688&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
Fri Dec 27 16:24:00 2013
@@ -57,7 +57,7 @@
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId>
- <version>3.0.0.RC1</version>
+ <version>3.0.0</version>
<extensions>true</extensions>
</plugin>
</plugins>
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=1553688&r1=1553687&r2=1553688&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
Fri Dec 27 16:24:00 2013
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<features name="sling" version="${project.version}"
xmlns="http://karaf.apache.org/xmlns/features/v1.2.0";>
+<features name="sling" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0";>
<!-- infrastructure services for Sling -->
<feature name="infrastructure-sling" version="${project.version}">
<feature>config</feature>
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=1553688&r1=1553687&r2=1553688&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
Fri Dec 27 16:24:00 2013
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>org.apache.karaf.features.core</artifactId>
- <version>3.0.0.RC1</version>
+ <version>3.0.0</version>
<scope>provided</scope>
</dependency>
<!-- Apache Sling -->
@@ -78,40 +78,39 @@
<!-- testing -->
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam</artifactId>
+ <version>3.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.tinybundles</groupId>
+ <artifactId>tinybundles</artifactId>
+ <version>2.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-container-karaf</artifactId>
- <version>3.3.0</version>
+ <version>3.4.0</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit4</artifactId>
- <version>3.3.0</version>
+ <version>3.4.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>apache-karaf</artifactId>
<type>tar.gz</type>
- <version>3.0.0.RC1</version>
+ <version>3.0.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.apache.karaf</groupId>
<artifactId>org.apache.karaf.client</artifactId>
</exclusion>
- <!-- Remove after fix for KARAF-2397 is released -->
- <exclusion>
- <groupId>org.eclipse</groupId>
- <artifactId>osgi</artifactId>
- </exclusion>
</exclusions>
</dependency>
- <!-- Remove after fix for KARAF-2397 is released -->
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
- <version>3.8.0.v20120529-1548</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/KarafTestSupport.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/KarafTestSupport.java?rev=1553688&r1=1553687&r2=1553688&view=diff
==============================================================================
---
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/KarafTestSupport.java
(original)
+++
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/KarafTestSupport.java
Fri Dec 27 16:24:00 2013
@@ -21,7 +21,12 @@ package org.apache.sling.launchpad.karaf
import javax.inject.Inject;
import org.apache.karaf.features.BootFinished;
+import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.util.Filter;
+import org.osgi.framework.Constants;
+
+import static org.ops4j.pax.exam.CoreOptions.streamBundle;
+import static org.ops4j.pax.tinybundles.core.TinyBundles.bundle;
public abstract class KarafTestSupport {
@@ -29,7 +34,7 @@ public abstract class KarafTestSupport {
public static final String KARAF_ARTIFACT_ID = "apache-karaf";
- public static final String KARAF_VERSION = "3.0.0.RC1";
+ public static final String KARAF_VERSION = "3.0.0";
public static final String KARAF_NAME = "Apache Karaf";
@@ -56,4 +61,15 @@ public abstract class KarafTestSupport {
return KARAF_NAME;
}
+ protected Option karafTestSupportBundle() {
+ return streamBundle(
+ bundle()
+ .add(KarafTestSupport.class)
+ .set(Constants.BUNDLE_SYMBOLICNAME,
"org.apache.sling.launchpad.karaf-integration-tests")
+ .set(Constants.EXPORT_PACKAGE,
"org.apache.sling.launchpad.karaf.testing")
+ .set(Constants.IMPORT_PACKAGE, "javax.inject,
org.apache.karaf.features, org.ops4j.pax.exam, org.ops4j.pax.exam.util,
org.ops4j.pax.tinybundles.core, org.osgi.framework")
+ .build()
+ ).start();
+ }
+
}
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/BootstrapSlingIT.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/tests/BootstrapSlingIT.java?rev=1553688&r1=1553687&r2=1553688&view=diff
==============================================================================
---
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/BootstrapSlingIT.java
(original)
+++
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/BootstrapSlingIT.java
Fri Dec 27 16:24:00 2013
@@ -35,8 +35,8 @@ import org.ops4j.pax.exam.spi.reactors.P
import org.ops4j.pax.exam.util.Filter;
import static org.junit.Assert.assertNotNull;
-import static org.ops4j.pax.exam.CoreOptions.bundle;
import static org.ops4j.pax.exam.CoreOptions.maven;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static
org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFileExtend;
import static
org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
import static
org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
@@ -53,12 +53,13 @@ public class BootstrapSlingIT extends Ka
@Configuration
public Option[] configuration() {
return new Option[]{
-
karafDistributionConfiguration().frameworkUrl(maven().groupId(karafGroupId()).artifactId(karafArtifactId()).version(karafVersion()).type("tar.gz")).karafVersion(karafVersion()).name(karafName()).unpackDirectory(new
File("target/paxexam/")),
+
karafDistributionConfiguration().frameworkUrl(maven().groupId(karafGroupId()).artifactId(karafArtifactId()).version(karafVersion()).type("tar.gz")).karafVersion(karafVersion()).useDeployFolder(false).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.1-SNAPSHOT/xml/features"),
editConfigurationFileExtend("etc/org.apache.karaf.features.cfg",
"featuresBoot", ",sling"),
-
bundle("file:target/org.apache.sling.launchpad.karaf-integration-tests-0.1.1-SNAPSHOT.jar")
+
mavenBundle().groupId("org.ops4j.pax.tinybundles").artifactId("tinybundles").version("2.0.0"),
+ karafTestSupportBundle()
};
}
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/BootstrapSlingLaunchpadJackrabbitIT.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/tests/BootstrapSlingLaunchpadJackrabbitIT.java?rev=1553688&r1=1553687&r2=1553688&view=diff
==============================================================================
---
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/BootstrapSlingLaunchpadJackrabbitIT.java
(original)
+++
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/BootstrapSlingLaunchpadJackrabbitIT.java
Fri Dec 27 16:24:00 2013
@@ -36,8 +36,8 @@ import org.ops4j.pax.exam.spi.reactors.P
import org.ops4j.pax.exam.util.Filter;
import static org.junit.Assert.assertNotNull;
-import static org.ops4j.pax.exam.CoreOptions.bundle;
import static org.ops4j.pax.exam.CoreOptions.maven;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static
org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFileExtend;
import static
org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
import static
org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
@@ -54,12 +54,13 @@ public class BootstrapSlingLaunchpadJack
@Configuration
public Option[] configuration() {
return new Option[]{
-
karafDistributionConfiguration().frameworkUrl(maven().groupId(karafGroupId()).artifactId(karafArtifactId()).version(karafVersion()).type("tar.gz")).karafVersion(karafVersion()).name(karafName()).unpackDirectory(new
File("target/paxexam/")),
+
karafDistributionConfiguration().frameworkUrl(maven().groupId(karafGroupId()).artifactId(karafArtifactId()).version(karafVersion()).type("tar.gz")).karafVersion(karafVersion()).useDeployFolder(false).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.1-SNAPSHOT/xml/features"),
editConfigurationFileExtend("etc/org.apache.karaf.features.cfg",
"featuresBoot", ",sling-launchpad-jackrabbit"),
-
bundle("file:target/org.apache.sling.launchpad.karaf-integration-tests-0.1.1-SNAPSHOT.jar")
+
mavenBundle().groupId("org.ops4j.pax.tinybundles").artifactId("tinybundles").version("2.0.0"),
+ karafTestSupportBundle()
};
}
