Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/ant/AbstractTask.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/ant/AbstractTask.java?rev=1758808&r1=1758807&r2=1758808&view=diff ============================================================================== --- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/ant/AbstractTask.java (original) +++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/ant/AbstractTask.java Thu Sep 1 16:27:51 2016 @@ -24,7 +24,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.lib.conf.Configuration; import org.apache.openjpa.lib.conf.ConfigurationImpl; import org.apache.openjpa.lib.conf.ConfigurationProvider;
Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ConfigurationImpl.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ConfigurationImpl.java?rev=1758808&r1=1758807&r2=1758808&view=diff ============================================================================== --- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ConfigurationImpl.java (original) +++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ConfigurationImpl.java Thu Sep 1 16:27:51 2016 @@ -55,7 +55,7 @@ import java.util.Set; import java.util.TreeMap; import java.util.TreeSet; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.lib.log.Log; import org.apache.openjpa.lib.log.LogFactory; import org.apache.openjpa.lib.log.LogFactoryImpl; Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Configurations.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Configurations.java?rev=1758808&r1=1758807&r2=1758808&view=diff ============================================================================== --- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Configurations.java (original) +++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Configurations.java Thu Sep 1 16:27:51 2016 @@ -30,14 +30,12 @@ import java.util.Map; import java.util.MissingResourceException; import java.util.Properties; import java.util.TreeSet; -import java.util.concurrent.ConcurrentHashMap; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.exception.NestableRuntimeException; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.lib.log.Log; import org.apache.openjpa.lib.util.J2DoPrivHelper; import org.apache.openjpa.lib.util.Localizer; @@ -246,7 +244,7 @@ public class Configurations { if (e instanceof PrivilegedActionException) { e = ((PrivilegedActionException) e).getException(); } - RuntimeException re = new NestableRuntimeException(_loc.get("obj-create", cls).getMessage(), e); + RuntimeException re = new RuntimeException(_loc.get("obj-create", cls).getMessage(), e); if (fatal) throw re; Log log = (conf == null) ? null : conf.getConfigurationLog(); @@ -651,7 +649,7 @@ public class Configurations { log.warn(_loc.get("jndi-lookup-failed", userKey, name)); return result; } catch (NamingException ne) { - throw new NestableRuntimeException( + throw new RuntimeException( _loc.get("naming-err", name).getMessage(), ne); } finally { if (ctx != null) { Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/DoubleValue.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/DoubleValue.java?rev=1758808&r1=1758807&r2=1758808&view=diff ============================================================================== --- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/DoubleValue.java (original) +++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/DoubleValue.java Thu Sep 1 16:27:51 2016 @@ -18,7 +18,7 @@ */ package org.apache.openjpa.lib.conf; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * A double {@link Value}. Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/FileValue.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/FileValue.java?rev=1758808&r1=1758807&r2=1758808&view=diff ============================================================================== --- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/FileValue.java (original) +++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/FileValue.java Thu Sep 1 16:27:51 2016 @@ -21,7 +21,7 @@ package org.apache.openjpa.lib.conf; import java.io.File; import java.security.AccessController; -import org.apache.commons.lang.ObjectUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.openjpa.lib.util.J2DoPrivHelper; /** Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/IntValue.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/IntValue.java?rev=1758808&r1=1758807&r2=1758808&view=diff ============================================================================== --- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/IntValue.java (original) +++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/IntValue.java Thu Sep 1 16:27:51 2016 @@ -18,7 +18,7 @@ */ package org.apache.openjpa.lib.conf; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * An int {@link Value}. Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ObjectValue.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ObjectValue.java?rev=1758808&r1=1758807&r2=1758808&view=diff ============================================================================== --- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ObjectValue.java (original) +++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ObjectValue.java Thu Sep 1 16:27:51 2016 @@ -20,7 +20,7 @@ package org.apache.openjpa.lib.conf; import java.security.AccessController; -import org.apache.commons.lang.ObjectUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.openjpa.lib.util.J2DoPrivHelper; import org.apache.openjpa.lib.util.Localizer; import org.apache.openjpa.lib.util.ReferenceMap; Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/PluginListValue.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/PluginListValue.java?rev=1758808&r1=1758807&r2=1758808&view=diff ============================================================================== --- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/PluginListValue.java (original) +++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/PluginListValue.java Thu Sep 1 16:27:51 2016 @@ -22,7 +22,7 @@ import java.lang.reflect.Array; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * A list of plugins. Defaults and aliases on plugin lists apply only Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/PluginValue.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/PluginValue.java?rev=1758808&r1=1758807&r2=1758808&view=diff ============================================================================== --- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/PluginValue.java (original) +++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/PluginValue.java Thu Sep 1 16:27:51 2016 @@ -18,7 +18,7 @@ */ package org.apache.openjpa.lib.conf; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.lib.log.Log; import org.apache.openjpa.lib.log.LogFactory; import org.apache.openjpa.lib.util.Localizer; Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ProductDerivations.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ProductDerivations.java?rev=1758808&r1=1758807&r2=1758808&view=diff ============================================================================== --- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ProductDerivations.java (original) +++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ProductDerivations.java Thu Sep 1 16:27:51 2016 @@ -32,7 +32,7 @@ import java.util.MissingResourceExceptio import java.util.Set; import java.util.TreeSet; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.lib.util.J2DoPrivHelper; import org.apache.openjpa.lib.util.Localizer; import org.apache.openjpa.lib.util.MultiClassLoader; Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/StringListValue.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/StringListValue.java?rev=1758808&r1=1758807&r2=1758808&view=diff ============================================================================== --- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/StringListValue.java (original) +++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/StringListValue.java Thu Sep 1 16:27:51 2016 @@ -21,7 +21,7 @@ package org.apache.openjpa.lib.conf; import java.util.Arrays; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.lib.util.Localizer; import org.apache.openjpa.lib.util.ParseException; Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/StringValue.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/StringValue.java?rev=1758808&r1=1758807&r2=1758808&view=diff ============================================================================== --- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/StringValue.java (original) +++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/StringValue.java Thu Sep 1 16:27:51 2016 @@ -18,7 +18,7 @@ */ package org.apache.openjpa.lib.conf; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * A string {@link Value}. Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Value.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Value.java?rev=1758808&r1=1758807&r2=1758808&view=diff ============================================================================== --- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Value.java (original) +++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Value.java Thu Sep 1 16:27:51 2016 @@ -26,7 +26,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.lib.util.Localizer; import org.apache.openjpa.lib.util.ParseException; Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierRule.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierRule.java?rev=1758808&r1=1758807&r2=1758808&view=diff ============================================================================== --- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierRule.java (original) +++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierRule.java Thu Sep 1 16:27:51 2016 @@ -21,7 +21,7 @@ package org.apache.openjpa.lib.identifie import java.util.HashSet; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * The standard identifier rule. Rules are used for specific configuration Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierUtilImpl.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierUtilImpl.java?rev=1758808&r1=1758807&r2=1758808&view=diff ============================================================================== --- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierUtilImpl.java (original) +++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierUtilImpl.java Thu Sep 1 16:27:51 2016 @@ -20,7 +20,7 @@ package org.apache.openjpa.lib.identifie import java.util.ArrayList; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.lib.conf.Configurable; import org.apache.openjpa.lib.conf.Configuration; import org.apache.openjpa.lib.util.Localizer; Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/CFMetaDataParser.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/CFMetaDataParser.java?rev=1758808&r1=1758807&r2=1758808&view=diff ============================================================================== --- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/CFMetaDataParser.java (original) +++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/CFMetaDataParser.java Thu Sep 1 16:27:51 2016 @@ -20,7 +20,7 @@ package org.apache.openjpa.lib.meta; import java.security.AccessController; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.lib.util.J2DoPrivHelper; import org.apache.openjpa.lib.util.Localizer; import org.xml.sax.Attributes; Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ClassArgParser.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ClassArgParser.java?rev=1758808&r1=1758807&r2=1758808&view=diff ============================================================================== --- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ClassArgParser.java (original) +++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ClassArgParser.java Thu Sep 1 16:27:51 2016 @@ -37,7 +37,6 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.commons.lang.exception.NestableRuntimeException; import org.apache.openjpa.lib.util.Files; import org.apache.openjpa.lib.util.J2DoPrivHelper; import org.apache.openjpa.lib.util.Localizer; @@ -222,7 +221,7 @@ public class ClassArgParser { return col.toArray(new String[col.size()]); } } catch (Exception e) { - throw new NestableRuntimeException( + throw new RuntimeException( _loc.get("class-arg", arg).getMessage(), e); } @@ -245,7 +244,7 @@ public class ClassArgParser { appendTypeNames(source, itr.getInputStream(), names); } } catch (Exception e) { - throw new NestableRuntimeException( + throw new RuntimeException( _loc.get("class-arg", source).getMessage(), e); } return names.toArray(new String[names.size()]); @@ -290,7 +289,7 @@ public class ClassArgParser { names.clear(); } } catch (Exception e) { - throw new NestableRuntimeException( + throw new RuntimeException( _loc.get("class-arg", source).getMessage(), e); } return map; Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/AbstractNonSequentialResultList.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/AbstractNonSequentialResultList.java?rev=1758808&r1=1758807&r2=1758808&view=diff ============================================================================== --- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/AbstractNonSequentialResultList.java (original) +++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/AbstractNonSequentialResultList.java Thu Sep 1 16:27:51 2016 @@ -26,7 +26,7 @@ import java.util.List; import java.util.ListIterator; import java.util.NoSuchElementException; -import org.apache.commons.lang.ObjectUtils; +import org.apache.commons.lang3.ObjectUtils; /** * Abstract base class for random-access result lists. Unlike the Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/AbstractSequentialResultList.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/AbstractSequentialResultList.java?rev=1758808&r1=1758807&r2=1758808&view=diff ============================================================================== --- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/AbstractSequentialResultList.java (original) +++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/AbstractSequentialResultList.java Thu Sep 1 16:27:51 2016 @@ -24,7 +24,7 @@ import java.util.Collection; import java.util.Iterator; import java.util.ListIterator; -import org.apache.commons.lang.ObjectUtils; +import org.apache.commons.lang3.ObjectUtils; /** * Abstract base class for sequential result lists. Unlike the Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/ListResultObjectProvider.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/ListResultObjectProvider.java?rev=1758808&r1=1758807&r2=1758808&view=diff ============================================================================== --- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/ListResultObjectProvider.java (original) +++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/ListResultObjectProvider.java Thu Sep 1 16:27:51 2016 @@ -20,7 +20,6 @@ package org.apache.openjpa.lib.rop; import java.util.List; -import org.apache.commons.lang.exception.NestableRuntimeException; import org.apache.openjpa.lib.util.Closeable; /** @@ -85,6 +84,6 @@ public class ListResultObjectProvider im public void handleCheckedException(Exception e) { // shouldn't ever happen - throw new NestableRuntimeException(e); + throw new RuntimeException(e); } } Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/MergedResultObjectProvider.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/MergedResultObjectProvider.java?rev=1758808&r1=1758807&r2=1758808&view=diff ============================================================================== --- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/MergedResultObjectProvider.java (original) +++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/rop/MergedResultObjectProvider.java Thu Sep 1 16:27:51 2016 @@ -20,7 +20,6 @@ package org.apache.openjpa.lib.rop; import java.util.Comparator; -import org.apache.commons.lang.exception.NestableRuntimeException; /** * A result object provider that merges multiple result object provider @@ -144,7 +143,7 @@ public class MergedResultObjectProvider public void handleCheckedException(Exception e) { if (_rops.length == 0) - throw new NestableRuntimeException(e); + throw new RuntimeException(e); _rops[0].handleCheckedException(e); } Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Files.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Files.java?rev=1758808&r1=1758807&r2=1758808&view=diff ============================================================================== --- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Files.java (original) +++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Files.java Thu Sep 1 16:27:51 2016 @@ -36,8 +36,7 @@ import java.net.URLDecoder; import java.security.AccessController; import java.security.PrivilegedActionException; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.exception.NestableRuntimeException; +import org.apache.commons.lang3.StringUtils; import serp.util.Strings; /** @@ -68,7 +67,7 @@ public class Files { try { copy(bk, file); } catch (IOException ioe) { - throw new NestableRuntimeException(ioe); + throw new RuntimeException(ioe); } } return bk; @@ -100,7 +99,7 @@ public class Files { try { copy(orig, backup); } catch (IOException ioe) { - throw new NestableRuntimeException(ioe); + throw new RuntimeException(ioe); } } return orig; @@ -168,10 +167,10 @@ public class Files { else file = new File(base, pkg); } catch (PrivilegedActionException pae) { - throw new NestableRuntimeException( + throw new RuntimeException( (IOException) pae.getException()); } catch (IOException ioe) { - throw new NestableRuntimeException(ioe); + throw new RuntimeException(ioe); } if (mkdirs && !(AccessController.doPrivileged( @@ -236,7 +235,7 @@ public class Files { try { return new FileWriter(getFile(file, loader)); } catch (IOException ioe) { - throw new NestableRuntimeException(ioe); + throw new RuntimeException(ioe); } } @@ -263,7 +262,7 @@ public class Files { else return new BufferedWriter(new OutputStreamWriter(getOutputStream(file, loader), enc)); } catch (IOException ioe) { - throw new NestableRuntimeException(ioe); + throw new RuntimeException(ioe); } } @@ -286,9 +285,9 @@ public class Files { J2DoPrivHelper.newFileOutputStreamAction( getFile(file, loader))); } catch (PrivilegedActionException pae) { - throw new NestableRuntimeException(pae.getException()); + throw new RuntimeException(pae.getException()); } catch (IOException ioe) { - throw new NestableRuntimeException(ioe); + throw new RuntimeException(ioe); } } Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Options.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Options.java?rev=1758808&r1=1758807&r2=1758808&view=diff ============================================================================== --- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Options.java (original) +++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Options.java Thu Sep 1 16:27:51 2016 @@ -32,7 +32,7 @@ import java.util.Map; import java.util.Properties; import java.util.TreeSet; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import serp.util.Strings; Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/ParseException.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/ParseException.java?rev=1758808&r1=1758807&r2=1758808&view=diff ============================================================================== --- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/ParseException.java (original) +++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/ParseException.java Thu Sep 1 16:27:51 2016 @@ -18,7 +18,6 @@ */ package org.apache.openjpa.lib.util; -import org.apache.commons.lang.exception.NestableRuntimeException; /** * Exception type for parse errors. @@ -26,7 +25,7 @@ import org.apache.commons.lang.exception * @author Abe White * @since 0.4.0 */ -public class ParseException extends NestableRuntimeException { +public class ParseException extends RuntimeException { public ParseException() { } Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/UUIDGenerator.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/UUIDGenerator.java?rev=1758808&r1=1758807&r2=1758808&view=diff ============================================================================== --- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/UUIDGenerator.java (original) +++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/UUIDGenerator.java Thu Sep 1 16:27:51 2016 @@ -24,7 +24,6 @@ import java.security.SecureRandom; import java.util.Random; import java.util.UUID; -import org.apache.commons.lang.exception.NestableRuntimeException; /** * UUID value generator. Type 1 generator is based on the time-based generator @@ -112,7 +111,7 @@ public class UUIDGenerator { try { ip = InetAddress.getLocalHost().getAddress(); } catch (IOException ioe) { - throw new NestableRuntimeException(ioe); + throw new RuntimeException(ioe); } IP = new byte[6]; Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/XMLFactory.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/XMLFactory.java?rev=1758808&r1=1758807&r2=1758808&view=diff ============================================================================== --- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/XMLFactory.java (original) +++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/xml/XMLFactory.java Thu Sep 1 16:27:51 2016 @@ -24,7 +24,6 @@ import javax.xml.parsers.ParserConfigura import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; -import org.apache.commons.lang.exception.NestableRuntimeException; import org.w3c.dom.Document; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; @@ -80,16 +79,16 @@ public class XMLFactory { sp = _saxFactories[factoryIndex(validating, namespaceAware)]. newSAXParser(); } catch (ParserConfigurationException pce) { - throw new NestableRuntimeException(pce); + throw new RuntimeException(pce); } catch (SAXException se) { - throw new NestableRuntimeException(se); + throw new RuntimeException(se); } if (validating) { try { sp.getXMLReader().setErrorHandler(_validating); } catch (SAXException se) { - throw new NestableRuntimeException(se); + throw new RuntimeException(se); } } @@ -106,7 +105,7 @@ public class XMLFactory { db = _domFactories[factoryIndex(validating, namespaceAware)]. newDocumentBuilder(); } catch (ParserConfigurationException pce) { - throw new NestableRuntimeException(pce); + throw new RuntimeException(pce); } if (validating) Modified: openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java?rev=1758808&r1=1758807&r2=1758808&view=diff ============================================================================== --- openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java (original) +++ openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java Thu Sep 1 16:27:51 2016 @@ -61,7 +61,7 @@ import javax.persistence.TableGenerator; import javax.persistence.Temporal; import javax.persistence.UniqueConstraint; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.identifier.DBIdentifier; import org.apache.openjpa.jdbc.identifier.QualifiedDBIdentifier; Modified: openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingSerializer.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingSerializer.java?rev=1758808&r1=1758807&r2=1758808&view=diff ============================================================================== --- openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingSerializer.java (original) +++ openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingSerializer.java Thu Sep 1 16:27:51 2016 @@ -44,7 +44,7 @@ import org.apache.openjpa.meta.FieldMeta import org.apache.openjpa.meta.JavaTypes; import org.apache.openjpa.meta.SequenceMetaData; import org.apache.openjpa.meta.MetaDataModes; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.util.List; import java.util.ArrayList; Modified: openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingParser.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingParser.java?rev=1758808&r1=1758807&r2=1758808&view=diff ============================================================================== --- openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingParser.java (original) +++ openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingParser.java Thu Sep 1 16:27:51 2016 @@ -33,7 +33,7 @@ import javax.persistence.EnumType; import javax.persistence.InheritanceType; import javax.persistence.TemporalType; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.identifier.DBIdentifier; import org.apache.openjpa.jdbc.identifier.QualifiedDBIdentifier; Modified: openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingSerializer.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingSerializer.java?rev=1758808&r1=1758807&r2=1758808&view=diff ============================================================================== --- openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingSerializer.java (original) +++ openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingSerializer.java Thu Sep 1 16:27:51 2016 @@ -28,7 +28,7 @@ import java.util.Map; import javax.persistence.EnumType; import javax.persistence.TemporalType; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.xml.sax.SAXException; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.meta.ClassMapping; Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/AbstractLobTest.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/AbstractLobTest.java?rev=1758808&r1=1758807&r2=1758808&view=diff ============================================================================== --- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/AbstractLobTest.java (original) +++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/AbstractLobTest.java Thu Sep 1 16:27:51 2016 @@ -27,7 +27,7 @@ import java.util.List; import javax.persistence.EntityManager; import javax.persistence.Query; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.datacache.DataCachePCData; import org.apache.openjpa.jdbc.sql.DB2Dictionary; Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestBeforeCommit.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestBeforeCommit.java?rev=1758808&r1=1758807&r2=1758808&view=diff ============================================================================== --- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestBeforeCommit.java (original) +++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestBeforeCommit.java Thu Sep 1 16:27:51 2016 @@ -22,7 +22,7 @@ import javax.persistence.EntityManager; import javax.persistence.EntityTransaction; import javax.persistence.Query; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.event.TransactionEvent; import org.apache.openjpa.event.TransactionListener; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/query/TestXMLCustomerOrder.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/query/TestXMLCustomerOrder.java?rev=1758808&r1=1758807&r2=1758808&view=diff ============================================================================== --- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/query/TestXMLCustomerOrder.java (original) +++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/query/TestXMLCustomerOrder.java Thu Sep 1 16:27:51 2016 @@ -26,7 +26,7 @@ import javax.persistence.Query; import junit.textui.TestRunner; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.sql.DBDictionary; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI; Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationBuilder.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationBuilder.java?rev=1758808&r1=1758807&r2=1758808&view=diff ============================================================================== --- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationBuilder.java (original) +++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationBuilder.java Thu Sep 1 16:27:51 2016 @@ -26,7 +26,7 @@ import java.util.Iterator; import java.util.EnumSet; import java.lang.annotation.Annotation; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Helper class to stringify annotation declarations. Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java?rev=1758808&r1=1758807&r2=1758808&view=diff ============================================================================== --- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java (original) +++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java Thu Sep 1 16:27:51 2016 @@ -140,7 +140,7 @@ import javax.persistence.SequenceGenerat import javax.persistence.StoredProcedureParameter; import javax.persistence.Version; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.event.BeanLifecycleCallbacks; import org.apache.openjpa.event.LifecycleCallbacks; Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataSerializer.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataSerializer.java?rev=1758808&r1=1758807&r2=1758808&view=diff ============================================================================== --- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataSerializer.java (original) +++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataSerializer.java Thu Sep 1 16:27:51 2016 @@ -66,7 +66,7 @@ import javax.persistence.SequenceGenerat import javax.persistence.Transient; import javax.persistence.Version; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.kernel.QueryLanguages; import org.apache.openjpa.lib.conf.Configurations; Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceXMLMetaDataParser.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceXMLMetaDataParser.java?rev=1758808&r1=1758807&r2=1758808&view=diff ============================================================================== --- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceXMLMetaDataParser.java (original) +++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceXMLMetaDataParser.java Thu Sep 1 16:27:51 2016 @@ -25,7 +25,7 @@ import java.lang.reflect.Member; import java.lang.reflect.Method; import java.security.AccessController; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.lib.log.Log; import org.apache.openjpa.lib.util.J2DoPrivHelper; Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerFactoryImpl.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerFactoryImpl.java?rev=1758808&r1=1758807&r2=1758808&view=diff ============================================================================== --- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerFactoryImpl.java (original) +++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerFactoryImpl.java Thu Sep 1 16:27:51 2016 @@ -28,7 +28,7 @@ import java.util.Set; import javax.persistence.*; import javax.persistence.spi.LoadState; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.kernel.AutoDetach; import org.apache.openjpa.kernel.Broker; Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java?rev=1758808&r1=1758807&r2=1758808&view=diff ============================================================================== --- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java (original) +++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java Thu Sep 1 16:27:51 2016 @@ -57,7 +57,7 @@ import javax.persistence.criteria.Criter import javax.persistence.criteria.ParameterExpression; import javax.persistence.metamodel.Metamodel; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.conf.Compatibility; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.ee.ManagedRuntime; Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/JPAProperties.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/JPAProperties.java?rev=1758808&r1=1758807&r2=1758808&view=diff ============================================================================== --- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/JPAProperties.java (original) +++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/JPAProperties.java Thu Sep 1 16:27:51 2016 @@ -24,7 +24,7 @@ import java.util.Map; import javax.persistence.CacheRetrieveMode; import javax.persistence.CacheStoreMode; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.kernel.DataCacheRetrieveMode; import org.apache.openjpa.kernel.DataCacheStoreMode; Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java?rev=1758808&r1=1758807&r2=1758808&view=diff ============================================================================== --- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java (original) +++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java Thu Sep 1 16:27:51 2016 @@ -41,7 +41,7 @@ import javax.persistence.ValidationMode; import javax.persistence.spi.PersistenceUnitInfo; import javax.persistence.spi.PersistenceUnitTransactionType; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.conf.Compatibility; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.conf.OpenJPAConfigurationImpl; Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java?rev=1758808&r1=1758807&r2=1758808&view=diff ============================================================================== --- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java (original) +++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java Thu Sep 1 16:27:51 2016 @@ -41,7 +41,7 @@ import javax.persistence.LockModeType; import static javax.persistence.CascadeType.*; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.enhance.PersistenceCapable; import org.apache.openjpa.event.BeanLifecycleCallbacks; Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataSerializer.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataSerializer.java?rev=1758808&r1=1758807&r2=1758808&view=diff ============================================================================== --- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataSerializer.java (original) +++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataSerializer.java Thu Sep 1 16:27:51 2016 @@ -33,7 +33,7 @@ import java.util.List; import java.util.Map; import java.util.Properties; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.kernel.QueryLanguages; import org.apache.openjpa.lib.conf.Configurations; Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/validation/ValidatorImpl.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/validation/ValidatorImpl.java?rev=1758808&r1=1758807&r2=1758808&view=diff ============================================================================== --- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/validation/ValidatorImpl.java (original) +++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/validation/ValidatorImpl.java Thu Sep 1 16:27:51 2016 @@ -30,7 +30,7 @@ import javax.validation.ConstraintViolat import javax.validation.Validator; import javax.validation.ValidatorFactory; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.event.LifecycleEvent; import org.apache.openjpa.lib.conf.Configuration; Modified: openjpa/trunk/openjpa-tools/openjpa-fetch-statistics/src/main/java/org/apache/openjpa/enhance/stats/FetchStatisticsAuxEnhancer.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-tools/openjpa-fetch-statistics/src/main/java/org/apache/openjpa/enhance/stats/FetchStatisticsAuxEnhancer.java?rev=1758808&r1=1758807&r2=1758808&view=diff ============================================================================== --- openjpa/trunk/openjpa-tools/openjpa-fetch-statistics/src/main/java/org/apache/openjpa/enhance/stats/FetchStatisticsAuxEnhancer.java (original) +++ openjpa/trunk/openjpa-tools/openjpa-fetch-statistics/src/main/java/org/apache/openjpa/enhance/stats/FetchStatisticsAuxEnhancer.java Thu Sep 1 16:27:51 2016 @@ -20,7 +20,7 @@ package org.apache.openjpa.enhance.stats import java.util.Locale; -import org.apache.commons.lang.WordUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.openjpa.conf.OpenJPAConfiguration; import org.apache.openjpa.enhance.PCEnhancer.AuxiliaryEnhancer; import org.apache.openjpa.lib.log.Log; @@ -92,7 +92,7 @@ public class FetchStatisticsAuxEnhancer fieldName = methName.substring(5); } else if (methName.toLowerCase(Locale.ENGLISH).startsWith("get")) { // property access - fieldName = WordUtils.uncapitalize(methName.substring(3)); + fieldName = StringUtils.uncapitalize(methName.substring(3)); } else if (methName.startsWith("pcis")) { fieldName = methName.substring(4).toLowerCase(Locale.ENGLISH); } Modified: openjpa/trunk/pom.xml URL: http://svn.apache.org/viewvc/openjpa/trunk/pom.xml?rev=1758808&r1=1758807&r2=1758808&view=diff ============================================================================== --- openjpa/trunk/pom.xml (original) +++ openjpa/trunk/pom.xml Thu Sep 1 16:27:51 2016 @@ -504,9 +504,9 @@ <version>1.2</version> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.6</version> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.4</version> </dependency> <dependency> <groupId>commons-collections</groupId>
