You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2021/01/08 21:07:57 UTC
[sling-scriptingbundle-maven-plugin] branch master updated:
SLING-9999 Remove cyclic dependency between scripting and servlets features
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-scriptingbundle-maven-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 7389426 SLING-9999 Remove cyclic dependency between scripting and servlets features
7389426 is described below
commit 7389426637a54c9429df4dde5b26db7498567c18
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Jan 8 22:07:31 2021 +0100
SLING-9999 Remove cyclic dependency between scripting and servlets features
adjust import (use ResourceType from Sling API)
---
pom.xml | 8 +-------
.../apache/sling/scriptingbundle/maven/plugin/FileProcessor.java | 2 +-
.../scriptingbundle/maven/plugin/ResourceTypeFolderAnalyser.java | 2 +-
3 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index de57268..fe06c55 100644
--- a/pom.xml
+++ b/pom.xml
@@ -199,14 +199,8 @@
</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.22.0</version>
+ <version>2.23.1-SNAPSHOT</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 4d6420e..50ee7f0 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 51b7c9b..9383b5f 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;