This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-launchpad-oak-tar-integration-tests.git
commit feffb3c1f24ab1371ceacd2b687be95d02ca438f Author: Oliver Lietz <[email protected]> AuthorDate: Sat Jul 15 09:43:34 2017 +0000 SLING-3821 Run launchpad integration tests against Sling on Karaf cleanup git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1802008 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 6 ++++++ .../tests/configuration/SlingLaunchpadOakTarConfiguration.java | 7 +++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index e661abb..4b5c053 100644 --- a/pom.xml +++ b/pom.xml @@ -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> diff --git a/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java b/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java index b5972c9..0634d6c 100644 --- a/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java +++ b/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java @@ -86,7 +86,8 @@ public class SlingLaunchpadOakTarConfiguration extends KarafTestSupport { ), // 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 SlingLaunchpadOakTarConfiguration extends KarafTestSupport { 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() ); } -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
