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 2019/04/19 11:21:03 UTC
[sling-org-apache-sling-xss] branch master updated: SLING-8367 -
Switch org.apache.sling.xss to use commons-lang 3
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-xss.git
The following commit(s) were added to refs/heads/master by this push:
new d4f080d SLING-8367 - Switch org.apache.sling.xss to use commons-lang 3
d4f080d is described below
commit d4f080d6923df188dbb74a1910d8d44c5b305376
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Fri Apr 19 13:20:47 2019 +0200
SLING-8367 - Switch org.apache.sling.xss to use commons-lang 3
---
pom.xml | 29 +++++++++++++++++++++++++----
1 file changed, 25 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 79c6723..13f3348 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>30</version>
+ <version>34</version>
<relativePath />
</parent>
@@ -86,9 +86,10 @@
!org.apache.log4j.xml,
!org.w3c.dom.svg,
!org.apache.avalon.framework.logger,
+ !org.apache.commons.digester.*,
!org.apache.commons.jexl2,
!org.apache.commons.jxpath.*,
- !org.apache.commons.digester.*,
+ !org.apache.commons.lang.*,
!org.apache.commons.vfs2.*,
!org.apache.tools.ant.taskdefs,
!org.apache.xml.resolver.*,
@@ -167,6 +168,12 @@
<artifactId>esapi</artifactId>
<version>2.1.0.1</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -187,6 +194,14 @@
<artifactId>osgi.core</artifactId>
</dependency>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.cmpn</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.annotation.versioning</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
@@ -221,6 +236,12 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.6</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</dependency>
@@ -242,8 +263,8 @@
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.testing.sling-mock</artifactId>
- <version>2.2.18</version>
+ <artifactId>org.apache.sling.testing.sling-mock.junit4</artifactId>
+ <version>2.3.4</version>
<scope>test</scope>
</dependency>
</dependencies>