You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2017/03/27 07:55:35 UTC

svn commit: r1788838 - in /sling/trunk: contrib/commons/mom/jobs/it/src/test/resources/sling-launchpad.txt launchpad/test-bundles/src/main/provisioning/bundles.txt pom.xml tooling/jenkins/create_jobs.groovy

Author: bdelacretaz
Date: Mon Mar 27 07:55:35 2017
New Revision: 1788838

URL: http://svn.apache.org/viewvc?rev=1788838&view=rev
Log:
SLING-6686 - retire o.a.s.servlets.compat, switch back to last release 1.0.2 where used

Modified:
    sling/trunk/contrib/commons/mom/jobs/it/src/test/resources/sling-launchpad.txt
    sling/trunk/launchpad/test-bundles/src/main/provisioning/bundles.txt
    sling/trunk/pom.xml
    sling/trunk/tooling/jenkins/create_jobs.groovy

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=1788838&r1=1788837&r2=1788838&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 Mon Mar 27 07:55:35 2017
@@ -48,7 +48,7 @@
   
 # TODO remove those once nested test-bundles model works
 [artifacts startLevel=2]
-  org.apache.sling/org.apache.sling.servlets.compat/1.0.3-SNAPSHOT
+  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.remote/1.0.11-SNAPSHOT
   org.apache.sling/org.apache.sling.junit.scriptable/1.0.11-SNAPSHOT

Modified: sling/trunk/launchpad/test-bundles/src/main/provisioning/bundles.txt
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/test-bundles/src/main/provisioning/bundles.txt?rev=1788838&r1=1788837&r2=1788838&view=diff
==============================================================================
--- sling/trunk/launchpad/test-bundles/src/main/provisioning/bundles.txt (original)
+++ sling/trunk/launchpad/test-bundles/src/main/provisioning/bundles.txt Mon Mar 27 07:55:35 2017
@@ -20,7 +20,7 @@
 [feature name=launchpad-test-bundles]
 
 [artifacts startLevel=1]
-  org.apache.sling/org.apache.sling.servlets.compat/1.0.3-SNAPSHOT
+  org.apache.sling/org.apache.sling.servlets.compat/1.0.2
 
 [artifacts]
   org.apache.sling/org.apache.sling.junit.core/1.0.14

Modified: sling/trunk/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/pom.xml?rev=1788838&r1=1788837&r2=1788838&view=diff
==============================================================================
--- sling/trunk/pom.xml (original)
+++ sling/trunk/pom.xml Mon Mar 27 07:55:35 2017
@@ -146,7 +146,6 @@
         <module>bundles/servlets/resolver</module>
         <module>bundles/servlets/get</module>
         <module>bundles/servlets/post</module>
-        <module>bundles/servlets/compat</module>
 
         <!-- Scripting Support -->
         <module>bundles/scripting/api</module>

Modified: sling/trunk/tooling/jenkins/create_jobs.groovy
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/jenkins/create_jobs.groovy?rev=1788838&r1=1788837&r2=1788838&view=diff
==============================================================================
--- sling/trunk/tooling/jenkins/create_jobs.groovy (original)
+++ sling/trunk/tooling/jenkins/create_jobs.groovy Mon Mar 27 07:55:35 2017
@@ -347,9 +347,6 @@ def modules = [
         jdks: ['1.8']
     ],
     [
-        location: 'bundles/servlets/compat'
-    ],
-    [
         location: 'bundles/servlets/get'
     ],
     [