You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/10/18 23:28:04 UTC
[sling-org-apache-sling-karaf-launchpad-oak-tar-integration-tests]
33/44: SLING-3027 Improve Launchpad Karaf Features
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 e2f48755901f99a3dfe34113ce41155ba0a7669c
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Mar 31 10:14:42 2017 +0000
SLING-3027 Improve Launchpad Karaf Features
* prepare switch from org.apache.sling.commons.json to org.apache.sling.commons.johnzon
* remove javax.jcr from feature sling
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1789650 13f79535-47bb-0310-9956-ffa450edef68
---
.../karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
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 c19e49a..b5972c9 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
@@ -96,7 +96,9 @@ 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()
+ 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")
);
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.