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:23:05 UTC
[sling-org-apache-sling-jobs-it] 07/09: SLING-6911: Remove
commons.json from ./contrib/commons/mom/jobs/it
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-jobs-it.git
commit a65c824b7a7a59068ffe56cec1db443385dbe1d8
Author: Karl Pauls <pa...@apache.org>
AuthorDate: Thu Jun 1 21:12:39 2017 +0000
SLING-6911: Remove commons.json from ./contrib/commons/mom/jobs/it
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1797268 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 14 +++++++++-----
src/test/resources/provisioning-model/base.txt | 4 +++-
.../provisioning-model/crankstart-test-support.txt | 5 ++---
src/test/resources/sling-launchpad.txt | 5 +++--
4 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index 02a2847..ad11eea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,6 +65,15 @@
<target>1.6</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>activemq-data/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</build>
<dependencies>
@@ -87,11 +96,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.json</artifactId>
- <version>2.0.10</version>
- </dependency>
- <dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.1</version>
diff --git a/src/test/resources/provisioning-model/base.txt b/src/test/resources/provisioning-model/base.txt
index 751ad8a..945eb0e 100644
--- a/src/test/resources/provisioning-model/base.txt
+++ b/src/test/resources/provisioning-model/base.txt
@@ -33,9 +33,11 @@
org.apache.sling/org.apache.sling.launchpad.api/1.1.0
org.apache.felix/org.apache.felix.http.jetty/${felix.http.jetty.version}
org.apache.felix/org.apache.felix.eventadmin/1.3.2
- org.apache.felix/org.apache.felix.scr/1.8.2
+ org.apache.felix/org.apache.felix.scr/2.0.10
org.apache.felix/org.apache.felix.metatype/1.0.10
org.apache.sling/org.apache.sling.commons.osgi/2.2.0
org.apache.sling/org.apache.sling.commons.log/2.1.2
org.apache.felix/org.apache.felix.configadmin/1.6.0
org.apache.felix/org.apache.felix.webconsole/3.1.6
+ org.slf4j/slf4j-api/1.7.6
+ org.slf4j/slf4j-simple/1.7.6
diff --git a/src/test/resources/provisioning-model/crankstart-test-support.txt b/src/test/resources/provisioning-model/crankstart-test-support.txt
index e8b42d6..fe499d8 100644
--- a/src/test/resources/provisioning-model/crankstart-test-support.txt
+++ b/src/test/resources/provisioning-model/crankstart-test-support.txt
@@ -21,9 +21,8 @@
[artifacts]
org.apache.sling/org.apache.sling.jcr.jcr-wrapper/2.0.0
- org.apache.sling/org.apache.sling.commons.json/2.0.6
- org.apache.sling/org.apache.sling.junit.core/1.0.10
+ org.apache.sling/org.apache.sling.junit.core/1.0.25-SNAPSHOT
org.apache.sling/org.apache.sling.commons.mime/2.1.8
org.apache.sling/org.apache.sling.settings/1.3.6
-
+ org.apache.sling/org.apache.sling.commons.johnzon/1.0.0
diff --git a/src/test/resources/sling-launchpad.txt b/src/test/resources/sling-launchpad.txt
index 45c401a..807caae 100644
--- a/src/test/resources/sling-launchpad.txt
+++ b/src/test/resources/sling-launchpad.txt
@@ -49,13 +49,14 @@
# TODO remove those once nested test-bundles model works
[artifacts startLevel=2]
org.apache.sling/org.apache.sling.servlets.compat/1.0.2
- org.apache.sling/org.apache.sling.junit.core/1.0.11-SNAPSHOT
+ org.apache.sling/org.apache.sling.junit.core/1.0.25-SNAPSHOT
org.apache.sling/org.apache.sling.junit.remote/1.0.11-SNAPSHOT
org.apache.sling/org.apache.sling.junit.scriptable/1.0.11-SNAPSHOT
org.apache.sling/org.apache.sling.launchpad.test-fragment/2.0.9-SNAPSHOT
org.apache.sling/org.apache.sling.launchpad.test-services-war/2.0.8/war
org.apache.sling/org.apache.sling.launchpad.test-services/2.0.9-SNAPSHOT
-
+ org.apache.sling/org.apache.sling.commons.johnzon/1.0.0
+
[configurations]
integrationTestsConfig
message="This test config should be loaded at startup"
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.