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:14:06 UTC

[jspwiki] 02/02: 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

commit 206a4f1d21f5cd31809cd962c5bf9bba7c871de4
Author: juanpablo <ju...@apache.org>
AuthorDate: Fri Aug 16 19:13:29 2019 +0200

    JSPWIKI-1115: migration from commons-lang 2.6 to 3.9 + commons-text 1.7 (2/2)
---
 ChangeLog |  4 +++-
 pom.xml   | 13 ++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index af330ea..6fa1754 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,7 +6,9 @@
 
        * replaced all deprecated code
 
-       * [JSPWIKI-1115]: Upgrade SLF4J to 1.7.28
+       * [JSPWIKI-1115]: Upgrade SLF4J to 1.7.28 and commons-lang from 2.6 to 3.9
+         * dev-only breaking change: if you were using commons-lang transitively on your extension,
+           you must declare it explicitly or migrate it to commons-lang 3
 
 2019-08-06  Juan Pablo Santos (juanpablo AT apache DOT org)
 
diff --git a/pom.xml b/pom.xml
index 0b11c60..04910ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,8 @@
     <commons-fileupload.version>1.4</commons-fileupload.version>
     <commons-httpclient.version>3.1</commons-httpclient.version>
     <commons-io.version>2.6</commons-io.version>
-    <commons-lang.version>2.6</commons-lang.version>
+    <commons-lang.version>3.9</commons-lang.version>
+    <commons-text.version>1.7</commons-text.version>
     <ehcache.version>2.10.6</ehcache.version>
     <flexmark.version>0.50.26</flexmark.version>
     <freshcookies-security.version>0.60</freshcookies-security.version>
@@ -177,12 +178,18 @@
       </dependency>
 
       <dependency>
-        <groupId>commons-lang</groupId>
-        <artifactId>commons-lang</artifactId>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-lang3</artifactId>
         <version>${commons-lang.version}</version>
       </dependency>
 
       <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-text</artifactId>
+        <version>${commons-text.version}</version>
+      </dependency>
+
+      <dependency>
         <groupId>javax.mail</groupId>
         <artifactId>mail</artifactId>
         <version>${javax-mail.version}</version>