Skip to content

Commit

Permalink
Upgraded apache commons-lang dependency from 2.2 -> 3.4. Fixes #675.
Browse files Browse the repository at this point in the history
  • Loading branch information
@hirokiterashima
hirokiterashima committed Sep 19, 2016
1 parent f2c510d commit ae25f42
Show file tree
Hide file tree
Showing 17 changed files with 32 additions and 33 deletions.
2 changes: 1 addition & 1 deletion .idea/artifacts/wise_war_exploded.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__commons_lang_commons_lang_2_2.xml
View file

This file was deleted.

13 changes: 13 additions & 0 deletions .idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions pom.xml
View file
Expand Up @@ -400,9 +400,9 @@
<version>3.0.1</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.2</version>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.4</version>
</dependency>
<dependency>
<groupId>com.ibm.icu</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/wise/portal/dao/user/impl/HibernateUserDao.java
View file
Expand Up @@ -23,7 +23,7 @@
import java.util.List;
import java.util.Vector;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.dao.EmptyResultDataAccessException;
import org.springframework.dao.support.DataAccessUtils;
import org.springframework.security.core.userdetails.UserDetails;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/wise/portal/domain/project/impl/Projectcode.java
View file
Expand Up @@ -25,7 +25,7 @@

import java.io.Serializable;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;

/**
* A Projectcode is a <code>String</code> concatenation of:
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/wise/portal/presentation/validators/ChangePasswordParametersValidator.java
View file
Expand Up @@ -23,7 +23,7 @@
*/
package org.wise.portal.presentation.validators;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.dao.SystemWideSaltSource;
import org.springframework.security.authentication.encoding.Md5PasswordEncoder;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/wise/portal/presentation/validators/UserAccountFormValidator.java
View file
Expand Up @@ -23,7 +23,7 @@
*/
package org.wise.portal.presentation.validators;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.validation.Errors;
import org.springframework.validation.ValidationUtils;
import org.springframework.validation.Validator;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/wise/portal/presentation/validators/student/TeamSignInFormValidator.java
View file
Expand Up @@ -27,7 +27,7 @@
import java.util.List;
import java.util.Set;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.dao.SystemWideSaltSource;
import org.springframework.security.authentication.encoding.Md5PasswordEncoder;
Expand Down
1 change: 0 additions & 1 deletion ...a/org/wise/portal/presentation/web/controllers/forgotaccount/ResetPasswordController.java
View file
Expand Up @@ -29,7 +29,6 @@

import javax.servlet.http.HttpServletRequest;

import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.MessageSource;
import org.springframework.stereotype.Controller;
Expand Down
2 changes: 1 addition & 1 deletion .../presentation/web/controllers/forgotaccount/student/PasswordReminderWizardController.java
View file
Expand Up @@ -25,7 +25,7 @@

import javax.servlet.http.HttpServletResponse;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.EmptyResultDataAccessException;
import org.springframework.stereotype.Controller;
Expand Down
4 changes: 2 additions & 2 deletions ...esentation/web/controllers/forgotaccount/teacher/ForgotAccountTeacherIndexController.java
View file
Expand Up @@ -30,8 +30,8 @@

import javax.servlet.http.HttpServletRequest;

import org.apache.commons.lang.RandomStringUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.MessageSource;
import org.springframework.stereotype.Controller;
Expand Down
2 changes: 1 addition & 1 deletion ...n/java/org/wise/portal/presentation/web/controllers/teacher/TeacherAccountController.java
View file
Expand Up @@ -30,7 +30,7 @@
import javax.mail.MessagingException;
import javax.servlet.http.HttpServletRequest;

import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.MessageSource;
import org.springframework.stereotype.Controller;
Expand Down
4 changes: 2 additions & 2 deletions ...ortal/presentation/web/controllers/teacher/project/customized/ShareProjectController.java
View file
Expand Up @@ -37,8 +37,8 @@
import javax.mail.MessagingException;
import javax.servlet.http.HttpServletRequest;

import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.MessageSource;
import org.springframework.security.acls.domain.BasePermission;
Expand Down
2 changes: 1 addition & 1 deletion ...in/java/org/wise/portal/presentation/web/controllers/teacher/run/CreateRunController.java
View file
Expand Up @@ -40,7 +40,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.MessageSource;
import org.springframework.stereotype.Controller;
Expand Down
4 changes: 2 additions & 2 deletions ...a/org/wise/portal/presentation/web/controllers/teacher/run/ShareProjectRunController.java
View file
Expand Up @@ -37,8 +37,8 @@
import javax.mail.MessagingException;
import javax.servlet.http.HttpServletRequest;

import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.MessageSource;
import org.springframework.security.acls.domain.BasePermission;
Expand Down
2 changes: 1 addition & 1 deletion wise.iml
View file
Expand Up @@ -99,7 +99,7 @@
<orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.0.1" level="project" />
<orderEntry type="library" name="Maven: junit:junit:3.8.1" level="project" />
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.2" level="project" />
<orderEntry type="library" name="Maven: commons-lang:commons-lang:2.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.4" level="project" />
<orderEntry type="library" name="Maven: com.ibm.icu:icu4j:49.1" level="project" />
<orderEntry type="library" name="Maven: javax.mail:mail:1.4.7" level="project" />
<orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
Expand Down

0 comments on commit ae25f42

Please sign in to comment.