You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2017/07/15 09:43:34 UTC
svn commit: r1802008 - in
/sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests:
pom.xml
src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java
Author: olli
Date: Sat Jul 15 09:43:34 2017
New Revision: 1802008
URL: http://svn.apache.org/viewvc?rev=1802008&view=rev
Log:
SLING-3821 Run launchpad integration tests against Sling on Karaf
cleanup
Modified:
sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/pom.xml
sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java
Modified: sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/pom.xml?rev=1802008&r1=1802007&r2=1802008&view=diff
==============================================================================
--- sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/pom.xml (original)
+++ sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/pom.xml Sat Jul 15 09:43:34 2017
@@ -90,6 +90,12 @@
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.commons.json</artifactId>
+ <version>2.0.20</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.servlets.compat</artifactId>
<version>1.0.2</version>
<scope>test</scope>
Modified: sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java
URL: http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java?rev=1802008&r1=1802007&r2=1802008&view=diff
==============================================================================
--- sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java (original)
+++ sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java Sat Jul 15 09:43:34 2017
@@ -86,7 +86,8 @@ public class SlingLaunchpadOakTarConfigu
),
// bundle for test (contains repoinit.txt)
testBundle(),
- // misc (legacy, snapshots, ...) stuff
+ // legacy
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.json").versionAsInProject(),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.servlets.compat").versionAsInProject(),
// test support
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.junit.core").versionAsInProject(),
@@ -96,9 +97,7 @@ public class SlingLaunchpadOakTarConfigu
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.launchpad.test-fragment").versionAsInProject(),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.testing.tools").versionAsInProject(),
mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpcore-osgi").versionAsInProject(),
- mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpclient-osgi").versionAsInProject(),
- // TODO remove (required by org.apache.sling.junit.core)
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.json").version("2.0.20")
+ mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpclient-osgi").versionAsInProject()
);
}