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/11/07 10:20:15 UTC

[sling-org-apache-sling-testing-paxexam] 35/48: update SlingOptions (Sling Commons Compiler)

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

rombert pushed a commit to annotated tag org.apache.sling.testing.paxexam-0.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-paxexam.git

commit d52e72ef4a1d875b7e817fd7c841514cc0b4fee3
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Jul 30 09:21:46 2016 +0000

    update SlingOptions (Sling Commons Compiler)
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam@1754609 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/sling/testing/paxexam/SlingOptions.java   | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

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 ed6e98c..6240f8e 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -121,7 +121,6 @@ public class SlingOptions {
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.resourceresolver").version(versionResolver),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.serviceusermapper").version(versionResolver),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.settings").version(versionResolver),
-            mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.compiler").version(versionResolver),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.json").version(versionResolver),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.mime").version(versionResolver),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.osgi").version(versionResolver),
@@ -144,6 +143,13 @@ public class SlingOptions {
         );
     }
 
+    public static Option slingCommonsCompiler() {
+        return composite(
+            slingCommonsClassloader(),
+            mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.compiler").version(versionResolver)
+        );
+    }
+
     public static Option slingCommonsClassloader() {
         return composite(
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.classloader").version(versionResolver)
@@ -383,6 +389,7 @@ public class SlingOptions {
         return composite(
             sling(),
             slingJcr(),
+            slingCommonsCompiler(),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.compiler").version(versionResolver)
         );
     }
@@ -533,6 +540,7 @@ public class SlingOptions {
     public static Option slingScriptingJsp() {
         return composite(
             slingScripting(),
+            slingCommonsCompiler(),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.jsp").version(versionResolver),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.jsp.taglib").version(versionResolver)
         );
@@ -755,6 +763,7 @@ public class SlingOptions {
         return composite(
             sling(),
             slingScripting(),
+            slingCommonsCompiler(),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.java").version(versionResolver)
         );
     }

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.