You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ra...@apache.org on 2016/07/27 15:52:51 UTC

svn commit: r1754285 - in /sling/trunk: bundles/scripting/sightly/engine/ bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/ launchpad/builder/src/main/provisioning/

Author: radu
Date: Wed Jul 27 15:52:51 2016
New Revision: 1754285

URL: http://svn.apache.org/viewvc?rev=1754285&view=rev
Log:
SLING-5253 - Remove getAdministrativeResourceResolver() from the Sightly engine

Modified:
    sling/trunk/bundles/scripting/sightly/engine/pom.xml
    sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/ResourceBackedPojoChangeMonitor.java
    sling/trunk/launchpad/builder/src/main/provisioning/sling.txt

Modified: sling/trunk/bundles/scripting/sightly/engine/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/engine/pom.xml?rev=1754285&r1=1754284&r2=1754285&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/sightly/engine/pom.xml (original)
+++ sling/trunk/bundles/scripting/sightly/engine/pom.xml Wed Jul 27 15:52:51 2016
@@ -171,7 +171,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.api</artifactId>
-            <version>2.13.1-SNAPSHOT</version>
+            <version>2.14.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/ResourceBackedPojoChangeMonitor.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/ResourceBackedPojoChangeMonitor.java?rev=1754285&r1=1754284&r2=1754285&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/ResourceBackedPojoChangeMonitor.java (original)
+++ sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/ResourceBackedPojoChangeMonitor.java Wed Jul 27 15:52:51 2016
@@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory;
 @Component
 @Service({ResourceBackedPojoChangeMonitor.class, ResourceChangeListener.class})
 @Properties({
-    @Property(name = ResourceChangeListener.PATHS, value = "**/*.java"),
+    @Property(name = ResourceChangeListener.PATHS, value = "glob:**/*.java"),
     @Property(name = ResourceChangeListener.CHANGES, value = {"ADDED", "CHANGED", "REMOVED"})
 })
 public class ResourceBackedPojoChangeMonitor implements ResourceChangeListener {

Modified: sling/trunk/launchpad/builder/src/main/provisioning/sling.txt
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/sling.txt?rev=1754285&r1=1754284&r2=1754285&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/provisioning/sling.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Wed Jul 27 15:52:51 2016
@@ -34,7 +34,7 @@
     org.apache.httpcomponents/httpclient-osgi/4.4.1
     com.google.guava/guava/15.0
     org.apache.sling/org.apache.sling.adapter/2.1.8
-    org.apache.sling/org.apache.sling.api/2.14.0
+    org.apache.sling/org.apache.sling.api/2.14.1-SNAPSHOT
     org.apache.sling/org.apache.sling.auth.core/1.3.16
     org.apache.sling/org.apache.sling.auth.form/1.0.8
     org.apache.sling/org.apache.sling.bundleresource.impl/2.2.0
@@ -64,7 +64,7 @@
     org.apache.sling/org.apache.sling.launchpad.content/2.0.8
     org.apache.sling/org.apache.sling.models.api/1.2.2
     org.apache.sling/org.apache.sling.models.impl/1.2.6
-    org.apache.sling/org.apache.sling.resourceresolver/1.4.16
+    org.apache.sling/org.apache.sling.resourceresolver/1.4.17-SNAPSHOT
     org.apache.sling/org.apache.sling.scripting.api/2.1.8
     org.apache.sling/org.apache.sling.scripting.core/2.0.38
     org.apache.sling/org.apache.sling.scripting.javascript/2.0.30