This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.4.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git
commit f1c15b25bb87512fa734974cf50ee232c337bf9b Author: Andriy Redko <[email protected]> AuthorDate: Wed Nov 10 17:45:17 2021 -0500 Minor dependency updates and alignments (#874) * Minor dependency updates and alignments * Addressing code review comments (cherry picked from commit 401fd5c8587d1bd4240a13b94d6a3ae5c3880597) # Conflicts: # parent/pom.xml --- parent/pom.xml | 35 +++++++++++++++++++++++++++++++---- rt/features/metrics/pom.xml | 3 +-- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index bd42c94..c2f05b3 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -120,8 +120,8 @@ <cxf.guava.version>30.1-jre</cxf.guava.version> <cxf.hamcrest.version>2.2</cxf.hamcrest.version> <cxf.hazelcast.version>3.12.9</cxf.hazelcast.version> - <cxf.hibernate.em.version>5.4.27.Final</cxf.hibernate.em.version> - <cxf.hibernate.validator.version>6.1.7.Final</cxf.hibernate.validator.version> + <cxf.hibernate.em.version>5.6.1.Final</cxf.hibernate.em.version> + <cxf.hibernate.validator.version>6.2.0.Final</cxf.hibernate.validator.version> <cxf.hsqldb.version>2.5.0</cxf.hsqldb.version> <cxf.httpcomponents.asyncclient.version.range>[4.0,4.2)</cxf.httpcomponents.asyncclient.version.range> <cxf.httpcomponents.asyncclient.version>4.1.4</cxf.httpcomponents.asyncclient.version> @@ -143,7 +143,8 @@ <cxf.jaxb.version>2.3.3</cxf.jaxb.version> <cxf.jaxb.runtime.version>2.3.4</cxf.jaxb.runtime.version> <cxf.jaxb.xjc.version>${cxf.jaxb.runtime.version}</cxf.jaxb.xjc.version> - <cxf.jboss.logging.version>3.3.0.Final</cxf.jboss.logging.version> + <cxf.jaxen.version>1.1.4</cxf.jaxen.version> + <cxf.jboss.logging.version>3.4.1.Final</cxf.jboss.logging.version> <cxf.jboss.weld.version>3.1.7.SP1</cxf.jboss.weld.version> <cxf.jcache.version>1.1.1</cxf.jcache.version> <cxf.jdom.version>1.0</cxf.jdom.version> @@ -181,7 +182,7 @@ <cxf.opentracing.version>0.33.0</cxf.opentracing.version> <cxf.persistence-api.version>2.2.3</cxf.persistence-api.version> <cxf.plexus-archiver.version>4.2.0</cxf.plexus-archiver.version> - <cxf.plexus-utils.version>3.2.0</cxf.plexus-utils.version> + <cxf.plexus-utils.version>3.3.0</cxf.plexus-utils.version> <cxf.reactivestreams.version>1.0.3</cxf.reactivestreams.version> <cxf.reactor.version>3.3.21.RELEASE</cxf.reactor.version> <cxf.rhino.version>1.7R2</cxf.rhino.version> @@ -218,6 +219,7 @@ <cxf.validation.api.package.version>[1.0.0,3)</cxf.validation.api.package.version> <cxf.validation.api.version>2.0.2</cxf.validation.api.version> <cxf.velocity.version>2.3</cxf.velocity.version> + <cxf.wildfly.common.version>1.5.4.Final</cxf.wildfly.common.version> <cxf.wiremock.version>2.23.2</cxf.wiremock.version> <cxf.woodstox.core.version>6.2.6</cxf.woodstox.core.version> <cxf.woodstox.stax2-api.version>4.2.1</cxf.woodstox.stax2-api.version> @@ -927,6 +929,11 @@ </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + <version>${cxf.httpcomponents.core.version}</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> <artifactId>httpasyncclient</artifactId> <version>${cxf.httpcomponents.asyncclient.version}</version> <exclusions> @@ -1189,6 +1196,16 @@ <version>${cxf.undertow.version}</version> </dependency> <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging</artifactId> + <version>${cxf.jboss.logging.version}</version> + </dependency> + <dependency> + <groupId>org.wildfly.common</groupId> + <artifactId>wildfly-common</artifactId> + <version>${cxf.wildfly.common.version}</version> + </dependency> + <dependency> <groupId>xalan</groupId> <artifactId>xalan</artifactId> <version>${cxf.xalan.version}</version> @@ -1838,6 +1855,11 @@ </exclusions> </dependency> <dependency> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + <version>${cxf.jaxen.version}</version> + </dependency> + <dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> <version>${cxf.xerces.version}</version> @@ -2004,6 +2026,11 @@ <artifactId>maven-javadoc-plugin</artifactId> <version>3.2.0</version> </dependency> + <dependency> + <groupId>org.ehcache</groupId> + <artifactId>ehcache</artifactId> + <version>${cxf.ehcache3.version}</version> + </dependency> </dependencies> </dependencyManagement> <profiles> diff --git a/rt/features/metrics/pom.xml b/rt/features/metrics/pom.xml index 8a04780..c6f90de 100644 --- a/rt/features/metrics/pom.xml +++ b/rt/features/metrics/pom.xml @@ -53,8 +53,7 @@ </dependency> <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest</artifactId> - <version>${cxf.hamcrest.version}</version> + <artifactId>hamcrest-core</artifactId> <scope>test</scope> </dependency> </dependencies>
