Migrate from commons-lang2 to commons-lang3

errai · May 20, 2015 · 3b62058 · 3b62058
1 parent bcb14d6
commit 3b62058
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 26 deletions.
diff --git a/errai-bom/pom.xml b/errai-bom/pom.xml
@@ -34,8 +34,7 @@
   <!-- Keep versions property names in alphabetical order, please -->
   <!-- Try to use version properties already definied in jboss-integration-platform-parent 
   instead of defining a new ones -->
-  <properties>
-    <apache.commons.lang.version>3.2.1</apache.commons.lang.version>
+  <properties>    
     <apache.geronimo.spec.1.1.interceptor.version>1.0</apache.geronimo.spec.1.1.interceptor.version>
     <apache.httpcomponents.httpcore.version>4.2.1</apache.httpcomponents.httpcore.version>
     <apache.maven.artifact.version>3.0.5</apache.maven.artifact.version>
@@ -153,7 +152,7 @@
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-lang3</artifactId>
-        <version>${apache.commons.lang.version}</version>
+        <version>${version.org.apache.commons.lang3}</version>
       </dependency>
 
       <dependency>
@@ -586,12 +585,6 @@
         <version>${version.commons-io}</version>
       </dependency>
 
-      <dependency>
-        <groupId>commons-lang</groupId>
-        <artifactId>commons-lang</artifactId>
-        <version>${version.commons-lang}</version>
-      </dependency>
-
       <dependency>
         <groupId>commons-logging</groupId>
         <artifactId>commons-logging</artifactId>

diff --git a/errai-bus-websocket/errai-bus-jsr356-websocket-weld/pom.xml b/errai-bus-websocket/errai-bus-jsr356-websocket-weld/pom.xml
@@ -105,10 +105,6 @@
       <type>zip</type>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-    </dependency>
   </dependencies>
 
   <build>

diff --git a/...java/org/jboss/errai/bus/server/websocket/jsr356/weld/conversation/ConversationState.java b/...java/org/jboss/errai/bus/server/websocket/jsr356/weld/conversation/ConversationState.java
@@ -1,6 +1,6 @@
 package org.jboss.errai.bus.server.websocket.jsr356.weld.conversation;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 
 /**

diff --git a/.../org/jboss/errai/bus/server/websocket/jsr356/configuration/ErraiEndpointConfigurator.java b/.../org/jboss/errai/bus/server/websocket/jsr356/configuration/ErraiEndpointConfigurator.java
@@ -1,6 +1,6 @@
 package org.jboss.errai.bus.server.websocket.jsr356.configuration;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jboss.errai.bus.server.websocket.jsr356.filter.FilterLookup;
 
 import javax.servlet.http.HttpSession;

diff --git a/errai-bus/src/main/java/org/jboss/errai/bus/server/io/websockets/ssl/SslHandlerFactory.java b/errai-bus/src/main/java/org/jboss/errai/bus/server/io/websockets/ssl/SslHandlerFactory.java
@@ -8,7 +8,7 @@
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jboss.errai.bus.server.service.ErraiConfigAttribs;
 import org.jboss.errai.bus.server.service.ErraiServiceConfigurator;
 import org.slf4j.Logger;

diff --git a/errai-common/pom.xml b/errai-common/pom.xml
@@ -80,8 +80,8 @@
     </dependency>
 
     <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
     </dependency>
 
   </dependencies>

diff --git a/errai-common/src/main/java/org/jboss/errai/common/metadata/RebindUtils.java b/errai-common/src/main/java/org/jboss/errai/common/metadata/RebindUtils.java
@@ -31,7 +31,7 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;

diff --git a/...axrs/errai-jaxrs-client/src/main/java/org/jboss/errai/enterprise/rebind/JaxrsHeaders.java b/...axrs/errai-jaxrs-client/src/main/java/org/jboss/errai/enterprise/rebind/JaxrsHeaders.java
@@ -23,7 +23,7 @@
 import javax.ws.rs.Consumes;
 import javax.ws.rs.Produces;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jboss.errai.codegen.meta.MetaClass;
 import org.jboss.errai.codegen.meta.MetaMethod;
 

diff --git a/errai-marshalling/src/main/java/org/jboss/errai/marshalling/rebind/MarshallerGenerator.java b/errai-marshalling/src/main/java/org/jboss/errai/marshalling/rebind/MarshallerGenerator.java
@@ -21,7 +21,7 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jboss.errai.codegen.builder.ClassStructureBuilder;
 import org.jboss.errai.codegen.meta.MetaClass;
 import org.jboss.errai.codegen.meta.MetaClassFactory;

diff --git a/...marshalling/src/main/java/org/jboss/errai/marshalling/rebind/util/MarshallingGenUtil.java b/...marshalling/src/main/java/org/jboss/errai/marshalling/rebind/util/MarshallingGenUtil.java
@@ -25,7 +25,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jboss.errai.codegen.Statement;
 import org.jboss.errai.codegen.builder.BlockBuilder;
 import org.jboss.errai.codegen.builder.ClassStructureBuilder;

diff --git a/errai-navigation/src/main/java/org/jboss/errai/ui/nav/rebind/NavigationGraphGenerator.java b/errai-navigation/src/main/java/org/jboss/errai/ui/nav/rebind/NavigationGraphGenerator.java
@@ -16,7 +16,7 @@
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Singleton;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jboss.errai.codegen.Modifier;
 import org.jboss.errai.codegen.Parameter;
 import org.jboss.errai.codegen.Statement;

diff --git a/errai-ui/src/main/java/org/jboss/errai/ui/rebind/chain/SelectorReplacer.java b/errai-ui/src/main/java/org/jboss/errai/ui/rebind/chain/SelectorReplacer.java
@@ -5,7 +5,7 @@
 
 import java.util.Map;
 
-import static org.apache.commons.lang.StringUtils.isNotEmpty;
+import static org.apache.commons.lang3.StringUtils.isNotEmpty;
 
 /**
  * @author edewit@redhat.com

diff --git a/errai-ui/src/main/java/org/jboss/errai/ui/rebind/chain/TemplateChain.java b/errai-ui/src/main/java/org/jboss/errai/ui/rebind/chain/TemplateChain.java
@@ -14,7 +14,7 @@
 
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jboss.errai.codegen.exception.GenerationException;
 import org.jboss.errai.ui.shared.chain.Command;
 import org.w3c.dom.Document;

diff --git a/errai-ui/src/test/java/org/jboss/errai/ui/rebind/less/SelectorMinifyVisitorTest.java b/errai-ui/src/test/java/org/jboss/errai/ui/rebind/less/SelectorMinifyVisitorTest.java
@@ -6,7 +6,7 @@
 import com.google.gwt.resources.css.CssGenerationVisitor;
 import com.google.gwt.resources.css.GenerateCssAst;
 import com.google.gwt.resources.css.ast.CssStylesheet;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.junit.Test;
 
 import java.net.URISyntaxException;