[sling-org-apache-sling-testing-paxexam] branch master updated: SLING-9683 Provide GreenMail Option

[olli]

This is an automated email from the ASF dual-hosted git repository.

olli pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-paxexam.git


The following commit(s) were added to refs/heads/master by this push:
     new 6903475  SLING-9683 Provide GreenMail Option
6903475 is described below

commit 6903475adc241b1e16904971a2199e9ec239b17b
Author: Oliver Lietz <o...@apache.org>
AuthorDate: Tue Aug 25 20:58:12 2020 +0200

    SLING-9683 Provide GreenMail Option
    
    use junitBundles Option
---
 src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java        | 2 +-
 .../java/org/apache/sling/testing/paxexam/SlingVersionResolver.java     | 1 -
 src/main/resources/templates/SlingOptions.hbs                           | 2 +-
 src/main/resources/templates/SlingVersionResolver.hbs                   | 1 -
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java 
b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
index 5aed0a9..10fc70e 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -88,7 +88,7 @@ public class SlingOptions {
             greenmail,
             
mavenBundle().groupId("jakarta.mail").artifactId("jakarta.mail-api").version(versionResolver),
             
mavenBundle().groupId("com.sun.mail").artifactId("jakarta.mail").version(versionResolver),
-            
mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.junit").version(versionResolver),
+            junitBundles(),
             // add GreenMail to boot classpath *also* to allow setting 
ssl.SocketFactory.provider to GreenMail's DummySSLSocketFactory
             bootClasspathLibrary(greenmail).afterFramework(),
             bootClasspathLibrary(slf4j_api).afterFramework(), // GreenMail 
dependency
diff --git 
a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java 
b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
index bb2ce49..863804f 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -42,7 +42,6 @@ public class SlingVersionResolver implements VersionResolver {
         
versions.put("org.apache.servicemix.specs:org.apache.servicemix.specs.stax-api-1.2",
 "1.2_1");
         
versions.put("org.apache.servicemix.specs:org.apache.servicemix.specs.jaxb-api-2.3",
 "2.3_3");
         
versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-impl",
 "2.2.11_1");
-        
versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.junit",
 "4.13_1");
         
versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.tagsoup",
 "1.2.1_1");
         versions.put("org.apache.sling:org.apache.sling.scripting.jsp-api", 
"1.0.2");
         versions.put("org.apache.sling:org.apache.sling.scripting.el-api", 
"1.0.2");
diff --git a/src/main/resources/templates/SlingOptions.hbs 
b/src/main/resources/templates/SlingOptions.hbs
index 1bbc8b9..3e2d981 100644
--- a/src/main/resources/templates/SlingOptions.hbs
+++ b/src/main/resources/templates/SlingOptions.hbs
@@ -88,7 +88,7 @@ public class SlingOptions {
             greenmail,
             
mavenBundle().groupId("jakarta.mail").artifactId("jakarta.mail-api").version(versionResolver),
             
mavenBundle().groupId("com.sun.mail").artifactId("jakarta.mail").version(versionResolver),
-            
mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.junit").version(versionResolver),
+            junitBundles(),
             // add GreenMail to boot classpath *also* to allow setting 
ssl.SocketFactory.provider to GreenMail's DummySSLSocketFactory
             bootClasspathLibrary(greenmail).afterFramework(),
             bootClasspathLibrary(slf4j_api).afterFramework(), // GreenMail 
dependency
diff --git a/src/main/resources/templates/SlingVersionResolver.hbs 
b/src/main/resources/templates/SlingVersionResolver.hbs
index 62b22a5..a6d0899 100644
--- a/src/main/resources/templates/SlingVersionResolver.hbs
+++ b/src/main/resources/templates/SlingVersionResolver.hbs
@@ -42,7 +42,6 @@ public class SlingVersionResolver implements VersionResolver {
         
versions.put("org.apache.servicemix.specs:org.apache.servicemix.specs.stax-api-1.2",
 "1.2_1");
         
versions.put("org.apache.servicemix.specs:org.apache.servicemix.specs.jaxb-api-2.3",
 "2.3_3");
         
versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-impl",
 "2.2.11_1");
-        
versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.junit",
 "4.13_1");
         
versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.tagsoup",
 "1.2.1_1");
         versions.put("org.apache.sling:org.apache.sling.scripting.jsp-api", 
"1.0.2");
         versions.put("org.apache.sling:org.apache.sling.scripting.el-api", 
"1.0.2");