You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 10:14:34 UTC
[sling-org-apache-sling-scripting-thymeleaf] 32/39: SLING-6557
Remove embedded AttoParser, Unbescape and OGNL dependencies from bundle
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.scripting.thymeleaf-1.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-thymeleaf.git
commit 95f5dc42df0e3d7b0e6e01aa9f93c701c31b7075
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Mar 1 08:27:34 2017 +0000
SLING-6557 Remove embedded AttoParser, Unbescape and OGNL dependencies from bundle
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf@1784869 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 27 ++++++++--------------
.../thymeleaf/it/tests/ThymeleafTestSupport.java | 3 +++
2 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1c07af9..3d4e6b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,9 +40,6 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<sling.java.version>8</sling.java.version>
<org.thymeleaf.version>3.0.3.RELEASE</org.thymeleaf.version>
- <org.attoparser.version>2.0.2.RELEASE</org.attoparser.version>
- <org.unbescape.version>1.1.4.RELEASE</org.unbescape.version>
- <ognl.version>3.1.12</ognl.version>
<com.fasterxml.jackson.version>2.6.3</com.fasterxml.jackson.version>
<org.ops4j.pax.exam.version>4.10.0</org.ops4j.pax.exam.version>
</properties>
@@ -176,20 +173,20 @@
<dependency>
<groupId>org.attoparser</groupId>
<artifactId>attoparser</artifactId>
- <version>${org.attoparser.version}</version>
- <scope>compile</scope>
+ <version>2.0.2.RELEASE</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.unbescape</groupId>
<artifactId>unbescape</artifactId>
- <version>${org.unbescape.version}</version>
- <scope>compile</scope>
+ <version>1.1.4.RELEASE</version>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>ognl</groupId>
- <artifactId>ognl</artifactId>
- <version>${ognl.version}</version>
- <scope>compile</scope>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.ognl</artifactId>
+ <version>3.2_1</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
@@ -273,14 +270,8 @@
</Import-Package>
<Export-Package>
org.apache.sling.scripting.thymeleaf,
- org.thymeleaf.*;version=${org.thymeleaf.version};-split-package:=merge-first,
- org.attoparser.*;version=${org.attoparser.version},
- org.unbescape.*;version=${org.unbescape.version},
- ognl.*;version=${ognl.version}
+ org.thymeleaf.*;version=${org.thymeleaf.version};-split-package:=merge-first
</Export-Package>
- <DynamicImport-Package>
- *
- </DynamicImport-Package>
<ScriptEngine-Name>${project.name}</ScriptEngine-Name>
<ScriptEngine-Version>${project.version}</ScriptEngine-Version>
<_removeheaders>
diff --git a/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTestSupport.java b/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTestSupport.java
index 521e5da..3df68df 100644
--- a/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTestSupport.java
+++ b/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTestSupport.java
@@ -80,6 +80,9 @@ public abstract class ThymeleafTestSupport extends TestSupport {
launchpad(),
// Sling Scripting Thymeleaf
testBundle("bundle.filename"),
+ mavenBundle().groupId("org.attoparser").artifactId("attoparser").versionAsInProject(),
+ mavenBundle().groupId("org.unbescape").artifactId("unbescape").versionAsInProject(),
+ mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.ognl").versionAsInProject(),
mavenBundle().groupId("org.javassist").artifactId("javassist").versionAsInProject(),
// testing
mavenBundle().groupId("org.jsoup").artifactId("jsoup").versionAsInProject(),
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.