You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by pa...@apache.org on 2017/06/01 21:12:39 UTC
svn commit: r1797268 - in /sling/trunk/contrib/commons/mom/jobs/it: pom.xml
src/test/resources/provisioning-model/base.txt
src/test/resources/provisioning-model/crankstart-test-support.txt
src/test/resources/sling-launchpad.txt
Author: pauls
Date: Thu Jun 1 21:12:39 2017
New Revision: 1797268
URL: http://svn.apache.org/viewvc?rev=1797268&view=rev
Log:
SLING-6911: Remove commons.json from ./contrib/commons/mom/jobs/it
Modified:
sling/trunk/contrib/commons/mom/jobs/it/pom.xml
sling/trunk/contrib/commons/mom/jobs/it/src/test/resources/provisioning-model/base.txt
sling/trunk/contrib/commons/mom/jobs/it/src/test/resources/provisioning-model/crankstart-test-support.txt
sling/trunk/contrib/commons/mom/jobs/it/src/test/resources/sling-launchpad.txt
Modified: sling/trunk/contrib/commons/mom/jobs/it/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/commons/mom/jobs/it/pom.xml?rev=1797268&r1=1797267&r2=1797268&view=diff
==============================================================================
--- sling/trunk/contrib/commons/mom/jobs/it/pom.xml (original)
+++ sling/trunk/contrib/commons/mom/jobs/it/pom.xml Thu Jun 1 21:12:39 2017
@@ -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>
Modified: sling/trunk/contrib/commons/mom/jobs/it/src/test/resources/provisioning-model/base.txt
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/commons/mom/jobs/it/src/test/resources/provisioning-model/base.txt?rev=1797268&r1=1797267&r2=1797268&view=diff
==============================================================================
--- sling/trunk/contrib/commons/mom/jobs/it/src/test/resources/provisioning-model/base.txt (original)
+++ sling/trunk/contrib/commons/mom/jobs/it/src/test/resources/provisioning-model/base.txt Thu Jun 1 21:12:39 2017
@@ -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
Modified: sling/trunk/contrib/commons/mom/jobs/it/src/test/resources/provisioning-model/crankstart-test-support.txt
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/commons/mom/jobs/it/src/test/resources/provisioning-model/crankstart-test-support.txt?rev=1797268&r1=1797267&r2=1797268&view=diff
==============================================================================
--- sling/trunk/contrib/commons/mom/jobs/it/src/test/resources/provisioning-model/crankstart-test-support.txt (original)
+++ sling/trunk/contrib/commons/mom/jobs/it/src/test/resources/provisioning-model/crankstart-test-support.txt Thu Jun 1 21:12:39 2017
@@ -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
Modified: sling/trunk/contrib/commons/mom/jobs/it/src/test/resources/sling-launchpad.txt
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/commons/mom/jobs/it/src/test/resources/sling-launchpad.txt?rev=1797268&r1=1797267&r2=1797268&view=diff
==============================================================================
--- sling/trunk/contrib/commons/mom/jobs/it/src/test/resources/sling-launchpad.txt (original)
+++ sling/trunk/contrib/commons/mom/jobs/it/src/test/resources/sling-launchpad.txt Thu Jun 1 21:12:39 2017
@@ -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"