You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by fp...@apache.org on 2019/06/26 16:56:26 UTC
[shiro] branch master updated: SHIRO-710 - Update Commons Lang3 +
remove older Commons Lang
This is an automated email from the ASF dual-hosted git repository.
fpapon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shiro.git
The following commit(s) were added to refs/heads/master by this push:
new e7c0f91 SHIRO-710 - Update Commons Lang3 + remove older Commons Lang
new 21f584c Merge pull request #154 from coheigea/SHIRO-710
e7c0f91 is described below
commit e7c0f916c7575b635dffb3c375ef19f0b575d7c1
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Jun 25 10:38:04 2019 +0100
SHIRO-710 - Update Commons Lang3 + remove older Commons Lang
---
pom.xml | 10 +---------
samples/aspectj/pom.xml | 6 +++---
.../java/org/apache/shiro/samples/aspectj/bank/Account.java | 4 ++--
.../apache/shiro/samples/aspectj/bank/AccountTransaction.java | 4 ++--
4 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/pom.xml b/pom.xml
index 50bf3a9..bcaf10f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,10 +83,8 @@
<commons.cli.version>1.4</commons.cli.version>
<commons.codec.version>1.12</commons.codec.version>
<commons.configuration2.version>2.5</commons.configuration2.version>
- <commons.lang3.version>3.3.2</commons.lang3.version>
- <commons.lang.version>2.4</commons.lang.version>
+ <commons.lang3.version>3.9</commons.lang3.version>
<commons.logging.version>1.2</commons.logging.version>
- <crowd.version>1.5.2</crowd.version>
<!-- Don't change this version without also changing the shiro-ehcache and shiro-features
modules' OSGi metadata: -->
<ehcache.version>2.6.11</ehcache.version>
@@ -866,12 +864,6 @@
</dependency>
<dependency>
- <!-- Used for Atlassian Crowd Realm - not required for the framework: -->
- <groupId>com.atlassian.crowd</groupId>
- <artifactId>crowd-integration-client</artifactId>
- <version>${crowd.version}</version>
- </dependency>
- <dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logback.version}</version>
diff --git a/samples/aspectj/pom.xml b/samples/aspectj/pom.xml
index b99df82..e219ead 100644
--- a/samples/aspectj/pom.xml
+++ b/samples/aspectj/pom.xml
@@ -74,9 +74,9 @@
<artifactId>shiro-aspectj</artifactId>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons.lang.version}</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>${commons.lang3.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
diff --git a/samples/aspectj/src/main/java/org/apache/shiro/samples/aspectj/bank/Account.java b/samples/aspectj/src/main/java/org/apache/shiro/samples/aspectj/bank/Account.java
index 096d6b5..6c7bbfa 100644
--- a/samples/aspectj/src/main/java/org/apache/shiro/samples/aspectj/bank/Account.java
+++ b/samples/aspectj/src/main/java/org/apache/shiro/samples/aspectj/bank/Account.java
@@ -19,8 +19,8 @@
package org.apache.shiro.samples.aspectj.bank;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
import java.sql.Timestamp;
import java.util.ArrayList;
diff --git a/samples/aspectj/src/main/java/org/apache/shiro/samples/aspectj/bank/AccountTransaction.java b/samples/aspectj/src/main/java/org/apache/shiro/samples/aspectj/bank/AccountTransaction.java
index 2298519..4540bca 100644
--- a/samples/aspectj/src/main/java/org/apache/shiro/samples/aspectj/bank/AccountTransaction.java
+++ b/samples/aspectj/src/main/java/org/apache/shiro/samples/aspectj/bank/AccountTransaction.java
@@ -18,8 +18,8 @@
*/
package org.apache.shiro.samples.aspectj.bank;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
import java.sql.Timestamp;
import java.util.Date;