You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2017/08/10 16:30:16 UTC
[7/8] cxf git commit: Use commons-text since the escape stuff in
commons-lang is deprecated and no longer maintained
Use commons-text since the escape stuff in commons-lang is deprecated and no longer maintained
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/dd2ef496
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/dd2ef496
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/dd2ef496
Branch: refs/heads/master
Commit: dd2ef496df36ef8967b5274c0a5928f5594469be
Parents: f0797a5
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Aug 10 11:48:23 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Aug 10 11:48:23 2017 -0400
----------------------------------------------------------------------
osgi/karaf/features/src/main/resources/features.xml | 1 +
parent/pom.xml | 6 ++++++
tools/wsdlto/frontend/jaxws/pom.xml | 4 ++++
.../frontend/jaxws/customization/JAXWSBindingParser.java | 2 +-
4 files changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/dd2ef496/osgi/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml
index 5c55c09..01f9487 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -404,6 +404,7 @@
<feature version="${project.version}">cxf-jaxws</feature>
<feature version="${project.version}">cxf-javascript</feature>
<bundle start-level="35" dependency="true">mvn:org.apache.commons/commons-lang3/${cxf.commons-lang3.version}</bundle>
+ <bundle start-level="35" dependency="true">mvn:org.apache.commons/commons-text/${cxf.commons-text.version}</bundle>
<bundle dependency="true">wrap:mvn:org.apache.velocity/velocity-engine-core/${cxf.velocity.version}</bundle>
<bundle dependency="true">mvn:commons-collections/commons-collections/${cxf.commons-collections.version}</bundle>
<bundle>mvn:org.apache.cxf/cxf-tools-common/${project.version}</bundle>
http://git-wip-us.apache.org/repos/asf/cxf/blob/dd2ef496/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 5755f9d..f0c1e56 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -81,6 +81,7 @@
<cxf.commons-codec.version>1.10</cxf.commons-codec.version>
<cxf.commons-collections.version>3.2.2</cxf.commons-collections.version>
<cxf.commons-lang3.version>3.6</cxf.commons-lang3.version>
+ <cxf.commons-text.version>1.1</cxf.commons-text.version>
<cxf.derby.version>10.13.1.1</cxf.derby.version>
<cxf.dropwizard.version>3.2.0</cxf.dropwizard.version>
<cxf.ehcache.version>2.10.3</cxf.ehcache.version>
@@ -1714,6 +1715,11 @@
<version>${cxf.commons-lang3.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ <version>${cxf.commons-text.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<version>${cxf.bcprov.version}</version>
http://git-wip-us.apache.org/repos/asf/cxf/blob/dd2ef496/tools/wsdlto/frontend/jaxws/pom.xml
----------------------------------------------------------------------
diff --git a/tools/wsdlto/frontend/jaxws/pom.xml b/tools/wsdlto/frontend/jaxws/pom.xml
index 364d057..312950b 100644
--- a/tools/wsdlto/frontend/jaxws/pom.xml
+++ b/tools/wsdlto/frontend/jaxws/pom.xml
@@ -55,5 +55,9 @@
<artifactId>cxf-tools-wsdlto-core</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/cxf/blob/dd2ef496/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingParser.java
----------------------------------------------------------------------
diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingParser.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingParser.java
index aafe2a2..adb4421 100644
--- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingParser.java
+++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingParser.java
@@ -35,7 +35,7 @@ import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.text.StringEscapeUtils;
import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.StringUtils;