You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2019/06/04 11:09:19 UTC
[cxf] branch master updated: Consolidating some dependency versions
+ finally fixed the flakiness of the systests
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 2071cdd Consolidating some dependency versions + finally fixed the flakiness of the systests
2071cdd is described below
commit 2071cddbaa5d6e795e293207325e6396ab9e7916
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Jun 4 12:08:48 2019 +0100
Consolidating some dependency versions + finally fixed the flakiness of the systests
---
distribution/javadoc/pom.xml | 16 ----------------
integration/cdi/pom.xml | 2 +-
osgi/bundle/compatible/pom.xml | 1 -
osgi/itests-felix/pom.xml | 2 +-
osgi/itests/pom.xml | 8 ++++----
parent/pom.xml | 9 +++++++--
rt/databinding/aegis/pom.xml | 1 -
rt/rs/client/pom.xml | 2 +-
rt/rs/microprofile-client/pom.xml | 3 +--
rt/rs/security/oauth-parent/oauth2/pom.xml | 4 ++--
rt/rs/security/sso/oidc/pom.xml | 4 ++--
services/xkms/xkms-itests/pom.xml | 7 +++----
systests/cdi/cdi-owb/pom.xml | 6 +-----
systests/cdi/cdi-weld/pom.xml | 6 +-----
systests/cdi/pom.xml | 10 ++--------
systests/jaxrs/pom.xml | 20 +++++++-------------
systests/microprofile/client/async/pom.xml | 1 -
systests/microprofile/client/jaxrs/pom.xml | 3 +--
systests/microprofile/client/tracing/pom.xml | 2 +-
systests/rs-http-sci/pom.xml | 2 +-
systests/rs-security/pom.xml | 4 ++--
systests/rs-sse/pom.xml | 2 +-
systests/transport-jms/pom.xml | 2 +-
systests/uncategorized/pom.xml | 4 ++--
systests/wsdl_maven/codegen/src/it/cxf-4004/pom.xml | 2 +-
systests/wsdl_maven/codegen/src/it/it-parent/pom.xml | 2 +-
26 files changed, 44 insertions(+), 81 deletions(-)
diff --git a/distribution/javadoc/pom.xml b/distribution/javadoc/pom.xml
index d46a1ec..cc2feb4 100644
--- a/distribution/javadoc/pom.xml
+++ b/distribution/javadoc/pom.xml
@@ -307,22 +307,6 @@
<artifactId>abdera-extensions-json</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sdo</groupId>
- <artifactId>tuscany-sdo-impl</artifactId>
- <version>1.1.1</version>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sdo</groupId>
- <artifactId>tuscany-sdo-tools</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>compile</scope>
diff --git a/integration/cdi/pom.xml b/integration/cdi/pom.xml
index 11b5533..a489f15 100644
--- a/integration/cdi/pom.xml
+++ b/integration/cdi/pom.xml
@@ -90,7 +90,7 @@
<dependency>
<groupId>javax.el</groupId>
<artifactId>javax.el-api</artifactId>
- <version>3.0.0</version>
+ <version>${cxf.javax.el.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/osgi/bundle/compatible/pom.xml b/osgi/bundle/compatible/pom.xml
index 55a546c..39db7fe 100644
--- a/osgi/bundle/compatible/pom.xml
+++ b/osgi/bundle/compatible/pom.xml
@@ -169,7 +169,6 @@
org.apache.commons.pool*;resolution:=optional,
org.apache.log4j*;resolution:=optional,
org.apache.mina*;resolution:=optional,
- org.apache.tuscany.sdo*;resolution:=optional,
org.apache.velocity*;resolution:=optional,
org.apache.xml.security*;resolution:=optional,
org.apache.ws.security*;resolution:=optional,
diff --git a/osgi/itests-felix/pom.xml b/osgi/itests-felix/pom.xml
index 01ceba6..866f4e3 100644
--- a/osgi/itests-felix/pom.xml
+++ b/osgi/itests-felix/pom.xml
@@ -125,7 +125,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>1.0</version>
+ <version>${cxf.geronimo.inject.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/osgi/itests/pom.xml b/osgi/itests/pom.xml
index 06b2f29..e8759aa 100644
--- a/osgi/itests/pom.xml
+++ b/osgi/itests/pom.xml
@@ -112,9 +112,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.hibernate-validator</artifactId>
- <version>5.4.2.Final_1</version>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>${cxf.hibernate.validator.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -128,7 +128,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>1.0</version>
+ <version>${cxf.geronimo.inject.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
index 9762c8e..7ebf7f1 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -77,6 +77,7 @@
<cxf.artemis.version>2.4.0</cxf.artemis.version>
<cxf.ahc.version>2.0.39</cxf.ahc.version>
<cxf.apacheds.version>2.0.0.AM25</cxf.apacheds.version>
+ <cxf.aspectj.version>1.9.1</cxf.aspectj.version>
<cxf.atmosphere.version>2.5.2</cxf.atmosphere.version>
<cxf.atmosphere.version.range>[2.4,3.0)</cxf.atmosphere.version.range>
<cxf.bcprov.version>1.60</cxf.bcprov.version>
@@ -87,6 +88,7 @@
<cxf.classmate.version>1.1.0</cxf.classmate.version>
<cxf.commons-codec.version>1.12</cxf.commons-codec.version>
<cxf.commons-collections.version>3.2.2</cxf.commons-collections.version>
+ <cxf.commons-jcs-jcache.version>2.1</cxf.commons-jcs-jcache.version>
<cxf.commons-lang3.version>3.9</cxf.commons-lang3.version>
<cxf.commons-logging.version>1.2</cxf.commons-logging.version>
<cxf.commons-text.version>1.6</cxf.commons-text.version>
@@ -99,6 +101,8 @@
<cxf.guava.version>20.0</cxf.guava.version>
<cxf.hazelcast.version>3.10.6</cxf.hazelcast.version>
<cxf.hibernate.em.version>5.4.2.Final</cxf.hibernate.em.version>
+ <cxf.hibernate.jpa.version>1.0.2.Final</cxf.hibernate.jpa.version>
+ <cxf.hibernate.validator.version>5.2.5.Final</cxf.hibernate.validator.version>
<cxf.httpcomponents.asyncclient.version>4.1.4</cxf.httpcomponents.asyncclient.version>
<cxf.httpcomponents.asyncclient.version.range>[4.0,4.2)</cxf.httpcomponents.asyncclient.version.range>
<cxf.httpcomponents.client.version>4.5.8</cxf.httpcomponents.client.version>
@@ -117,6 +121,7 @@
<cxf.rxjava2.version>2.2.5</cxf.rxjava2.version>
<cxf.javax.annotation-api.version>1.3.1</cxf.javax.annotation-api.version>
<cxf.jcache.version>1.1.1</cxf.jcache.version>
+ <cxf.geronimo.inject.version>1.1</cxf.geronimo.inject.version>
<cxf.geronimo.jms.version>1.1.1</cxf.geronimo.jms.version>
<cxf.geronimo.jta.version>1.1.1</cxf.geronimo.jta.version>
<cxf.geronimo.j2ee.management.version>1.0.1</cxf.geronimo.j2ee.management.version>
@@ -125,7 +130,7 @@
<cxf.openjpa.version>2.4.3</cxf.openjpa.version>
<cxf.geronimo.transaction.version>3.1.4</cxf.geronimo.transaction.version>
<cxf.jasypt.bundle.version>1.9.2_1</cxf.jasypt.bundle.version>
- <cxf.javassist.version>3.21.0-GA</cxf.javassist.version>
+ <cxf.javassist.version>3.25.0-GA</cxf.javassist.version>
<cxf.javax.ws.rs.version>2.1.5</cxf.javax.ws.rs.version>
<cxf.jaxb.version>2.3.2</cxf.jaxb.version>
<cxf.jaxb.runtime.version>${cxf.jaxb.version}</cxf.jaxb.runtime.version>
@@ -195,7 +200,7 @@
<cxf.json.api.version>1.1.4</cxf.json.api.version>
<cxf.jboss.weld.version>2.4.8.Final</cxf.jboss.weld.version>
<cxf.jboss.logging.version>3.3.0.Final</cxf.jboss.logging.version>
- <cxf.hibernate.validator.version>5.2.5.Final</cxf.hibernate.validator.version>
+ <cxf.jsr250.api.version>1.0</cxf.jsr250.api.version>
<cxf.glassfish.json.version>1.0.4</cxf.glassfish.json.version>
<cxf.johnzon.version>1.1.12</cxf.johnzon.version>
<cxf.javax.el.version>3.0.0</cxf.javax.el.version>
diff --git a/rt/databinding/aegis/pom.xml b/rt/databinding/aegis/pom.xml
index 1303585..8c753f7 100644
--- a/rt/databinding/aegis/pom.xml
+++ b/rt/databinding/aegis/pom.xml
@@ -130,7 +130,6 @@
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>3.4</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/rt/rs/client/pom.xml b/rt/rs/client/pom.xml
index c7ccf87..668923e 100644
--- a/rt/rs/client/pom.xml
+++ b/rt/rs/client/pom.xml
@@ -146,7 +146,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-jcs-jcache</artifactId>
- <version>2.1</version>
+ <version>${cxf.commons-jcs-jcache.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/rt/rs/microprofile-client/pom.xml b/rt/rs/microprofile-client/pom.xml
index 9ee139d..a5133f7 100644
--- a/rt/rs/microprofile-client/pom.xml
+++ b/rt/rs/microprofile-client/pom.xml
@@ -114,7 +114,6 @@
<dependency>
<groupId>javax.json</groupId>
<artifactId>javax.json-api</artifactId>
- <version>1.1</version>
</dependency>
<dependency>
<groupId>org.eclipse.microprofile.rest.client</groupId>
@@ -171,7 +170,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-jcs-jcache</artifactId>
- <version>2.1</version>
+ <version>${cxf.commons-jcs-jcache.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/rt/rs/security/oauth-parent/oauth2/pom.xml b/rt/rs/security/oauth-parent/oauth2/pom.xml
index 62a7893..f9a33f0 100644
--- a/rt/rs/security/oauth-parent/oauth2/pom.xml
+++ b/rt/rs/security/oauth-parent/oauth2/pom.xml
@@ -181,13 +181,13 @@
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
- <version>1.9.1</version>
+ <version>${cxf.aspectj.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hibernate.javax.persistence</groupId>
<artifactId>hibernate-jpa-2.1-api</artifactId>
- <version>1.0.2.Final</version>
+ <version>${cxf.hibernate.jpa.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/rt/rs/security/sso/oidc/pom.xml b/rt/rs/security/sso/oidc/pom.xml
index 204b2e7..14c8436 100644
--- a/rt/rs/security/sso/oidc/pom.xml
+++ b/rt/rs/security/sso/oidc/pom.xml
@@ -130,7 +130,7 @@
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
- <version>1.9.1</version>
+ <version>${cxf.aspectj.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -150,7 +150,7 @@
<dependency>
<groupId>org.hibernate.javax.persistence</groupId>
<artifactId>hibernate-jpa-2.1-api</artifactId>
- <version>1.0.2.Final</version>
+ <version>${cxf.hibernate.jpa.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/services/xkms/xkms-itests/pom.xml b/services/xkms/xkms-itests/pom.xml
index 7b7cb38..2198c0c 100644
--- a/services/xkms/xkms-itests/pom.xml
+++ b/services/xkms/xkms-itests/pom.xml
@@ -76,14 +76,13 @@
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- <version>1</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-atinject_1.0_spec</artifactId>
+ <version>${cxf.geronimo.inject.version}</version>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
- <version>2.3.2</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
diff --git a/systests/cdi/cdi-owb/pom.xml b/systests/cdi/cdi-owb/pom.xml
index 4a15f66..dd55eb7 100644
--- a/systests/cdi/cdi-owb/pom.xml
+++ b/systests/cdi/cdi-owb/pom.xml
@@ -69,7 +69,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>1.0</version>
+ <version>${cxf.geronimo.inject.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -77,10 +77,6 @@
<version>1.0</version>
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>javax.el-api</artifactId>
- </dependency>
- <dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.el</artifactId>
</dependency>
diff --git a/systests/cdi/cdi-weld/pom.xml b/systests/cdi/cdi-weld/pom.xml
index 25bc1d0..5d566da 100644
--- a/systests/cdi/cdi-weld/pom.xml
+++ b/systests/cdi/cdi-weld/pom.xml
@@ -26,7 +26,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cxf-systests-cdi-weld</artifactId>
- <packaging>pom</packaging>
+ <packaging>pom</packaging>
<name>Apache CXF CDI Integration System Tests - Weld</name>
<description>Apache CXF CDI Integration System Tests - Weld</description>
<url>https://cxf.apache.org</url>
@@ -57,10 +57,6 @@
<version>${cxf.jboss.weld.version}</version>
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>javax.el-api</artifactId>
- </dependency>
- <dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.el</artifactId>
</dependency>
diff --git a/systests/cdi/pom.xml b/systests/cdi/pom.xml
index a569a29..e274c2f 100644
--- a/systests/cdi/pom.xml
+++ b/systests/cdi/pom.xml
@@ -32,8 +32,7 @@
<description>Apache CXF CDI Integration System Tests</description>
<url>https://cxf.apache.org</url>
<properties>
- <cxf.el.api.version>3.0-b02</cxf.el.api.version>
- <cxf.glassfish.el.version>3.0-b01</cxf.glassfish.el.version>
+ <cxf.glassfish.el.version>3.0.1-b11</cxf.glassfish.el.version>
<cxf.openwebbeans.version>2.0.8</cxf.openwebbeans.version>
</properties>
<modules>
@@ -49,11 +48,6 @@
<version>${cxf.hibernate.validator.version}</version>
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>javax.el-api</artifactId>
- <version>${cxf.el.api.version}</version>
- </dependency>
- <dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.el</artifactId>
<version>${cxf.glassfish.el.version}</version>
@@ -108,7 +102,7 @@
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
- <version>1.0</version>
+ <version>${cxf.jsr250.api.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml
index fb1be41..94e9ed4 100644
--- a/systests/jaxrs/pom.xml
+++ b/systests/jaxrs/pom.xml
@@ -31,15 +31,14 @@
<description>Apache CXF JAX-RS System Tests</description>
<url>https://cxf.apache.org</url>
<properties>
- <cxf.el.api.version>3.0-b02</cxf.el.api.version>
- <cxf.glassfish.el.version>3.0-b01</cxf.glassfish.el.version>
+ <cxf.glassfish.el.version>3.0.1-b11</cxf.glassfish.el.version>
<cxf.module.name>org.apache.cxf.systests.jaxrs</cxf.module.name>
</properties>
<dependencies>
<dependency>
- <groupId>javassist</groupId>
+ <groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
- <version>3.12.1.GA</version>
+ <version>${cxf.javassist.version}</version>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
@@ -73,11 +72,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>javax.el-api</artifactId>
- <version>${cxf.el.api.version}</version>
- </dependency>
- <dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.el</artifactId>
<version>${cxf.glassfish.el.version}</version>
@@ -97,7 +91,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.noosgi</artifactId>
- <version>1.1.2</version>
+ <version>1.2.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -352,7 +346,7 @@
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
- <version>1.0</version>
+ <version>${cxf.jsr250.api.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -383,13 +377,13 @@
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
- <version>1.9.1</version>
+ <version>${cxf.aspectj.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
- <version>1.9.1</version>
+ <version>${cxf.aspectj.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/systests/microprofile/client/async/pom.xml b/systests/microprofile/client/async/pom.xml
index 816a603..52104fb 100644
--- a/systests/microprofile/client/async/pom.xml
+++ b/systests/microprofile/client/async/pom.xml
@@ -32,7 +32,6 @@
<url>https://cxf.apache.org</url>
<properties>
<cxf.module.name>org.apache.cxf.systests.microprofile.async</cxf.module.name>
- <cxf.geronimo.config.version>1.0</cxf.geronimo.config.version>
<cxf.wiremock.params>--port=8765</cxf.wiremock.params>
</properties>
<dependencies>
diff --git a/systests/microprofile/client/jaxrs/pom.xml b/systests/microprofile/client/jaxrs/pom.xml
index 3f72bca..b494af5 100644
--- a/systests/microprofile/client/jaxrs/pom.xml
+++ b/systests/microprofile/client/jaxrs/pom.xml
@@ -32,7 +32,6 @@
<url>https://cxf.apache.org</url>
<properties>
<cxf.module.name>org.apache.cxf.systests.microprofile.jaxrs</cxf.module.name>
- <cxf.geronimo.config.version>1.0</cxf.geronimo.config.version>
</properties>
<dependencies>
<dependency>
@@ -137,7 +136,7 @@
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
- <version>1.0</version>
+ <version>${cxf.jsr250.api.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/systests/microprofile/client/tracing/pom.xml b/systests/microprofile/client/tracing/pom.xml
index 5daa167..8f24fa7 100644
--- a/systests/microprofile/client/tracing/pom.xml
+++ b/systests/microprofile/client/tracing/pom.xml
@@ -140,7 +140,7 @@
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
- <version>1.0</version>
+ <version>${cxf.jsr250.api.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/systests/rs-http-sci/pom.xml b/systests/rs-http-sci/pom.xml
index ab16930..fb6e221 100644
--- a/systests/rs-http-sci/pom.xml
+++ b/systests/rs-http-sci/pom.xml
@@ -96,7 +96,7 @@
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
- <version>1.0</version>
+ <version>${cxf.jsr250.api.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/systests/rs-security/pom.xml b/systests/rs-security/pom.xml
index 14cbde5..ff35ee9 100644
--- a/systests/rs-security/pom.xml
+++ b/systests/rs-security/pom.xml
@@ -150,7 +150,7 @@
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
- <version>1.0</version>
+ <version>${cxf.jsr250.api.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -225,7 +225,7 @@
<dependency>
<groupId>org.hibernate.javax.persistence</groupId>
<artifactId>hibernate-jpa-2.1-api</artifactId>
- <version>1.0.2.Final</version>
+ <version>${cxf.hibernate.jpa.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/systests/rs-sse/pom.xml b/systests/rs-sse/pom.xml
index 92ed65f..cda0daa 100644
--- a/systests/rs-sse/pom.xml
+++ b/systests/rs-sse/pom.xml
@@ -71,7 +71,7 @@
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
- <version>1.0</version>
+ <version>${cxf.jsr250.api.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/systests/transport-jms/pom.xml b/systests/transport-jms/pom.xml
index 1ff9620..2202c45 100644
--- a/systests/transport-jms/pom.xml
+++ b/systests/transport-jms/pom.xml
@@ -254,7 +254,7 @@
<dependency>
<groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-transaction</artifactId>
- <version>3.1.1</version>
+ <version>${cxf.geronimo.transaction.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/systests/uncategorized/pom.xml b/systests/uncategorized/pom.xml
index 560d546..71fba45 100644
--- a/systests/uncategorized/pom.xml
+++ b/systests/uncategorized/pom.xml
@@ -280,13 +280,13 @@
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
- <version>1.9.1</version>
+ <version>${cxf.aspectj.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
- <version>1.9.1</version>
+ <version>${cxf.aspectj.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/systests/wsdl_maven/codegen/src/it/cxf-4004/pom.xml b/systests/wsdl_maven/codegen/src/it/cxf-4004/pom.xml
index 24ac12f..79c2278 100644
--- a/systests/wsdl_maven/codegen/src/it/cxf-4004/pom.xml
+++ b/systests/wsdl_maven/codegen/src/it/cxf-4004/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>codegen-it-parent</artifactId>
- <version>1-SNAPSHOT</version>
+ <version>3.3.3-SNAPSHOT</version>
<relativePath>../it-parent/pom.xml</relativePath>
</parent>
<artifactId>cxf-4004-it</artifactId>
diff --git a/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml b/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml
index 4d0c559..8de38c5 100644
--- a/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml
+++ b/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf</groupId>
<artifactId>codegen-it-parent</artifactId>
- <version>1-SNAPSHOT</version>
+ <version>3.3.3-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<cxf.version>@project.version@</cxf.version>