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:20:32 UTC
[sling-org-apache-sling-scripting-jsp] branch master updated
(ccdb902 -> 340dcde)
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-org-apache-sling-scripting-jsp.git.
from ccdb902 SLING-9999 Remove cyclic dependency between scripting and servlets features
new 7468a63 SLING-9999 - Remove cyclic dependency between scripting and servlets features
new 340dcde 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 | 10 ++++++++--
.../org/apache/sling/scripting/jsp/PrecompiledJSPRunner.java | 2 +-
2 files changed, 9 insertions(+), 3 deletions(-)
[sling-org-apache-sling-scripting-jsp] 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-org-apache-sling-scripting-jsp.git
commit 7468a63999576c526654181f55736fb636ce68d2
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Thu Jan 28 16:21:34 2021 +0100
SLING-9999 - Remove cyclic dependency between scripting and servlets features
* This reverts commit ccdb90266f254bb2143a5d870725a8f4b28d4d8b
---
pom.xml | 8 +++++++-
.../java/org/apache/sling/scripting/jsp/PrecompiledJSPRunner.java | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6484f20..5336c54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,7 +107,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.scripting.api</artifactId>
- <version>2.2.1-SNAPSHOT</version>
+ <version>2.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -144,5 +144,11 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.servlets.resolver</artifactId>
+ <version>2.7.1-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/src/main/java/org/apache/sling/scripting/jsp/PrecompiledJSPRunner.java b/src/main/java/org/apache/sling/scripting/jsp/PrecompiledJSPRunner.java
index 1895c63..6d259ef 100644
--- a/src/main/java/org/apache/sling/scripting/jsp/PrecompiledJSPRunner.java
+++ b/src/main/java/org/apache/sling/scripting/jsp/PrecompiledJSPRunner.java
@@ -31,7 +31,7 @@ import org.apache.sling.api.SlingIOException;
import org.apache.sling.api.SlingServletException;
import org.apache.sling.api.scripting.SlingBindings;
import org.apache.sling.commons.compiler.source.JavaEscapeHelper;
-import org.apache.sling.scripting.api.bundle.BundledRenderUnit;
+import org.apache.sling.servlets.resolver.bundle.tracker.BundledRenderUnit;
import org.apache.sling.scripting.jsp.jasper.compiler.JspRuntimeContext;
import org.apache.sling.scripting.jsp.jasper.runtime.AnnotationProcessor;
import org.apache.sling.scripting.jsp.jasper.runtime.HttpJspBase;
[sling-org-apache-sling-scripting-jsp] 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-org-apache-sling-scripting-jsp.git
commit 340dcde8abc9471b1cd28800edde72dcc1837356
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Fri Jan 29 11:20:11 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 | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5336c54..5fc0833 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,6 +112,12 @@
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.servlets.resolver.api</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.classloader</artifactId>
<version>1.4.0</version>
<scope>provided</scope>
@@ -130,7 +136,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.compiler</artifactId>
- <version>2.4.1-SNAPSHOT</version>
+ <version>2.4.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -144,11 +150,5 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.servlets.resolver</artifactId>
- <version>2.7.1-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
</dependencies>
</project>