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 2021/01/29 10:21:34 UTC
[sling-scriptingbundle-maven-plugin] branch master updated (7389426
-> e206888)
This is an automated email from the ASF dual-hosted git repository.
radu pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-scriptingbundle-maven-plugin.git.
from 7389426 SLING-9999 Remove cyclic dependency between scripting and servlets features
new a3f7b2f SLING-9999 - Remove cyclic dependency between scripting and servlets features
new e206888 SLING-9999 - Remove cyclic dependency between scripting and servlets features
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 8 +++++++-
.../apache/sling/scriptingbundle/maven/plugin/FileProcessor.java | 2 +-
.../scriptingbundle/maven/plugin/ResourceTypeFolderAnalyser.java | 2 +-
3 files changed, 9 insertions(+), 3 deletions(-)
[sling-scriptingbundle-maven-plugin] 01/02: SLING-9999 - Remove
cyclic dependency between scripting and servlets features
Posted by ra...@apache.org.
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 <ra...@apache.org>
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;
[sling-scriptingbundle-maven-plugin] 02/02: SLING-9999 - Remove
cyclic dependency between scripting and servlets features
Posted by ra...@apache.org.
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 e2068883fbd6af8e0ab826e8c77fc6c97f855f81
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Fri Jan 29 11:20:47 2021 +0100
SLING-9999 - Remove cyclic dependency between scripting and servlets features
* moved the o.a.s.servlets.resolver.bundle.tracker API to a dedicated bundle
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index de57268..a0047d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -199,9 +199,9 @@
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.servlets.resolver</artifactId>
+ <artifactId>org.apache.sling.servlets.resolver.api</artifactId>
<scope>compile</scope>
- <version>2.7.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>