Repository: cxf Updated Branches: refs/heads/master 7d344ae7e -> 6918eba1a
Updating CXF (master only) to use Commons Lang 3 Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6918eba1 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6918eba1 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6918eba1 Branch: refs/heads/master Commit: 6918eba1a3229cece97dd90127804b094d82a345 Parents: 7d344ae Author: Colm O hEigeartaigh <[email protected]> Authored: Tue Dec 6 11:25:10 2016 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Tue Dec 6 11:25:24 2016 +0000 ---------------------------------------------------------------------- distribution/javadoc/pom.xml | 4 ++-- .../release/samples/jax_rs/description_swagger/pom.xml | 4 ++-- .../src/main/java/demo/jaxrs/swagger/server/Server.java | 2 +- .../src/main/java/demo/jaxrs/swagger/server/Sample.java | 4 ++-- .../src/main/release/samples/jax_rs/search/pom.xml | 4 ++-- .../src/main/java/demo/jaxrs/search/server/Server.java | 2 +- .../main/release/samples/jax_rs/tracing_htrace/pom.xml | 4 ---- distribution/src/main/release/samples/ws_eventing/pom.xml | 5 ++--- .../java/demo/wseventing/CreateSubscriptionServlet.java | 4 ++-- .../release/samples/ws_eventing/src/main/webapp/index.jsp | 6 +++--- osgi/bundle/compatible/pom.xml | 2 +- osgi/karaf/features/src/main/resources/features.xml | 6 +++--- parent/pom.xml | 10 ++++------ rt/management-web/pom.xml | 4 ++-- .../web/browser/bootstrapping/BootstrapStorage.java | 2 +- .../browser/bootstrapping/SimpleXMLSettingsStorage.java | 2 +- .../org/apache/cxf/management/web/logging/LogRecord.java | 10 +++++----- .../org/apache/cxf/management/web/logging/LogRecords.java | 10 +++++----- .../cxf/management/web/logging/atom/AbstractAtomBean.java | 2 +- .../cxf/management/web/logging/atom/AtomPushBean.java | 2 +- .../cxf/management/web/logging/atom/AtomPushEngine.java | 2 +- .../web/logging/atom/AtomPushOverWebSocketServer.java | 2 +- .../web/logging/atom/converter/StandardConverter.java | 2 +- .../web/logging/atom/deliverer/RetryingDeliverer.java | 2 +- .../web/logging/atom/deliverer/WebClientDeliverer.java | 2 +- rt/transports/jms/pom.xml | 4 ---- systests/rs-sse/pom.xml | 4 ++-- .../test/java/org/apache/cxf/systest/jaxrs/sse/Book.java | 4 ++-- 28 files changed, 50 insertions(+), 61 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/6918eba1/distribution/javadoc/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/javadoc/pom.xml b/distribution/javadoc/pom.xml index 258bb7f..3430354 100644 --- a/distribution/javadoc/pom.xml +++ b/distribution/javadoc/pom.xml @@ -240,8 +240,8 @@ <artifactId>geronimo-jms_1.1_spec</artifactId> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> http://git-wip-us.apache.org/repos/asf/cxf/blob/6918eba1/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml b/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml index 53d0855..ddc214e 100644 --- a/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml @@ -144,8 +144,8 @@ <version>3.2.0-SNAPSHOT</version> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> <dependency> <groupId>commons-httpclient</groupId> http://git-wip-us.apache.org/repos/asf/cxf/blob/6918eba1/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Server.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Server.java b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Server.java index 85d7eb9..491fd43 100644 --- a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Server.java +++ b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Server.java @@ -21,7 +21,7 @@ package demo.jaxrs.swagger.server; import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.cxf.jaxrs.provider.MultipartProvider; import org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet; import org.apache.cxf.jaxrs.swagger.SwaggerFeature; http://git-wip-us.apache.org/repos/asf/cxf/blob/6918eba1/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Sample.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Sample.java b/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Sample.java index f3c1765..7acd7b7 100644 --- a/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Sample.java +++ b/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Sample.java @@ -61,8 +61,8 @@ public class Sample { @Produces({ MediaType.APPLICATION_JSON }) @GET @ApiOperation( - value = "Get operation with Response and @Default value", - notes = "Get operation with Response and @Default value", + value = "Get operation with Response and @Default value <script>alert(\"TEST\");</script>", + notes = "Get operation with Response and @Default value <script>alert(\"TEST\");</script>", response = Item.class, responseContainer = "List" ) http://git-wip-us.apache.org/repos/asf/cxf/blob/6918eba1/distribution/src/main/release/samples/jax_rs/search/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/search/pom.xml b/distribution/src/main/release/samples/jax_rs/search/pom.xml index 7d8900d..d0285b2 100644 --- a/distribution/src/main/release/samples/jax_rs/search/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/search/pom.xml @@ -147,8 +147,8 @@ <version>2.0-SNAPSHOT</version> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> <dependency> <groupId>commons-httpclient</groupId> http://git-wip-us.apache.org/repos/asf/cxf/blob/6918eba1/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Server.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Server.java b/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Server.java index f0ce84e..cdab6db 100644 --- a/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Server.java +++ b/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Server.java @@ -19,7 +19,7 @@ package demo.jaxrs.search.server; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.cxf.jaxrs.ext.search.SearchContextProvider; import org.apache.cxf.jaxrs.ext.search.SearchUtils; import org.apache.cxf.jaxrs.provider.MultipartProvider; http://git-wip-us.apache.org/repos/asf/cxf/blob/6918eba1/distribution/src/main/release/samples/jax_rs/tracing_htrace/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/tracing_htrace/pom.xml b/distribution/src/main/release/samples/jax_rs/tracing_htrace/pom.xml index 24e28c3..a28c6c2 100644 --- a/distribution/src/main/release/samples/jax_rs/tracing_htrace/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/tracing_htrace/pom.xml @@ -121,10 +121,6 @@ <artifactId>javax.json</artifactId> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/cxf/blob/6918eba1/distribution/src/main/release/samples/ws_eventing/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/ws_eventing/pom.xml b/distribution/src/main/release/samples/ws_eventing/pom.xml index 03dcec1..c799f63 100644 --- a/distribution/src/main/release/samples/ws_eventing/pom.xml +++ b/distribution/src/main/release/samples/ws_eventing/pom.xml @@ -68,9 +68,8 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.6</version> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/cxf/blob/6918eba1/distribution/src/main/release/samples/ws_eventing/src/main/java/demo/wseventing/CreateSubscriptionServlet.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/ws_eventing/src/main/java/demo/wseventing/CreateSubscriptionServlet.java b/distribution/src/main/release/samples/ws_eventing/src/main/java/demo/wseventing/CreateSubscriptionServlet.java index 22aac17..7744b25 100644 --- a/distribution/src/main/release/samples/ws_eventing/src/main/java/demo/wseventing/CreateSubscriptionServlet.java +++ b/distribution/src/main/release/samples/ws_eventing/src/main/java/demo/wseventing/CreateSubscriptionServlet.java @@ -31,7 +31,7 @@ import javax.xml.bind.JAXBException; import javax.xml.bind.Marshaller; import javax.xml.datatype.DatatypeConfigurationException; -import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang3.StringEscapeUtils; import org.apache.cxf.jaxws.JaxWsProxyFactoryBean; import org.apache.cxf.ws.addressing.AttributedURIType; import org.apache.cxf.ws.addressing.EndpointReferenceType; @@ -121,7 +121,7 @@ public class CreateSubscriptionServlet extends HttpServlet { ByteArrayOutputStream baos = new ByteArrayOutputStream(); m.marshal(o, baos); String unescaped = baos.toString(); - return StringEscapeUtils.escapeHtml(unescaped); + return StringEscapeUtils.escapeHtml4(unescaped); } } http://git-wip-us.apache.org/repos/asf/cxf/blob/6918eba1/distribution/src/main/release/samples/ws_eventing/src/main/webapp/index.jsp ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/ws_eventing/src/main/webapp/index.jsp b/distribution/src/main/release/samples/ws_eventing/src/main/webapp/index.jsp index fe4ab41..0117b01 100644 --- a/distribution/src/main/release/samples/ws_eventing/src/main/webapp/index.jsp +++ b/distribution/src/main/release/samples/ws_eventing/src/main/webapp/index.jsp @@ -2,7 +2,7 @@ <%@ page import="demo.wseventing.eventapi.CatastrophicEventSinkImpl" %> <%@ page import="org.apache.cxf.ws.eventing.backend.database.SubscriptionTicket" %> <%@ page import="demo.wseventing.SingletonSubscriptionManagerContainer" %> -<%@ page import="org.apache.commons.lang.StringEscapeUtils" %> +<%@ page import="org.apache.commons.lang3.StringEscapeUtils" %> <%@ page contentType="text/html;charset=UTF-8" language="java" %> <html> <head> @@ -38,7 +38,7 @@ <tr> <td><%=ticket.getUuid()%></td> <td><a href="<%=ticket.getTargetURL()%>"><%=ticket.getTargetURL()%></a></td> - <td><%=StringEscapeUtils.escapeHtml(ticket.getFilterString())%></td> + <td><%=StringEscapeUtils.escapeHtml4(ticket.getFilterString())%></td> <td><%=ticket.isNonExpiring() ? "never" : ticket.getExpires().toXMLFormat()%></td> </tr> <% @@ -65,4 +65,4 @@ </body> -</html> \ No newline at end of file +</html> http://git-wip-us.apache.org/repos/asf/cxf/blob/6918eba1/osgi/bundle/compatible/pom.xml ---------------------------------------------------------------------- diff --git a/osgi/bundle/compatible/pom.xml b/osgi/bundle/compatible/pom.xml index 9063936..c473c26 100644 --- a/osgi/bundle/compatible/pom.xml +++ b/osgi/bundle/compatible/pom.xml @@ -208,7 +208,7 @@ net.sf.cglib*;resolution:=optional;version="${cxf.cglib.osgi.version}", org.apache.abdera*;resolution:=optional;version="[1.0,2)", org.apache.aries*;resolution:=optional;version="${cxf.aries.version.range}", - org.apache.commons.lang*;resolution:=optional;version="[2.4,3)", + org.apache.commons.lang3*;resolution:=optional;version="[3,4)", org.apache.commons.codec*;resolution:=optional, org.apache.commons.pool*;resolution:=optional, org.apache.log4j*;resolution:=optional, http://git-wip-us.apache.org/repos/asf/cxf/blob/6918eba1/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 12eb1dc..d19161b 100644 --- a/osgi/karaf/features/src/main/resources/features.xml +++ b/osgi/karaf/features/src/main/resources/features.xml @@ -387,7 +387,7 @@ </feature> <feature name="cxf-xjc-runtime" version="${project.version}"> <feature version="${project.version}">cxf-jaxb</feature> - <bundle start-level="35" dependency="true">mvn:commons-lang/commons-lang/${cxf.commons-lang.version}</bundle> + <bundle start-level="35" dependency="true">mvn:org.apache.commons/commons-lang3/${cxf.commons-lang3.version}</bundle> <bundle start-level="40">mvn:org.apache.cxf.xjc-utils/cxf-xjc-runtime/${cxf.xjc-utils.version}</bundle> </feature> <feature name="cxf-tools" version="${project.version}"> @@ -399,7 +399,7 @@ <feature version="${project.version}">cxf-jaxrs</feature> <feature version="${project.version}">cxf-jaxws</feature> <feature version="${project.version}">cxf-javascript</feature> - <bundle start-level="35">mvn:commons-lang/commons-lang/${cxf.commons-lang.version}</bundle> + <bundle start-level="35">mvn:org.apache.commons/commons-lang3/${cxf.commons-lang3.version}</bundle> <bundle>mvn:org.apache.velocity/velocity/${cxf.velocity.version}</bundle> <bundle>mvn:commons-collections/commons-collections/${cxf.commons-collections.version}</bundle> <bundle>mvn:org.apache.cxf/cxf-tools-common/${project.version}</bundle> @@ -523,7 +523,7 @@ <feature name="cxf-management-web" version="${project.version}"> <feature version="${project.version}">cxf-core</feature> <feature version="${project.version}">cxf-jaxrs</feature> - <bundle start-level="35" dependency="true">mvn:commons-lang/commons-lang/${cxf.commons-lang.version}</bundle> + <bundle start-level="35" dependency="true">mvn:org.apache.commons/commons-lang3/${cxf.commons-lang3.version}</bundle> <bundle start-level="25" dependency="true">mvn:commons-codec/commons-codec/${cxf.commons-codec.version}</bundle> <bundle start-level="35">mvn:org.apache.abdera/abdera-core/${cxf.abdera.version}</bundle> <bundle start-level="35">mvn:org.apache.abdera/abdera-i18n/${cxf.abdera.version}</bundle> http://git-wip-us.apache.org/repos/asf/cxf/blob/6918eba1/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index d3fe646..3acb850 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -55,7 +55,6 @@ <cxf.osgi.dynamic.import /> <cxf.osgi.spring.version>[3.1,5)</cxf.osgi.spring.version> <cxf.osgi.spring.osgi.version>[1.2.0,2)</cxf.osgi.spring.osgi.version> - <cxf.osgi.commons.lang.version>[2.4,3)</cxf.osgi.commons.lang.version> <cxf.osgi.slf4j.version>[1.5,2)</cxf.osgi.slf4j.version> <cxf.osgi.javax.annotation.version>[0.0,2)</cxf.osgi.javax.annotation.version> <cxf.osgi.javax.bind.version>[0.0,3)</cxf.osgi.javax.bind.version> @@ -78,8 +77,7 @@ <cxf.classmate.version>1.1.0</cxf.classmate.version> <cxf.commons-codec.version>1.10</cxf.commons-codec.version> <cxf.commons-collections.version>3.2.2</cxf.commons-collections.version> - <cxf.commons-lang.version>2.6</cxf.commons-lang.version> - <cxf.commons-lang3.version>3.4</cxf.commons-lang3.version> + <cxf.commons-lang3.version>3.5</cxf.commons-lang3.version> <cxf.derby.version>10.12.1.1</cxf.derby.version> <cxf.dropwizard.version>3.1.2</cxf.dropwizard.version> <cxf.ehcache.version>2.10.3</cxf.ehcache.version> @@ -1648,9 +1646,9 @@ <version>1.2</version> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>${cxf.commons-lang.version}</version> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>${cxf.commons-lang3.version}</version> </dependency> <dependency> <groupId>org.bouncycastle</groupId> http://git-wip-us.apache.org/repos/asf/cxf/blob/6918eba1/rt/management-web/pom.xml ---------------------------------------------------------------------- diff --git a/rt/management-web/pom.xml b/rt/management-web/pom.xml index cae2456..560492a 100644 --- a/rt/management-web/pom.xml +++ b/rt/management-web/pom.xml @@ -53,8 +53,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>org.apache.abdera</groupId> http://git-wip-us.apache.org/repos/asf/cxf/blob/6918eba1/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/bootstrapping/BootstrapStorage.java ---------------------------------------------------------------------- diff --git a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/bootstrapping/BootstrapStorage.java b/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/bootstrapping/BootstrapStorage.java index 6fac46e..ccbd29d 100644 --- a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/bootstrapping/BootstrapStorage.java +++ b/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/bootstrapping/BootstrapStorage.java @@ -48,7 +48,7 @@ import javax.ws.rs.core.Variant; import javax.ws.rs.ext.MessageBodyWriter; import javax.ws.rs.ext.Provider; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.helpers.IOUtils; import org.apache.cxf.jaxrs.ext.MessageContext; http://git-wip-us.apache.org/repos/asf/cxf/blob/6918eba1/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/bootstrapping/SimpleXMLSettingsStorage.java ---------------------------------------------------------------------- diff --git a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/bootstrapping/SimpleXMLSettingsStorage.java b/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/bootstrapping/SimpleXMLSettingsStorage.java index 7142564..3017590 100644 --- a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/bootstrapping/SimpleXMLSettingsStorage.java +++ b/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/bootstrapping/SimpleXMLSettingsStorage.java @@ -41,7 +41,7 @@ import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.stream.XMLStreamReader; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.cxf.staxutils.StaxUtils; public class SimpleXMLSettingsStorage implements SettingsStorage { http://git-wip-us.apache.org/repos/asf/cxf/blob/6918eba1/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/LogRecord.java ---------------------------------------------------------------------- diff --git a/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/LogRecord.java b/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/LogRecord.java index 557b1e0..3b95118 100644 --- a/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/LogRecord.java +++ b/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/LogRecord.java @@ -28,11 +28,11 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlTransient; -import org.apache.commons.lang.Validate; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; +import org.apache.commons.lang3.Validate; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; /** * Log entry serializable to XML. Based on common set of {@link java.util.logging.LogRecord} and http://git-wip-us.apache.org/repos/asf/cxf/blob/6918eba1/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/LogRecords.java ---------------------------------------------------------------------- diff --git a/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/LogRecords.java b/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/LogRecords.java index a70434d..9a6d336 100644 --- a/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/LogRecords.java +++ b/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/LogRecords.java @@ -24,11 +24,11 @@ import java.util.List; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.commons.lang.Validate; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; +import org.apache.commons.lang3.Validate; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; /** * List of {@link LogRecord}s. Necessary wrapper for {@link List} used in JAXB context. http://git-wip-us.apache.org/repos/asf/cxf/blob/6918eba1/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/AbstractAtomBean.java ---------------------------------------------------------------------- diff --git a/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/AbstractAtomBean.java b/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/AbstractAtomBean.java index c517d7e..589a156 100644 --- a/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/AbstractAtomBean.java +++ b/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/AbstractAtomBean.java @@ -24,7 +24,7 @@ import java.util.StringTokenizer; import java.util.logging.Handler; import java.util.logging.Logger; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.cxf.Bus; import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.management.web.logging.LogLevel; http://git-wip-us.apache.org/repos/asf/cxf/blob/6918eba1/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/AtomPushBean.java ---------------------------------------------------------------------- diff --git a/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/AtomPushBean.java b/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/AtomPushBean.java index ac502ea..6e0c096 100644 --- a/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/AtomPushBean.java +++ b/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/AtomPushBean.java @@ -20,7 +20,7 @@ package org.apache.cxf.management.web.logging.atom; import java.util.logging.Handler; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.cxf.management.web.logging.atom.converter.Converter; import org.apache.cxf.management.web.logging.atom.deliverer.Deliverer; http://git-wip-us.apache.org/repos/asf/cxf/blob/6918eba1/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/AtomPushEngine.java ---------------------------------------------------------------------- diff --git a/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/AtomPushEngine.java b/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/AtomPushEngine.java index 5a6a788..3069a73 100644 --- a/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/AtomPushEngine.java +++ b/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/AtomPushEngine.java @@ -28,7 +28,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import org.apache.abdera.model.Element; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.cxf.management.web.logging.LogRecord; import org.apache.cxf.management.web.logging.atom.converter.Converter; import org.apache.cxf.management.web.logging.atom.deliverer.Deliverer; http://git-wip-us.apache.org/repos/asf/cxf/blob/6918eba1/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/AtomPushOverWebSocketServer.java ---------------------------------------------------------------------- diff --git a/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/AtomPushOverWebSocketServer.java b/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/AtomPushOverWebSocketServer.java index 7a51445..11f04df 100644 --- a/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/AtomPushOverWebSocketServer.java +++ b/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/AtomPushOverWebSocketServer.java @@ -33,7 +33,7 @@ import javax.ws.rs.Produces; import org.apache.abdera.model.Element; import org.apache.abdera.model.Feed; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.cxf.jaxrs.ext.StreamingResponse; import org.apache.cxf.management.web.logging.atom.converter.Converter; import org.apache.cxf.management.web.logging.atom.deliverer.Deliverer; http://git-wip-us.apache.org/repos/asf/cxf/blob/6918eba1/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/converter/StandardConverter.java ---------------------------------------------------------------------- diff --git a/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/converter/StandardConverter.java b/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/converter/StandardConverter.java index 081ee61..52e4ee5 100644 --- a/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/converter/StandardConverter.java +++ b/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/converter/StandardConverter.java @@ -40,7 +40,7 @@ import org.apache.abdera.model.Element; import org.apache.abdera.model.Entry; import org.apache.abdera.model.ExtensibleElement; import org.apache.abdera.model.Feed; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.cxf.jaxrs.provider.atom.AbstractEntryBuilder; import org.apache.cxf.jaxrs.provider.atom.AbstractFeedBuilder; import org.apache.cxf.management.web.logging.LogRecord; http://git-wip-us.apache.org/repos/asf/cxf/blob/6918eba1/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/deliverer/RetryingDeliverer.java ---------------------------------------------------------------------- diff --git a/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/deliverer/RetryingDeliverer.java b/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/deliverer/RetryingDeliverer.java index f5cabce..b8b1977 100644 --- a/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/deliverer/RetryingDeliverer.java +++ b/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/deliverer/RetryingDeliverer.java @@ -22,7 +22,7 @@ import java.util.Calendar; import java.util.Date; import org.apache.abdera.model.Element; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; /** * Wrapper on other deliverer retrying delivery in case of failure. Delivery attempts repeat in loop with some http://git-wip-us.apache.org/repos/asf/cxf/blob/6918eba1/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/deliverer/WebClientDeliverer.java ---------------------------------------------------------------------- diff --git a/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/deliverer/WebClientDeliverer.java b/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/deliverer/WebClientDeliverer.java index 455311b..6fec88f 100644 --- a/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/deliverer/WebClientDeliverer.java +++ b/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/deliverer/WebClientDeliverer.java @@ -25,7 +25,7 @@ import javax.ws.rs.core.Response; import org.apache.abdera.model.Element; import org.apache.abdera.model.Feed; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.apache.cxf.jaxrs.client.WebClient; import org.apache.cxf.jaxrs.provider.atom.AtomEntryProvider; import org.apache.cxf.jaxrs.provider.atom.AtomFeedProvider; http://git-wip-us.apache.org/repos/asf/cxf/blob/6918eba1/rt/transports/jms/pom.xml ---------------------------------------------------------------------- diff --git a/rt/transports/jms/pom.xml b/rt/transports/jms/pom.xml index 4754b7c..9c0890f 100644 --- a/rt/transports/jms/pom.xml +++ b/rt/transports/jms/pom.xml @@ -48,10 +48,6 @@ <version>1.1.1</version> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId> <scope>provided</scope> http://git-wip-us.apache.org/repos/asf/cxf/blob/6918eba1/systests/rs-sse/pom.xml ---------------------------------------------------------------------- diff --git a/systests/rs-sse/pom.xml b/systests/rs-sse/pom.xml index dc3da1a..2a346ca 100644 --- a/systests/rs-sse/pom.xml +++ b/systests/rs-sse/pom.xml @@ -131,8 +131,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/cxf/blob/6918eba1/systests/rs-sse/src/test/java/org/apache/cxf/systest/jaxrs/sse/Book.java ---------------------------------------------------------------------- diff --git a/systests/rs-sse/src/test/java/org/apache/cxf/systest/jaxrs/sse/Book.java b/systests/rs-sse/src/test/java/org/apache/cxf/systest/jaxrs/sse/Book.java index 67322f8..85d97cf 100644 --- a/systests/rs-sse/src/test/java/org/apache/cxf/systest/jaxrs/sse/Book.java +++ b/systests/rs-sse/src/test/java/org/apache/cxf/systest/jaxrs/sse/Book.java @@ -18,8 +18,8 @@ */ package org.apache.cxf.systest.jaxrs.sse; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; public class Book { private String name;
