sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [sling-org-apache-sling-scripting-bundle-tracker] branch master updated: SLING-8184 - Rely on the sling.servlet.resourceSuperType to optimise servlet registration
Date Wed, 19 Dec 2018 14:45:36 GMT
This is an automated email from the ASF dual-hosted git repository.

radu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-bundle-tracker.git


The following commit(s) were added to refs/heads/master by this push:
     new 77cf4f9  SLING-8184 - Rely on the sling.servlet.resourceSuperType to optimise servlet
registration
77cf4f9 is described below

commit 77cf4f91f8c483413f670064571ab27d6d00d8ca
Author: Radu Cotescu <radu@apache.org>
AuthorDate: Wed Dec 19 15:45:08 2018 +0100

    SLING-8184 - Rely on the sling.servlet.resourceSuperType to optimise servlet registration
---
 pom.xml                                                               | 4 ++--
 .../sling/scripting/bundle/tracker/internal/BundledScriptTracker.java | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4770571..30b853d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>findbugs-maven-plugin</artifactId>
-                <version>3.0.3</version>
+                <version>3.0.5</version>
                 <configuration>
                     <effort>Max</effort>
                     <xmlOutput>true</xmlOutput>
@@ -114,7 +114,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.api</artifactId>
-            <version>2.16.4</version>
+            <version>2.20.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/src/main/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptTracker.java
b/src/main/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptTracker.java
index d544279..5e70600 100644
--- a/src/main/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptTracker.java
+++ b/src/main/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptTracker.java
@@ -179,10 +179,9 @@ public class BundledScriptTracker implements BundleTrackerCustomizer<List<Servic
                         Version wireResourceTypeVersion = (Version) wireCapabilityAttributes.get(AT_VERSION);
                         String wireResourceTypeString = wireResourceType + (wireResourceTypeVersion
!= null ? "/" +
                                 wireResourceTypeVersion.toString() : "");
-
                         wiredProviders.add(new TypeProvider(wireResourceType, providerBundle));
                         wiredProviders.add(new TypeProvider(wireResourceTypeString, providerBundle));
-
+                        properties.put(ServletResolverConstants.SLING_SERVLET_RESOURCE_SUPER_TYPE,
wireResourceTypeString);
                     }
                     populateWiredProviders(wiredProviders);
                     regs.add(


Mime
View raw message