Repository: cxf-xjc-utils Updated Branches: refs/heads/master 7beda0637 -> ab0547101
CXFXJC-16 - Technical upgrade for cxf-xjc-ts Project: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/commit/ab054710 Tree: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/tree/ab054710 Diff: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/diff/ab054710 Branch: refs/heads/master Commit: ab0547101ea9430fa12d018db2150fb6eb8608f8 Parents: 7beda06 Author: Colm O hEigeartaigh <[email protected]> Authored: Tue Dec 6 12:02:21 2016 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Tue Dec 6 12:02:21 2016 +0000 ---------------------------------------------------------------------- bug671/pom.xml | 4 ++-- bug986/pom.xml | 4 ++-- pom.xml | 6 +++--- runtime/pom.xml | 4 ++-- .../java/org/apache/cxf/xjc/runtime/JAXBToStringBuilder.java | 4 ++-- .../java/org/apache/cxf/xjc/runtime/JAXBToStringStyle.java | 8 ++++---- .../apache/cxf/xjc/runtime/JAXBElementToStringStyleTest.java | 2 +- ts-test/pom.xml | 6 +++--- ts/pom.xml | 4 ++-- ts/src/main/java/org/apache/cxf/xjc/ts/ToStringPlugin.java | 4 ++-- wsdlextension-test/pom.xml | 4 ++-- wsdlextension/pom.xml | 4 ++-- 12 files changed, 27 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/ab054710/bug671/pom.xml ---------------------------------------------------------------------- diff --git a/bug671/pom.xml b/bug671/pom.xml index 71be9f2..69b5c1d 100644 --- a/bug671/pom.xml +++ b/bug671/pom.xml @@ -52,8 +52,8 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/ab054710/bug986/pom.xml ---------------------------------------------------------------------- diff --git a/bug986/pom.xml b/bug986/pom.xml index 987e6ab..1936194 100644 --- a/bug986/pom.xml +++ b/bug986/pom.xml @@ -52,8 +52,8 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/ab054710/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index cbf8277..cb4da08 100644 --- a/pom.xml +++ b/pom.xml @@ -131,9 +131,9 @@ <version>3.3.3</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.5</version> </dependency> <dependency> <groupId>wsdl4j</groupId> http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/ab054710/runtime/pom.xml ---------------------------------------------------------------------- diff --git a/runtime/pom.xml b/runtime/pom.xml index 5e48e86..bfc24a3 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -42,8 +42,8 @@ <dependencies> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> <optional>true</optional> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/ab054710/runtime/src/main/java/org/apache/cxf/xjc/runtime/JAXBToStringBuilder.java ---------------------------------------------------------------------- diff --git a/runtime/src/main/java/org/apache/cxf/xjc/runtime/JAXBToStringBuilder.java b/runtime/src/main/java/org/apache/cxf/xjc/runtime/JAXBToStringBuilder.java index 97e33f1..0918dd0 100644 --- a/runtime/src/main/java/org/apache/cxf/xjc/runtime/JAXBToStringBuilder.java +++ b/runtime/src/main/java/org/apache/cxf/xjc/runtime/JAXBToStringBuilder.java @@ -21,8 +21,8 @@ package org.apache.cxf.xjc.runtime; import java.util.Collection; -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; public final class JAXBToStringBuilder { private JAXBToStringBuilder() { http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/ab054710/runtime/src/main/java/org/apache/cxf/xjc/runtime/JAXBToStringStyle.java ---------------------------------------------------------------------- diff --git a/runtime/src/main/java/org/apache/cxf/xjc/runtime/JAXBToStringStyle.java b/runtime/src/main/java/org/apache/cxf/xjc/runtime/JAXBToStringStyle.java index 40972c7..f0cf677 100644 --- a/runtime/src/main/java/org/apache/cxf/xjc/runtime/JAXBToStringStyle.java +++ b/runtime/src/main/java/org/apache/cxf/xjc/runtime/JAXBToStringStyle.java @@ -21,9 +21,9 @@ package org.apache.cxf.xjc.runtime; import javax.xml.bind.JAXBElement; -import org.apache.commons.lang.SystemUtils; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; +import org.apache.commons.lang3.SystemUtils; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; /* * Override default styles to recognise JAXBElement as needing introspection @@ -72,7 +72,7 @@ class JAXBToStringStyleImpl extends ToStringStyle { * Introspect into JAXBElement as a special case as it does not have a * toString() and we loose the content * - * @see org.apache.commons.lang.builder.ToStringStyle + * @see org.apache.commons.lang3.builder.ToStringStyle */ @Override protected void appendDetail(StringBuffer buffer, String fieldName, Object value) { http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/ab054710/runtime/src/test/java/org/apache/cxf/xjc/runtime/JAXBElementToStringStyleTest.java ---------------------------------------------------------------------- diff --git a/runtime/src/test/java/org/apache/cxf/xjc/runtime/JAXBElementToStringStyleTest.java b/runtime/src/test/java/org/apache/cxf/xjc/runtime/JAXBElementToStringStyleTest.java index 3a0bc0d..71fda21 100644 --- a/runtime/src/test/java/org/apache/cxf/xjc/runtime/JAXBElementToStringStyleTest.java +++ b/runtime/src/test/java/org/apache/cxf/xjc/runtime/JAXBElementToStringStyleTest.java @@ -23,7 +23,7 @@ package org.apache.cxf.xjc.runtime; import javax.xml.bind.JAXBElement; import javax.xml.namespace.QName; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.junit.Assert; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/ab054710/ts-test/pom.xml ---------------------------------------------------------------------- diff --git a/ts-test/pom.xml b/ts-test/pom.xml index c586fe0..368cb36 100644 --- a/ts-test/pom.xml +++ b/ts-test/pom.xml @@ -54,8 +54,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> </dependencies> @@ -79,7 +79,7 @@ <extension>true</extension> <xsd>${basedir}/src/test/resources/schemas/configuration/foo.xsd</xsd> <extensionArgs> - <arg>-Xts:style:org.apache.commons.lang.builder.ToStringStyle.DEFAULT_STYLE</arg> + <arg>-Xts:style:org.apache.commons.lang3.builder.ToStringStyle.DEFAULT_STYLE</arg> </extensionArgs> </xsdOption> </xsdOptions> http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/ab054710/ts/pom.xml ---------------------------------------------------------------------- diff --git a/ts/pom.xml b/ts/pom.xml index 6026c78..4274e22 100644 --- a/ts/pom.xml +++ b/ts/pom.xml @@ -47,8 +47,8 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/ab054710/ts/src/main/java/org/apache/cxf/xjc/ts/ToStringPlugin.java ---------------------------------------------------------------------- diff --git a/ts/src/main/java/org/apache/cxf/xjc/ts/ToStringPlugin.java b/ts/src/main/java/org/apache/cxf/xjc/ts/ToStringPlugin.java index 074e00f..8ea2379 100644 --- a/ts/src/main/java/org/apache/cxf/xjc/ts/ToStringPlugin.java +++ b/ts/src/main/java/org/apache/cxf/xjc/ts/ToStringPlugin.java @@ -63,7 +63,7 @@ public class ToStringPlugin { + " -Xts:style:simple : Have toString produce single line terse output\n" + " equivalent to: " + "-Xts:style:org.apache.cxf.xjc.runtime.JAXBToStringStyle.SIMPLE_STYLE\n" - + " -Xts:style:org.apache.commons.lang.builder.ToStringStyle.FIELD : The full class+field\n" + + " -Xts:style:org.apache.commons.lang3.builder.ToStringStyle.FIELD : The full class+field\n" + " name of the ToStringStyle to use."; } @@ -100,7 +100,7 @@ public class ToStringPlugin { } final JClass toStringDelegateImpl = outline.getCodeModel() - .ref("org.apache.commons.lang.builder.ToStringBuilder"); + .ref("org.apache.commons.lang3.builder.ToStringBuilder"); final JClass styleClass = outline.getCodeModel().ref(styleClassName); final JFieldRef toStringDelegateStyleParam = styleClass.staticRef(styleFieldName); http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/ab054710/wsdlextension-test/pom.xml ---------------------------------------------------------------------- diff --git a/wsdlextension-test/pom.xml b/wsdlextension-test/pom.xml index 24d1f6d..f2bb384 100644 --- a/wsdlextension-test/pom.xml +++ b/wsdlextension-test/pom.xml @@ -54,8 +54,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> <dependency> <groupId>wsdl4j</groupId> http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/ab054710/wsdlextension/pom.xml ---------------------------------------------------------------------- diff --git a/wsdlextension/pom.xml b/wsdlextension/pom.xml index 4054698..2e40734 100644 --- a/wsdlextension/pom.xml +++ b/wsdlextension/pom.xml @@ -47,8 +47,8 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> <dependency> <groupId>wsdl4j</groupId>
