You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@directory.apache.org by GitBox <gi...@apache.org> on 2018/11/15 16:22:10 UTC
[GitHub] elecharny closed pull request #3: [DIRAPI-324] commons-lang and
commons-collections are updated
elecharny closed pull request #3: [DIRAPI-324] commons-lang and commons-collections are updated
URL: https://github.com/apache/directory-ldap-api/pull/3
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/distribution/pom.xml b/distribution/pom.xml
index ed2e9df7e..581bf529c 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -81,8 +81,8 @@
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
</dependency>
<dependency>
@@ -139,8 +139,8 @@
</artifactItem>
<artifactItem>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
</artifactItem>
<artifactItem>
diff --git a/distribution/src/main/assembly/anon.xml b/distribution/src/main/assembly/anon.xml
index 17ef68d36..5bb1ca7d6 100644
--- a/distribution/src/main/assembly/anon.xml
+++ b/distribution/src/main/assembly/anon.xml
@@ -42,7 +42,7 @@
<!-- The external dependencies -->
<include>antlr:antlr:jar:${antlr.version}</include>
- <include>commons-collections:commons-collections:jar:${commons.collections.version}</include>
+ <include>org.apache.commons:commons-collections4:jar:${commons.collections.version}</include>
<include>log4j:log4j:jar:${log4j.version}</include>
<include>org.slf4j:slf4j-api:jar:${slf4j.api.version}</include>
<include>org.slf4j:slf4j-log4j12:jar:${slf4j.log4j12.version}</include>
diff --git a/ldap/codec/core/pom.xml b/ldap/codec/core/pom.xml
index 7a64fbba1..8345d8c1e 100644
--- a/ldap/codec/core/pom.xml
+++ b/ldap/codec/core/pom.xml
@@ -68,13 +68,13 @@
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
</dependency>
<dependency>
diff --git a/ldap/extras/sp/pom.xml b/ldap/extras/sp/pom.xml
index c26650359..5607cd727 100644
--- a/ldap/extras/sp/pom.xml
+++ b/ldap/extras/sp/pom.xml
@@ -63,8 +63,8 @@
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
</dependencies>
@@ -83,7 +83,7 @@
org.apache.directory.api.ldap.sp;version=${project.version};-noimport:=true
</Export-Package>
<Import-Package>
- org.apache.commons.lang;version=${commons.lang.version},
+ org.apache.commons.lang3;version=${commons.lang.version},
org.apache.directory.api.ldap.codec.api;version=${project.version},
org.apache.directory.api.ldap.extras.extended.storedProcedure;version=${project.version},
org.apache.directory.api.ldap.model.constants;version=${project.version},
diff --git a/ldap/extras/sp/src/main/java/org/apache/directory/api/ldap/sp/JavaStoredProcUtils.java b/ldap/extras/sp/src/main/java/org/apache/directory/api/ldap/sp/JavaStoredProcUtils.java
index 02c63987c..9171115d8 100644
--- a/ldap/extras/sp/src/main/java/org/apache/directory/api/ldap/sp/JavaStoredProcUtils.java
+++ b/ldap/extras/sp/src/main/java/org/apache/directory/api/ldap/sp/JavaStoredProcUtils.java
@@ -36,7 +36,7 @@
import javax.naming.ldap.ExtendedResponse;
import javax.naming.ldap.LdapContext;
-import org.apache.commons.lang.SerializationUtils;
+import org.apache.commons.lang3.SerializationUtils;
import org.apache.directory.api.ldap.codec.api.LdapApiServiceFactory;
import org.apache.directory.api.ldap.extras.extended.storedProcedure.StoredProcedureRequestImpl;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
diff --git a/ldap/extras/trigger/pom.xml b/ldap/extras/trigger/pom.xml
index 11321f7a8..e1d3f9c92 100644
--- a/ldap/extras/trigger/pom.xml
+++ b/ldap/extras/trigger/pom.xml
@@ -67,8 +67,8 @@
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
</dependencies>
@@ -104,7 +104,7 @@
<Import-Package>
antlr;version=${antlr.version},
antlr.collections.impl;version=${antlr.version},
- org.apache.commons.lang;version=${commons.lang.version},
+ org.apache.commons.lang3;version=${commons.lang.version},
org.apache.directory.api.i18n;version=${project.version},
org.apache.directory.api.util;version=${project.version},
org.apache.directory.api.ldap.model.constants;version=${project.version},
diff --git a/ldap/extras/trigger/src/main/java/org/apache/directory/api/ldap/trigger/TriggerSpecification.java b/ldap/extras/trigger/src/main/java/org/apache/directory/api/ldap/trigger/TriggerSpecification.java
index bf0928ed1..eea7354f8 100644
--- a/ldap/extras/trigger/src/main/java/org/apache/directory/api/ldap/trigger/TriggerSpecification.java
+++ b/ldap/extras/trigger/src/main/java/org/apache/directory/api/ldap/trigger/TriggerSpecification.java
@@ -23,7 +23,6 @@
import java.util.List;
-import org.apache.commons.lang.NullArgumentException;
import org.apache.directory.api.i18n.I18n;
@@ -55,7 +54,7 @@ public TriggerSpecification( LdapOperation ldapOperation, ActionTime actionTime,
if ( ( ldapOperation == null ) || ( actionTime == null ) || ( spSpecs == null ) )
{
- throw new NullArgumentException( I18n.err( I18n.ERR_11000_TRIGGER_SPECIFICATION_INIT_WITH_NULL ) );
+ throw new NullPointerException( I18n.err( I18n.ERR_11000_TRIGGER_SPECIFICATION_INIT_WITH_NULL ) );
}
if ( spSpecs.isEmpty() )
diff --git a/ldap/model/pom.xml b/ldap/model/pom.xml
index 6cd757429..473568b57 100644
--- a/ldap/model/pom.xml
+++ b/ldap/model/pom.xml
@@ -77,13 +77,13 @@
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
</dependency>
<dependency>
@@ -181,11 +181,11 @@
antlr;version=${antlr.version},
antlr.collections.impl;version=${antlr.version},
org.apache.commons.codec.digest;version=${commons.codec.version},
- org.apache.commons.collections;version=${commons.collections.version},
- org.apache.commons.collections.list;version=${commons.collections.version},
- org.apache.commons.collections.map;version=${commons.collections.version},
- org.apache.commons.lang;version=${commons.lang.version},
- org.apache.commons.lang.exception;version=${commons.lang.version},
+ org.apache.commons.collections4;version=${commons.collections.version},
+ org.apache.commons.collections4.list;version=${commons.collections.version},
+ org.apache.commons.collections4.map;version=${commons.collections.version},
+ org.apache.commons.lang3;version=${commons.lang.version},
+ org.apache.commons.lang3.exception;version=${commons.lang.version},
org.apache.directory.api.asn1;version=${project.version},
org.apache.directory.api.asn1.util;version=${project.version},
org.apache.directory.api.i18n;version=${project.version},
diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/BranchNode.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/BranchNode.java
index 96a58663d..e9a0b5d95 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/BranchNode.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/filter/BranchNode.java
@@ -23,7 +23,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
/**
diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/Dn.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/Dn.java
index c5a0f8a55..b11445e31 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/Dn.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/Dn.java
@@ -29,7 +29,7 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.commons.collections.list.UnmodifiableList;
+import org.apache.commons.collections4.list.UnmodifiableList;
import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.model.exception.LdapInvalidDnException;
import org.apache.directory.api.ldap.model.message.ResultCodeEnum;
@@ -724,10 +724,9 @@ public Rdn getRdn()
*
* @return All the components
*/
- @SuppressWarnings("unchecked")
public List<Rdn> getRdns()
{
- return UnmodifiableList.decorate( rdns );
+ return UnmodifiableList.unmodifiableList( rdns );
}
diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/OidRegistry.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/OidRegistry.java
index e3e416a88..073bac708 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/OidRegistry.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/OidRegistry.java
@@ -26,7 +26,7 @@
import java.util.List;
import java.util.Map;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
import org.apache.directory.api.asn1.util.Oid;
import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.model.exception.LdapException;
diff --git a/ldap/schema/converter/pom.xml b/ldap/schema/converter/pom.xml
index a44d2d306..7c9699318 100644
--- a/ldap/schema/converter/pom.xml
+++ b/ldap/schema/converter/pom.xml
@@ -38,8 +38,8 @@
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
diff --git a/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/SchemaParser.java b/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/SchemaParser.java
index e5ee22a85..c5e29ff97 100755
--- a/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/SchemaParser.java
+++ b/ldap/schema/converter/src/main/java/org/apache/directory/api/ldap/schema/converter/SchemaParser.java
@@ -31,7 +31,7 @@
import java.text.ParseException;
import java.util.List;
-import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.util.Strings;
@@ -143,13 +143,13 @@ public synchronized void clear()
}
catch ( RecognitionException re )
{
- String msg = I18n.err( I18n.ERR_15003_PARSER_FAILURE, schemaName, ExceptionUtils.getFullStackTrace( re ) );
+ String msg = I18n.err( I18n.ERR_15003_PARSER_FAILURE, schemaName, ExceptionUtils.getStackTrace( re ) );
init();
throw new ParseException( msg, re.getColumn() );
}
catch ( TokenStreamException tse )
{
- String msg = I18n.err( I18n.ERR_15003_PARSER_FAILURE, schemaName, ExceptionUtils.getFullStackTrace( tse ) );
+ String msg = I18n.err( I18n.ERR_15003_PARSER_FAILURE, schemaName, ExceptionUtils.getStackTrace( tse ) );
init();
throw new ParseException( msg, 0 );
}
diff --git a/pom.xml b/pom.xml
index 32d80a686..51bec2214 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,8 +46,8 @@
<!-- Set versions for depending jars -->
<antlr.version>2.7.7</antlr.version>
<commons.codec.version>1.11</commons.codec.version>
- <commons.collections.version>3.2.2</commons.collections.version>
- <commons.lang.version>2.6</commons.lang.version>
+ <commons.collections.version>4.2</commons.collections.version>
+ <commons.lang.version>3.8.1</commons.lang.version>
<commons.pool.version>2.6.0</commons.pool.version>
<dom4j.version>1.6.1</dom4j.version>
<forbiddenapis.version>2.5</forbiddenapis.version>
@@ -474,14 +474,14 @@
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
<version>${commons.collections.version}</version>
</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>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services