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-scriptingbundle-maven-plugin.git
commit a3f7b2f13c06d6651a688a5dafc30c81621ca45c Author: Radu Cotescu <[email protected]> AuthorDate: Thu Jan 28 16:54:59 2021 +0100 SLING-9999 - Remove cyclic dependency between scripting and servlets features * This reverts commit 7389426637a54c9429df4dde5b26db7498567c18 --- pom.xml | 8 +++++++- .../apache/sling/scriptingbundle/maven/plugin/FileProcessor.java | 2 +- .../scriptingbundle/maven/plugin/ResourceTypeFolderAnalyser.java | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index fe06c55..de57268 100644 --- a/pom.xml +++ b/pom.xml @@ -199,8 +199,14 @@ </dependency> <dependency> <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.servlets.resolver</artifactId> + <scope>compile</scope> + <version>2.7.0</version> + </dependency> + <dependency> + <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.api</artifactId> - <version>2.23.1-SNAPSHOT</version> + <version>2.22.0</version> <scope>compile</scope> </dependency> diff --git a/src/main/java/org/apache/sling/scriptingbundle/maven/plugin/FileProcessor.java b/src/main/java/org/apache/sling/scriptingbundle/maven/plugin/FileProcessor.java index 50ee7f0..4d6420e 100644 --- a/src/main/java/org/apache/sling/scriptingbundle/maven/plugin/FileProcessor.java +++ b/src/main/java/org/apache/sling/scriptingbundle/maven/plugin/FileProcessor.java @@ -32,9 +32,9 @@ import java.util.Set; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; import org.apache.maven.plugin.logging.Log; -import org.apache.sling.api.resource.type.ResourceType; import org.apache.sling.scriptingbundle.maven.plugin.capability.ProvidedResourceTypeCapability; import org.apache.sling.scriptingbundle.maven.plugin.capability.RequiredResourceTypeCapability; +import org.apache.sling.servlets.resolver.bundle.tracker.ResourceType; import org.jetbrains.annotations.NotNull; import org.osgi.framework.VersionRange; diff --git a/src/main/java/org/apache/sling/scriptingbundle/maven/plugin/ResourceTypeFolderAnalyser.java b/src/main/java/org/apache/sling/scriptingbundle/maven/plugin/ResourceTypeFolderAnalyser.java index 9383b5f..51b7c9b 100644 --- a/src/main/java/org/apache/sling/scriptingbundle/maven/plugin/ResourceTypeFolderAnalyser.java +++ b/src/main/java/org/apache/sling/scriptingbundle/maven/plugin/ResourceTypeFolderAnalyser.java @@ -30,10 +30,10 @@ import java.util.stream.Stream; import org.apache.commons.io.FilenameUtils; import org.apache.maven.plugin.logging.Log; -import org.apache.sling.api.resource.type.ResourceType; import org.apache.sling.scriptingbundle.maven.plugin.capability.Capabilities; import org.apache.sling.scriptingbundle.maven.plugin.capability.ProvidedResourceTypeCapability; import org.apache.sling.scriptingbundle.maven.plugin.capability.RequiredResourceTypeCapability; +import org.apache.sling.servlets.resolver.bundle.tracker.ResourceType; import org.jetbrains.annotations.NotNull;
