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 2017/03/01 08:27:34 UTC
svn commit: r1784869 - in
/sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf: pom.xml
src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTestSupport.java
Author: olli
Date: Wed Mar 1 08:27:34 2017
New Revision: 1784869
URL: http://svn.apache.org/viewvc?rev=1784869&view=rev
Log:
SLING-6557 Remove embedded AttoParser, Unbescape and OGNL dependencies from bundle
Modified:
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/pom.xml
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTestSupport.java
Modified: sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/pom.xml?rev=1784869&r1=1784868&r2=1784869&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/pom.xml (original)
+++ sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/pom.xml Wed Mar 1 08:27:34 2017
@@ -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>
Modified: sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTestSupport.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTestSupport.java?rev=1784869&r1=1784868&r2=1784869&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTestSupport.java (original)
+++ sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTestSupport.java Wed Mar 1 08:27:34 2017
@@ -80,6 +80,9 @@ public abstract class ThymeleafTestSuppo
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(),