You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2019/08/16 17:18:35 UTC
[jspwiki] branch master updated: JSPWIKI-1115: migration from
commons-lang 2.6 to 3.9 + commons-text 1.7 (2/2)
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
The following commit(s) were added to refs/heads/master by this push:
new 849e9c2 JSPWIKI-1115: migration from commons-lang 2.6 to 3.9 + commons-text 1.7 (2/2)
849e9c2 is described below
commit 849e9c288243d08bced120641d72011fcf62e346
Author: juanpablo <ju...@apache.org>
AuthorDate: Fri Aug 16 19:18:02 2019 +0200
JSPWIKI-1115: migration from commons-lang 2.6 to 3.9 + commons-text 1.7 (2/2)
---
jspwiki-main/pom.xml | 15 ++++++++++-----
jspwiki-markdown/pom.xml | 5 +++++
jspwiki-util/pom.xml | 30 +++++++++++++++---------------
3 files changed, 30 insertions(+), 20 deletions(-)
diff --git a/jspwiki-main/pom.xml b/jspwiki-main/pom.xml
index 6c8d255..01169ff 100644
--- a/jspwiki-main/pom.xml
+++ b/jspwiki-main/pom.xml
@@ -129,11 +129,6 @@
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
-
- <dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
</dependency>
@@ -161,6 +156,16 @@
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>test</scope>
diff --git a/jspwiki-markdown/pom.xml b/jspwiki-markdown/pom.xml
index 0895e67..9d89b7e 100755
--- a/jspwiki-markdown/pom.xml
+++ b/jspwiki-markdown/pom.xml
@@ -67,6 +67,11 @@
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
diff --git a/jspwiki-util/pom.xml b/jspwiki-util/pom.xml
index b1b38a6..b30b9c9 100644
--- a/jspwiki-util/pom.xml
+++ b/jspwiki-util/pom.xml
@@ -31,11 +31,6 @@
<dependencies>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
-
- <dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
</dependency>
@@ -46,16 +41,6 @@
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jdom</groupId>
- <artifactId>jdom2</artifactId>
- </dependency>
-
- <dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
</dependency>
@@ -72,12 +57,27 @@
</dependency>
<dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>net.sourceforge.stripes</groupId>
<artifactId>stripes</artifactId>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jdom</groupId>
+ <artifactId>jdom2</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>