commit 9f59d1d9a9f8fe83d57a9ded8292d6bed129883e
author Bertrand Delacretaz <bdelacretaz@apache.org> Mon Jan 13 15:10:12 2020 +0100
committer Bertrand Delacretaz <bdelacretaz@apache.org> Mon Jan 13 15:10:12 2020 +0100
tree bfae4d1b6f68ae0e053ff597fa05df775e08b6c6
parent 719d3f891e46787926803bace96ccce40361453b

SLING-8936 - use deployed SNAPSHOTs and make them explicit in pom.xml

pom.xml

diff --git a/pom.xml b/pom.xml
index c91c48f..9673f45 100644
--- a/pom.xml
+++ b/pom.xml
@@ -144,7 +144,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.api</artifactId>
-            <version>2.22.0</version>
+            <version>2.22.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <!-- for ServiceUserMapped (SLING-4312) -->
@@ -285,5 +285,12 @@
             <version>1.3.0</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.scripting.core</artifactId>
+            <!-- SLING-8936 - this version number can move to ServletResolverTestSupport once we use a non-SNAPSHOT version -->
+            <version>2.1.1-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>

src/test/java/org/apache/sling/servlets/resolver/it/ServletResolverTestSupport.java

diff --git a/src/test/java/org/apache/sling/servlets/resolver/it/ServletResolverTestSupport.java b/src/test/java/org/apache/sling/servlets/resolver/it/ServletResolverTestSupport.java
index cdb050b..96f3807 100644
--- a/src/test/java/org/apache/sling/servlets/resolver/it/ServletResolverTestSupport.java
+++ b/src/test/java/org/apache/sling/servlets/resolver/it/ServletResolverTestSupport.java
@@ -73,7 +73,7 @@
                 slingQuickstartOakTar(workingDirectory(), httpPort),
                 mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.api").versionAsInProject(),
                 mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.resourceresolver").version("1.6.16"), // compatible with API 2.22.0
-                mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.core").version("2.1.1-SNAPSHOT"), // compatible with API 2.22.0
+                mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.core").versionAsInProject(), // compatible with API 2.22.0
                 mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.converter").version("1.0.12"), // new Sling API dependency
                 testBundle("bundle.filename"),
                 wrappedBundle(mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.servlet-helpers").versionAsInProject()),