This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch tomee-9.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/tomee-9.x by this push:
new dfae788193 [TOMEE-4053] Dependency properties cleanup
dfae788193 is described below
commit dfae78819364ea30d9aa4d856b0ca84cc57afef9
Author: Swell <[email protected]>
AuthorDate: Tue Jan 31 13:00:32 2023 +0100
[TOMEE-4053] Dependency properties cleanup
---
arquillian/arquillian-tomee-common/pom.xml | 2 +-
arquillian/arquillian-tomee-embedded/pom.xml | 4 +-
.../arquillian-tomee-moviefun-example/pom.xml | 4 +-
arquillian/arquillian-tomee-remote/pom.xml | 2 +-
.../arquillian-tomee-config-tests/pom.xml | 2 +-
.../arquillian-tomee-webprofile-tests/pom.xml | 2 +-
container/openejb-core/pom.xml | 6 +-
deps/activemq-broker-shade/pom.xml | 2 +-
deps/activemq-client-shade/pom.xml | 2 +-
deps/activemq-kahadb-store-shade/pom.xml | 2 +-
deps/activemq-ra-shade/pom.xml | 2 +-
deps/cxf-rt-rs-mp-client-shade/pom.xml | 2 +-
deps/cxf-shade/pom.xml | 30 ++---
maven/jarstxt-maven-plugin/pom.xml | 2 +-
maven/pom.xml | 2 +-
pom.xml | 128 ++++++++++-----------
server/openejb-bonecp/pom.xml | 2 +-
server/openejb-cxf/pom.xml | 12 +-
server/openejb-http/pom.xml | 4 +-
server/openejb-webservices/pom.xml | 2 +-
tck/bval-embedded/pom.xml | 2 +-
tck/cdi-embedded/pom.xml | 8 +-
tck/cdi-tomee/pom.xml | 10 +-
tck/cdi-tomee/src/test/resources/arquillian.xml | 2 +-
tck/microprofile-tck/rest-client/pom.xml | 2 +-
tomee/apache-tomee/pom.xml | 14 +--
tomee/pom.xml | 10 +-
tomee/tomee-loader/pom.xml | 2 +-
.../tomee-microprofile-webapp/pom.xml | 16 +--
tomee/tomee-myfaces/pom.xml | 2 +-
tomee/tomee-plume-webapp/pom.xml | 8 +-
tomee/tomee-plus-webapp/pom.xml | 12 +-
tomee/tomee-security/pom.xml | 2 +-
tomee/tomee-webaccess/pom.xml | 4 +-
tomee/tomee-webapp/pom.xml | 6 +-
utils/log4j2-tomee/pom.xml | 6 +-
utils/openejb-core-hibernate/pom.xml | 8 +-
37 files changed, 164 insertions(+), 164 deletions(-)
diff --git a/arquillian/arquillian-tomee-common/pom.xml
b/arquillian/arquillian-tomee-common/pom.xml
index 2fef5a0e7e..44d2c43d57 100644
--- a/arquillian/arquillian-tomee-common/pom.xml
+++ b/arquillian/arquillian-tomee-common/pom.xml
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-finder-shaded</artifactId>
- <version>${xbeanVersion}</version>
+ <version>${version.xbean}</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/arquillian/arquillian-tomee-embedded/pom.xml
b/arquillian/arquillian-tomee-embedded/pom.xml
index da66c417a7..dff9f955d1 100644
--- a/arquillian/arquillian-tomee-embedded/pom.xml
+++ b/arquillian/arquillian-tomee-embedded/pom.xml
@@ -83,7 +83,7 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>${myfaces.version}</version>
+ <version>${version.myfaces}</version>
</dependency>
<dependency>
@@ -95,7 +95,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>${commons-io.version}</version>
+ <version>${version.commons-io}</version>
<scope>test</scope>
</dependency>
diff --git a/arquillian/arquillian-tomee-moviefun-example/pom.xml
b/arquillian/arquillian-tomee-moviefun-example/pom.xml
index 64b0216ea5..f18fb2501d 100644
--- a/arquillian/arquillian-tomee-moviefun-example/pom.xml
+++ b/arquillian/arquillian-tomee-moviefun-example/pom.xml
@@ -66,7 +66,7 @@
<artifactItem>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>${commons-logging.version}</version>
+ <version>${version.commons-logging}</version>
</artifactItem>
<artifactItem>
<groupId>jakarta.servlet.jsp.jstl</groupId>
@@ -111,7 +111,7 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>${myfaces.version}</version>
+ <version>${version.myfaces}</version>
</dependency>
<dependency>
<groupId>jakarta.servlet.jsp.jstl</groupId>
diff --git a/arquillian/arquillian-tomee-remote/pom.xml
b/arquillian/arquillian-tomee-remote/pom.xml
index 2e12567d0c..a4945a310b 100644
--- a/arquillian/arquillian-tomee-remote/pom.xml
+++ b/arquillian/arquillian-tomee-remote/pom.xml
@@ -158,7 +158,7 @@
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-impl</artifactId>
<classifier>jakarta</classifier>
- <version>${openwebbeans.version}</version>
+ <version>${version.openwebbeans}</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git
a/arquillian/arquillian-tomee-tests/arquillian-tomee-config-tests/pom.xml
b/arquillian/arquillian-tomee-tests/arquillian-tomee-config-tests/pom.xml
index 2b797a5b8a..15810d7cb1 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-config-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-config-tests/pom.xml
@@ -31,7 +31,7 @@
<dependency>
<artifactId>commons-lang3</artifactId>
<groupId>org.apache.commons</groupId>
- <version>${commons-lang3.version}</version>
+ <version>${version.commons-lang3}</version>
</dependency>
</dependencies>
diff --git
a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/pom.xml
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/pom.xml
index 10981e8273..d629fb70db 100644
---
a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/pom.xml
+++
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/pom.xml
@@ -31,7 +31,7 @@
<dependency>
<artifactId>commons-lang3</artifactId>
<groupId>org.apache.commons</groupId>
- <version>${commons-lang3.version}</version>
+ <version>${version.commons-lang3}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml
index 2d41b064b5..45dfaa9c8f 100644
--- a/container/openejb-core/pom.xml
+++ b/container/openejb-core/pom.xml
@@ -398,7 +398,7 @@
<manifestEntries>
<Automatic-Module-Name>${tomee.build.name}</Automatic-Module-Name>
<Class-Path>openejb-loader-${project.version}.jar
openejb-client-${project.version}.jar
- xbean-finder-shaded-${xbeanVersion}.jar
xbean-asm9-shaded-${xbeanVersion}.jar
+ xbean-finder-shaded-${version.xbean}.jar
xbean-asm9-shaded-${version.xbean}.jar
</Class-Path>
<J2EE-DeploymentFactory-Implementation-Class>
org.apache.openejb.config.VmDeploymentFactory
@@ -439,7 +439,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
- <version>${log4j2.version}</version>
+ <version>${version.log4j2}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -721,7 +721,7 @@
<dependency>
<groupId>org.apache.batchee</groupId>
<artifactId>batchee-jbatch</artifactId>
- <version>${batchee.version}</version>
+ <version>${version.batchee}</version>
<scope>provided</scope>
<classifier>jakarta</classifier>
<exclusions>
diff --git a/deps/activemq-broker-shade/pom.xml
b/deps/activemq-broker-shade/pom.xml
index afbafc35fb..9d9234139e 100644
--- a/deps/activemq-broker-shade/pom.xml
+++ b/deps/activemq-broker-shade/pom.xml
@@ -31,7 +31,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-broker</artifactId>
- <version>${org.apache.activemq.version}</version>
+ <version>${version.activemq}</version>
<exclusions>
<exclusion>
<groupId>org.apache.activemq</groupId>
diff --git a/deps/activemq-client-shade/pom.xml
b/deps/activemq-client-shade/pom.xml
index 8e275d9f74..2d740c448f 100644
--- a/deps/activemq-client-shade/pom.xml
+++ b/deps/activemq-client-shade/pom.xml
@@ -31,7 +31,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
- <version>${org.apache.activemq.version}</version>
+ <version>${version.activemq}</version>
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
diff --git a/deps/activemq-kahadb-store-shade/pom.xml
b/deps/activemq-kahadb-store-shade/pom.xml
index d8721873c8..bdde01f8e6 100644
--- a/deps/activemq-kahadb-store-shade/pom.xml
+++ b/deps/activemq-kahadb-store-shade/pom.xml
@@ -31,7 +31,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-kahadb-store</artifactId>
- <version>${org.apache.activemq.version}</version>
+ <version>${version.activemq}</version>
<exclusions>
<exclusion>
<groupId>org.apache.activemq</groupId>
diff --git a/deps/activemq-ra-shade/pom.xml b/deps/activemq-ra-shade/pom.xml
index 00117af684..99e055e107 100644
--- a/deps/activemq-ra-shade/pom.xml
+++ b/deps/activemq-ra-shade/pom.xml
@@ -31,7 +31,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-ra</artifactId>
- <version>${org.apache.activemq.version}</version>
+ <version>${version.activemq}</version>
<exclusions>
<exclusion>
<groupId>org.apache.activemq</groupId>
diff --git a/deps/cxf-rt-rs-mp-client-shade/pom.xml
b/deps/cxf-rt-rs-mp-client-shade/pom.xml
index 79c287bfaa..443bfa0696 100644
--- a/deps/cxf-rt-rs-mp-client-shade/pom.xml
+++ b/deps/cxf-rt-rs-mp-client-shade/pom.xml
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-mp-client</artifactId>
- <version>${cxf.version}</version>
+ <version>${version.cxf}</version>
<exclusions>
<exclusion>
<groupId>org.apache.cxf</groupId>
diff --git a/deps/cxf-shade/pom.xml b/deps/cxf-shade/pom.xml
index 33439301a7..65d77a20e1 100644
--- a/deps/cxf-shade/pom.xml
+++ b/deps/cxf-shade/pom.xml
@@ -39,22 +39,22 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
- <version>${cxf.version}</version>
+ <version>${version.cxf}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-databinding-jaxb</artifactId>
- <version>${cxf.version}</version>
+ <version>${version.cxf}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>${cxf.version}</version>
+ <version>${version.cxf}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>${cxf.version}</version>
+ <version>${version.cxf}</version>
<exclusions>
<exclusion>
<groupId>org.ow2.asm</groupId>
@@ -73,55 +73,55 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-management</artifactId>
- <version>${cxf.version}</version>
+ <version>${version.cxf}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
- <version>${cxf.version}</version>
+ <version>${version.cxf}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-providers</artifactId>
- <version>${cxf.version}</version>
+ <version>${version.cxf}</version>
</dependency>
<!--
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-search</artifactId>
- <version>${cxf.version}</version>
+ <version>${version.cxf}</version>
</dependency>
-->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-cors</artifactId>
- <version>${cxf.version}</version>
+ <version>${version.cxf}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-oauth2</artifactId>
- <version>${cxf.version}</version>
+ <version>${version.cxf}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-service-description</artifactId>
- <version>${cxf.version}</version>
+ <version>${version.cxf}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-sse</artifactId>
- <version>${cxf.version}</version>
+ <version>${version.cxf}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
- <version>${cxf.version}</version>
+ <version>${version.cxf}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
- <version>${cxf.version}</version>
+ <version>${version.cxf}</version>
<exclusions>
<!-- Exclude some weird transient dependency to jaxb-runtime from
ehcache -->
<exclusion>
@@ -139,7 +139,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-wsdl</artifactId>
- <version>${cxf.version}</version>
+ <version>${version.cxf}</version>
</dependency>
<!-- add transitive dependencies so including this is equivalent to
including regular deps -->
diff --git a/maven/jarstxt-maven-plugin/pom.xml
b/maven/jarstxt-maven-plugin/pom.xml
index 6e8098dc30..883016969e 100644
--- a/maven/jarstxt-maven-plugin/pom.xml
+++ b/maven/jarstxt-maven-plugin/pom.xml
@@ -50,7 +50,7 @@ Licensed to the Apache Software Foundation (ASF) under one or
more
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>${commons-lang3.version}</version>
+ <version>${version.commons-lang3}</version>
</dependency>
</dependencies>
diff --git a/maven/pom.xml b/maven/pom.xml
index 66ae51167f..e1ce345009 100644
--- a/maven/pom.xml
+++ b/maven/pom.xml
@@ -78,7 +78,7 @@
<dependency>
<groupId>org.sonatype.aether</groupId>
<artifactId>aether-api</artifactId>
- <version>${aether.version}</version>
+ <version>${version.aether}</version>
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
diff --git a/pom.xml b/pom.xml
index 63358faf52..0570016e49 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,37 +136,37 @@
<version.quartz-openejb-shade>2.2.4</version.quartz-openejb-shade>
<version.axiom>1.3.0</version.axiom>
- <xbeanVersion>4.22</xbeanVersion>
+ <version.xbean>4.22</version.xbean>
<version.groovy>2.4.12</version.groovy>
<version.ecj>4.6.1</version.ecj>
- <jetty.version>11.0.8</jetty.version>
- <ehcache.version>3.10.0</ehcache.version>
+ <version.jetty>11.0.8</version.jetty>
+ <version.ehcache>3.10.0</version.ehcache>
<junit.version>4.13.2</junit.version>
<junit.jupiter.version>5.8.2</junit.jupiter.version>
<version.osgi.framework>4.2.0</version.osgi.framework>
- <aether.version>1.13.1</aether.version>
+ <version.aether>1.13.1</version.aether>
<version.xalan>2.7.2</version.xalan>
<!-- Logging frameworks -->
- <slf4j.version>1.7.36</slf4j.version>
- <log4j.version>1.2.17</log4j.version>
- <log4j2.version>2.19.0</log4j2.version>
- <commons-logging.version>1.2</commons-logging.version>
+ <version.slf4j>1.7.36</version.slf4j>
+ <version.log4j>1.2.17</version.log4j>
+ <version.log4j2>2.19.0</version.log4j2>
+ <version.commons-logging>1.2</version.commons-logging>
<version.commons-logging-api>1.1</version.commons-logging-api>
<!-- Apache Commons -->
- <commons-beanutils.version>1.9.4</commons-beanutils.version>
+ <version.commons-beanutils>1.9.4</version.commons-beanutils>
<version.commons-cli>1.5.0</version.commons-cli>
- <commons-codec.version>1.15</commons-codec.version>
+ <version.commons-codec>1.15</version.commons-codec>
<version.commons-collections>3.2.2</version.commons-collections>
<version.commons-dbcp2>2.9.0</version.commons-dbcp2>
<version.commons-discovery>0.5</version.commons-discovery>
<version.commons-fileupload>1.4</version.commons-fileupload>
- <commons-io.version>2.11.0</commons-io.version>
- <jcs.version>2.1</jcs.version>
- <commons-lang3.version>3.12.0</commons-lang3.version>
+ <version.commons-io>2.11.0</version.commons-io>
+ <version.commons-jcs-cache>2.1</version.commons-jcs-cache>
+ <version.commons-lang3>3.12.0</version.commons-lang3>
<version.commons-net>3.8.0</version.commons-net>
- <commons-pool.version>2.11.1</commons-pool.version>
+ <version.commons-pool>2.11.1</version.commons-pool>
<!-- Java SE version -->
<maven.compiler.source>11</maven.compiler.source>
@@ -196,40 +196,40 @@
<!-- Jackson and snakeyaml required by OpenAPI Impl -->
<version.jackson>2.14.1</version.jackson>
- <snakeyaml.version>1.33</snakeyaml.version>
+ <version.snakeyaml>1.33</version.snakeyaml>
<!-- Jakarta EE API -->
<!-- we currently rely on Mail API from Geronimo, this might change in the
future -->
- <geronimo-mail_2.1_spec.version>1.0.0-M1</geronimo-mail_2.1_spec.version>
+ <version.geronimo-mail_2.1_spec>1.0.0-M1</version.geronimo-mail_2.1_spec>
<!-- Jakarta EE Impl. -->
<tomcat.version>10.0.27</tomcat.version>
<!-- com.sun -->
- <saaj-impl.version>2.0.1</saaj-impl.version>
+ <version.impl.saaj>2.0.1</version.impl.saaj>
<!-- org.apache -->
- <org.apache.activemq.version>5.16.5</org.apache.activemq.version>
- <batchee.version>1.0.2</batchee.version>
+ <version.activemq>5.16.5</version.activemq>
+ <version.batchee>1.0.2</version.batchee>
<version.bval>2.0.6</version.bval>
- <cxf.version>3.5.5</cxf.version>
+ <version.cxf>3.5.5</version.cxf>
<version.geronimo.components>3.1.5</version.geronimo.components>
<!-- we currently rely on Mail Impl. from Geronimo, this might change in
the future -->
<version.geronimo-mail_2.1_provider>1.0.0</version.geronimo-mail_2.1_provider>
<version.johnzon>1.2.19</version.johnzon>
- <myfaces.version>3.0.2</myfaces.version>
+ <version.myfaces>3.0.2</version.myfaces>
<version.openjpa>3.2.2</version.openjpa>
- <openwebbeans.version>2.0.27</openwebbeans.version>
- <wss4j.version>3.0.0</wss4j.version>
- <santuario-xmlsec.version>3.0.1</santuario-xmlsec.version>
+ <version.openwebbeans>2.0.27</version.openwebbeans>
<!-- org.eclipse -->
<version.eclipselink>3.0.3</version.eclipselink>
<!-- org.glassfish -->
- <mojarra.version>3.0.2</mojarra.version>
+ <version.mojarra>3.0.2</version.mojarra>
<!-- org.hibernate -->
<version.hibernate.orm>6.1.4.Final</version.hibernate.orm>
<version.hibernate.validator>7.0.5.Final</version.hibernate.validator>
<!-- Other API and Impl. not in Jakarta EE -->
-
<geronimo-jcache_1.0_spec.version>1.0-alpha-1</geronimo-jcache_1.0_spec.version>
+ <version.wss4j>3.0.0</version.wss4j>
+ <version.xmlsec>3.0.1</version.xmlsec>
+
<version.geronimo-jcache_1.0_spec>1.0-alpha-1</version.geronimo-jcache_1.0_spec>
<version.krazo>2.0.2</version.krazo>
<version.deltaspike>1.9.6</version.deltaspike>
@@ -1134,52 +1134,52 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>${jetty.version}</version>
+ <version>${version.jetty}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-continuation</artifactId>
- <version>${jetty.version}</version>
+ <version>${version.jetty}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jsp-2.1</artifactId>
- <version>${jetty.version}</version>
+ <version>${version.jetty}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-plus</artifactId>
- <version>${jetty.version}</version>
+ <version>${version.jetty}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jndi</artifactId>
- <version>${jetty.version}</version>
+ <version>${version.jetty}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
- <version>${jetty.version}</version>
+ <version>${version.jetty}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId>
- <version>${jetty.version}</version>
+ <version>${version.jetty}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
- <version>${jetty.version}</version>
+ <version>${version.jetty}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
- <version>${jetty.version}</version>
+ <version>${version.jetty}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>${jetty.version}</version>
+ <version>${version.jetty}</version>
</dependency>
<dependency>
<groupId>org.apache.bval</groupId>
@@ -1200,7 +1200,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>${commons-logging.version}</version>
+ <version>${version.commons-logging}</version>
<exclusions>
<exclusion>
<groupId>jakarta.servlet</groupId>
@@ -1259,7 +1259,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-jdbc-store</artifactId>
- <version>${org.apache.activemq.version}</version>
+ <version>${version.activemq}</version>
<exclusions>
<exclusion>
<groupId>org.apache.derby</groupId>
@@ -1319,7 +1319,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-openwire-legacy</artifactId>
- <version>${org.apache.activemq.version}</version>
+ <version>${version.activemq}</version>
</dependency>
<dependency>
<groupId>xalan</groupId>
@@ -1380,7 +1380,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-mail_2.1_spec</artifactId>
- <version>${geronimo-mail_2.1_spec.version}</version>
+ <version>${version.geronimo-mail_2.1_spec}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.mail</groupId>
@@ -1409,12 +1409,12 @@
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-finder-shaded</artifactId>
- <version>${xbeanVersion}</version>
+ <version>${version.xbean}</version>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-asm9-shaded</artifactId>
- <version>${xbeanVersion}</version>
+ <version>${version.xbean}</version>
<exclusions>
<exclusion>
<groupId>org.ow2.asm</groupId>
@@ -1429,12 +1429,12 @@
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-naming</artifactId>
- <version>${xbeanVersion}</version>
+ <version>${version.xbean}</version>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-bundleutils</artifactId>
- <version>${xbeanVersion}</version>
+ <version>${version.xbean}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -1445,12 +1445,12 @@
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
- <version>${xbeanVersion}</version>
+ <version>${version.xbean}</version>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-reflect</artifactId>
- <version>${xbeanVersion}</version>
+ <version>${version.xbean}</version>
<exclusions>
<exclusion>
<groupId>mx4j</groupId>
@@ -1482,12 +1482,12 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
- <version>${commons-pool.version}</version>
+ <version>${version.commons-pool}</version>
</dependency>
<dependency>
<artifactId>xmlsec</artifactId>
<groupId>org.apache.santuario</groupId>
- <version>${santuario-xmlsec.version}</version>
+ <version>${version.xmlsec}</version>
</dependency>
<dependency>
<groupId>wsdl4j</groupId>
@@ -1599,12 +1599,12 @@
<dependency>
<artifactId>slf4j-api</artifactId>
<groupId>org.slf4j</groupId>
- <version>${slf4j.version}</version>
+ <version>${version.slf4j}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
- <version>${slf4j.version}</version>
+ <version>${version.slf4j}</version>
<exclusions>
<exclusion>
<artifactId>slf4j-api</artifactId>
@@ -1615,7 +1615,7 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
+ <version>${version.log4j}</version>
</dependency>
<dependency>
<artifactId>commons-collections</artifactId>
@@ -1625,7 +1625,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>${commons-codec.version}</version>
+ <version>${version.commons-codec}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -1646,7 +1646,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-impl</artifactId>
- <version>${openwebbeans.version}</version>
+ <version>${version.openwebbeans}</version>
<classifier>jakarta</classifier>
<exclusions>
<exclusion>
@@ -1662,7 +1662,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-jsf</artifactId>
- <version>${openwebbeans.version}</version>
+ <version>${version.openwebbeans}</version>
<classifier>jakarta</classifier>
<exclusions>
<exclusion>
@@ -1674,7 +1674,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-spi</artifactId>
- <version>${openwebbeans.version}</version>
+ <version>${version.openwebbeans}</version>
<classifier>jakarta</classifier>
<exclusions>
<exclusion>
@@ -1691,7 +1691,7 @@
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-ejb</artifactId>
<classifier>jakarta</classifier>
- <version>${openwebbeans.version}</version>
+ <version>${version.openwebbeans}</version>
<exclusions>
<exclusion>
<!-- impl references a non jakarta classifier version -->
@@ -1708,7 +1708,7 @@
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-ee</artifactId>
<classifier>jakarta</classifier>
- <version>${openwebbeans.version}</version>
+ <version>${version.openwebbeans}</version>
<exclusions>
<exclusion>
<!-- impl references a non jakarta classifier version -->
@@ -1729,7 +1729,7 @@
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-web</artifactId>
<classifier>jakarta</classifier>
- <version>${openwebbeans.version}</version>
+ <version>${version.openwebbeans}</version>
<exclusions>
<exclusion>
<!-- impl references a non jakarta classifier version -->
@@ -1746,7 +1746,7 @@
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-el22</artifactId>
<classifier>jakarta</classifier>
- <version>${openwebbeans.version}</version>
+ <version>${version.openwebbeans}</version>
<exclusions>
<exclusion>
<groupId>org.apache.openwebbeans</groupId>
@@ -1758,7 +1758,7 @@
<artifactId>openwebbeans-ee-common</artifactId>
<groupId>org.apache.openwebbeans</groupId>
<classifier>jakarta</classifier>
- <version>${openwebbeans.version}</version>
+ <version>${version.openwebbeans}</version>
<exclusions>
<exclusion>
<!-- impl references a non jakarta classifier version -->
@@ -1856,7 +1856,7 @@
<dependency>
<artifactId>commons-lang3</artifactId>
<groupId>org.apache.commons</groupId>
- <version>${commons-lang3.version}</version>
+ <version>${version.commons-lang3}</version>
</dependency>
<dependency>
<artifactId>commons-lang</artifactId>
@@ -1866,7 +1866,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>${commons-io.version}</version>
+ <version>${version.commons-io}</version>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.schema</groupId>
@@ -1876,7 +1876,7 @@
<dependency>
<groupId>org.ehcache</groupId>
<artifactId>ehcache</artifactId>
- <version>${ehcache.version}</version>
+ <version>${version.ehcache}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
@@ -1993,7 +1993,7 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
- <version>${snakeyaml.version}</version>
+ <version>${version.snakeyaml}</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/server/openejb-bonecp/pom.xml b/server/openejb-bonecp/pom.xml
index e714d9e60b..cb3d6db462 100644
--- a/server/openejb-bonecp/pom.xml
+++ b/server/openejb-bonecp/pom.xml
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
+ <version>${version.slf4j}</version>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/server/openejb-cxf/pom.xml b/server/openejb-cxf/pom.xml
index 0be1de6ded..59a4e5d7b1 100644
--- a/server/openejb-cxf/pom.xml
+++ b/server/openejb-cxf/pom.xml
@@ -69,7 +69,7 @@
<dependency>
<groupId>org.apache.santuario</groupId>
<artifactId>xmlsec</artifactId>
- <version>${santuario-xmlsec.version}</version>
+ <version>${version.xmlsec}</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.woodstox</groupId>
@@ -81,7 +81,7 @@
<dependency>
<groupId>org.apache.wss4j</groupId>
<artifactId>wss4j-ws-security-dom</artifactId>
- <version>${wss4j.version}</version>
+ <version>${version.wss4j}</version>
<exclusions>
<exclusion>
<groupId>org.apache.santuario</groupId>
@@ -130,12 +130,12 @@
<dependency>
<groupId>org.apache.wss4j</groupId>
<artifactId>wss4j-policy</artifactId>
- <version>${wss4j.version}</version>
+ <version>${version.wss4j}</version>
</dependency>
<dependency>
<groupId>org.apache.wss4j</groupId>
<artifactId>wss4j-ws-security-stax</artifactId>
- <version>${wss4j.version}</version>
+ <version>${version.wss4j}</version>
<exclusions>
<exclusion>
<groupId>net.sf.ehcache</groupId>
@@ -150,7 +150,7 @@
<dependency>
<groupId>org.apache.wss4j</groupId>
<artifactId>wss4j-ws-security-policy-stax</artifactId>
- <version>${wss4j.version}</version>
+ <version>${version.wss4j}</version>
<exclusions>
<exclusion>
<groupId>net.sf.ehcache</groupId>
@@ -202,7 +202,7 @@
<dependency>
<groupId>com.sun.xml.messaging.saaj</groupId>
<artifactId>saaj-impl</artifactId>
- <version>${saaj-impl.version}</version>
+ <version>${version.impl.saaj}</version>
<exclusions>
<exclusion>
<groupId>jakarta.activation</groupId>
diff --git a/server/openejb-http/pom.xml b/server/openejb-http/pom.xml
index 95054be065..aa6ed2a53f 100644
--- a/server/openejb-http/pom.xml
+++ b/server/openejb-http/pom.xml
@@ -137,13 +137,13 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>${jetty.version}</version>
+ <version>${version.jetty}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>${jetty.version}</version>
+ <version>${version.jetty}</version>
<optional>true</optional>
</dependency>
<dependency>
diff --git a/server/openejb-webservices/pom.xml
b/server/openejb-webservices/pom.xml
index 70b79e5053..d505979dff 100644
--- a/server/openejb-webservices/pom.xml
+++ b/server/openejb-webservices/pom.xml
@@ -73,7 +73,7 @@
<dependency>
<groupId>com.sun.xml.messaging.saaj</groupId>
<artifactId>saaj-impl</artifactId>
- <version>${saaj-impl.version}</version>
+ <version>${version.impl.saaj}</version>
</dependency>
<!-- spec dependencies -->
diff --git a/tck/bval-embedded/pom.xml b/tck/bval-embedded/pom.xml
index 501563cfd6..5d7621884d 100644
--- a/tck/bval-embedded/pom.xml
+++ b/tck/bval-embedded/pom.xml
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
- <version>${slf4j.version}</version>
+ <version>${version.slf4j}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/tck/cdi-embedded/pom.xml b/tck/cdi-embedded/pom.xml
index e00f0f9b02..967ce93368 100644
--- a/tck/cdi-embedded/pom.xml
+++ b/tck/cdi-embedded/pom.xml
@@ -36,13 +36,13 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>${myfaces.version}</version>
+ <version>${version.myfaces}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>${myfaces.version}</version>
+ <version>${version.myfaces}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -101,7 +101,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-porting</artifactId>
- <version>${openwebbeans.version}</version>
+ <version>${version.openwebbeans}</version>
<classifier>jakarta</classifier>
<scope>test</scope>
<exclusions>
@@ -187,7 +187,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-jsf</artifactId>
- <version>${openwebbeans.version}</version>
+ <version>${version.openwebbeans}</version>
<classifier>jakarta</classifier>
<scope>test</scope>
</dependency>
diff --git a/tck/cdi-tomee/pom.xml b/tck/cdi-tomee/pom.xml
index 546e36bccb..7e456dcb0a 100644
--- a/tck/cdi-tomee/pom.xml
+++ b/tck/cdi-tomee/pom.xml
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>${myfaces.version}</version>
+ <version>${version.myfaces}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -82,7 +82,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-porting</artifactId>
- <version>${openwebbeans.version}</version>
+ <version>${version.openwebbeans}</version>
<classifier>jakarta</classifier>
<scope>test</scope>
<exclusions>
@@ -164,13 +164,13 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jcache_1.0_spec</artifactId>
- <version>${geronimo-jcache_1.0_spec.version}</version>
+ <version>${version.geronimo-jcache_1.0_spec}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-jcs-jcache</artifactId>
- <version>${jcs.version}</version>
+ <version>${version.commons-jcs-cache}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -269,4 +269,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/tck/cdi-tomee/src/test/resources/arquillian.xml
b/tck/cdi-tomee/src/test/resources/arquillian.xml
index 03742519b0..661f35399d 100644
--- a/tck/cdi-tomee/src/test/resources/arquillian.xml
+++ b/tck/cdi-tomee/src/test/resources/arquillian.xml
@@ -56,7 +56,7 @@
<property name="additionalLibs">
target/test-classes/org
target/test-classes/META-INF
-
mvn:org.apache.openwebbeans:openwebbeans-porting:${openwebbeans.version}:jar:jakarta
+
mvn:org.apache.openwebbeans:openwebbeans-porting:${version.openwebbeans}:jar:jakarta
mvn:jakarta.enterprise:cdi-tck-ext-lib:${cdi-tck.version}
</property>
</configuration>
diff --git a/tck/microprofile-tck/rest-client/pom.xml
b/tck/microprofile-tck/rest-client/pom.xml
index d5ddcd0868..200ced13c3 100644
--- a/tck/microprofile-tck/rest-client/pom.xml
+++ b/tck/microprofile-tck/rest-client/pom.xml
@@ -29,7 +29,7 @@
<name>TomEE :: TCK :: MicroProfile Rest Client TCK</name>
<properties>
- <!--<jetty-tck.version>${jetty.version}</jetty-tck.version>-->
+ <!--<jetty-tck.version>${version.jetty}</jetty-tck.version>-->
<jetty-tck.version>9.2.28.v20190418</jetty-tck.version>
</properties>
diff --git a/tomee/apache-tomee/pom.xml b/tomee/apache-tomee/pom.xml
index daa9bf5a85..6c8d652fee 100644
--- a/tomee/apache-tomee/pom.xml
+++ b/tomee/apache-tomee/pom.xml
@@ -353,7 +353,7 @@
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-asm9-shaded</artifactId>
- <version>${xbeanVersion}</version>
+ <version>${version.xbean}</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
@@ -383,7 +383,7 @@
<properties>
<tomee.workdir>${webprofile.work-dir}</tomee.workdir>
<tomee.webapp>tomee-webapp</tomee.webapp>
- <remove.datestamp>${tomee.version}, ${project.version},
${cxf.version}</remove.datestamp>
+ <remove.datestamp>${tomee.version}, ${project.version},
${version.cxf}</remove.datestamp>
<jdk.attach.allowAttachSelf>true</jdk.attach.allowAttachSelf>
</properties>
<source>
@@ -401,7 +401,7 @@
<properties>
<tomee.workdir>${plus.work-dir}</tomee.workdir>
<tomee.webapp>tomee-plus-webapp</tomee.webapp>
- <remove.datestamp>${tomee.version}, ${project.version},
${cxf.version}</remove.datestamp>
+ <remove.datestamp>${tomee.version}, ${project.version},
${version.cxf}</remove.datestamp>
<jdk.attach.allowAttachSelf>true</jdk.attach.allowAttachSelf>
</properties>
<source>
@@ -419,7 +419,7 @@
<properties>
<tomee.workdir>${plume.work-dir}</tomee.workdir>
<tomee.webapp>tomee-plume-webapp</tomee.webapp>
- <remove.datestamp>${tomee.version}, ${project.version},
${cxf.version}</remove.datestamp>
+ <remove.datestamp>${tomee.version}, ${project.version},
${version.cxf}</remove.datestamp>
<jdk.attach.allowAttachSelf>true</jdk.attach.allowAttachSelf>
</properties>
<source>
@@ -437,7 +437,7 @@
<properties>
<tomee.workdir>${microprofile.work-dir}</tomee.workdir>
<tomee.webapp>tomee-microprofile-webapp</tomee.webapp>
- <remove.datestamp>${tomee.version}, ${project.version},
${cxf.version}</remove.datestamp>
+ <remove.datestamp>${tomee.version}, ${project.version},
${version.cxf}</remove.datestamp>
<jdk.attach.allowAttachSelf>true</jdk.attach.allowAttachSelf>
</properties>
<source>
@@ -718,7 +718,7 @@
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-asm9-shaded</artifactId>
- <version>${xbeanVersion}</version>
+ <version>${version.xbean}</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
@@ -748,7 +748,7 @@
<properties>
<tomee.workdir>${plume.work-dir}</tomee.workdir>
<tomee.webapp>tomee-plume-webapp</tomee.webapp>
- <remove.datestamp>${tomee.version}, ${project.version},
${cxf.version}</remove.datestamp>
+ <remove.datestamp>${tomee.version}, ${project.version},
${version.cxf}</remove.datestamp>
</properties>
<source>
new commands.SetupCommand(pom: this, log: log, project:
project, ant: ant, properties: properties).execute()
diff --git a/tomee/pom.xml b/tomee/pom.xml
index 539bbfa10e..cf21e8435b 100644
--- a/tomee/pom.xml
+++ b/tomee/pom.xml
@@ -150,7 +150,7 @@
<dependency>
<artifactId>commons-beanutils</artifactId>
<groupId>commons-beanutils</groupId>
- <version>${commons-beanutils.version}</version>
+ <version>${version.commons-beanutils}</version>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
@@ -211,13 +211,13 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-jsf</artifactId>
- <version>${openwebbeans.version}</version>
+ <version>${version.openwebbeans}</version>
<classifier>jakarta</classifier>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>${myfaces.version}</version>
+ <version>${version.myfaces}</version>
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
@@ -228,7 +228,7 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>${myfaces.version}</version>
+ <version>${version.myfaces}</version>
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
@@ -308,7 +308,7 @@
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.faces</artifactId>
- <version>${mojarra.version}</version>
+ <version>${version.mojarra}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
diff --git a/tomee/tomee-loader/pom.xml b/tomee/tomee-loader/pom.xml
index a1dd904e20..1096e180b2 100644
--- a/tomee/tomee-loader/pom.xml
+++ b/tomee/tomee-loader/pom.xml
@@ -90,7 +90,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
- <version>${log4j2.version}</version>
+ <version>${version.log4j2}</version>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml
b/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml
index 53ef512976..783904feec 100644
--- a/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml
+++ b/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml
@@ -42,7 +42,7 @@
<dependency><!-- needed by myfaces -->
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
- <version>${commons-beanutils.version}</version>
+ <version>${version.commons-beanutils}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -301,7 +301,7 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>${myfaces.version}</version>
+ <version>${version.myfaces}</version>
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
@@ -312,7 +312,7 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>${myfaces.version}</version>
+ <version>${version.myfaces}</version>
<exclusions>
<exclusion>
<groupId>org.apache.myfaces.core</groupId>
@@ -331,7 +331,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-spi</artifactId>
- <version>${openwebbeans.version}</version>
+ <version>${version.openwebbeans}</version>
<classifier>jakarta</classifier>
<exclusions>
<exclusion>
@@ -343,7 +343,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-impl</artifactId>
- <version>${openwebbeans.version}</version>
+ <version>${version.openwebbeans}</version>
<classifier>jakarta</classifier>
<exclusions>
<exclusion>
@@ -355,7 +355,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-web</artifactId>
- <version>${openwebbeans.version}</version>
+ <version>${version.openwebbeans}</version>
<classifier>jakarta</classifier>
<exclusions>
<exclusion>
@@ -367,7 +367,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-el22</artifactId>
- <version>${openwebbeans.version}</version>
+ <version>${version.openwebbeans}</version>
<classifier>jakarta</classifier>
<exclusions>
<exclusion>
@@ -379,7 +379,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-jsf</artifactId>
- <version>${openwebbeans.version}</version>
+ <version>${version.openwebbeans}</version>
<classifier>jakarta</classifier>
<exclusions>
<exclusion>
diff --git a/tomee/tomee-myfaces/pom.xml b/tomee/tomee-myfaces/pom.xml
index e1fe46566a..2e2d43a2d9 100644
--- a/tomee/tomee-myfaces/pom.xml
+++ b/tomee/tomee-myfaces/pom.xml
@@ -41,7 +41,7 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>${myfaces.version}</version>
+ <version>${version.myfaces}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
diff --git a/tomee/tomee-plume-webapp/pom.xml b/tomee/tomee-plume-webapp/pom.xml
index 5dd7c12ce9..687cce7808 100644
--- a/tomee/tomee-plume-webapp/pom.xml
+++ b/tomee/tomee-plume-webapp/pom.xml
@@ -56,7 +56,7 @@
<dependency><!-- needed by myfaces -->
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
- <version>${commons-beanutils.version}</version>
+ <version>${version.commons-beanutils}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -361,7 +361,7 @@
<dependency>
<groupId>org.apache.batchee</groupId>
<artifactId>batchee-jbatch</artifactId>
- <version>${batchee.version}</version>
+ <version>${version.batchee}</version>
<scope>runtime</scope>
<classifier>jakarta</classifier>
<exclusions>
@@ -374,13 +374,13 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jcache_1.0_spec</artifactId>
- <version>${geronimo-jcache_1.0_spec.version}</version>
+ <version>${version.geronimo-jcache_1.0_spec}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-jcs-jcache</artifactId>
- <version>${jcs.version}</version>
+ <version>${version.commons-jcs-cache}</version>
<scope>runtime</scope>
</dependency>
<dependency>
diff --git a/tomee/tomee-plus-webapp/pom.xml b/tomee/tomee-plus-webapp/pom.xml
index 44bae2e6cc..566fcb9b49 100644
--- a/tomee/tomee-plus-webapp/pom.xml
+++ b/tomee/tomee-plus-webapp/pom.xml
@@ -53,7 +53,7 @@
<dependency><!-- needed by myfaces -->
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
- <version>${commons-beanutils.version}</version>
+ <version>${version.commons-beanutils}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -361,7 +361,7 @@
<dependency>
<groupId>org.apache.batchee</groupId>
<artifactId>batchee-jbatch</artifactId>
- <version>${batchee.version}</version>
+ <version>${version.batchee}</version>
<scope>runtime</scope>
<classifier>jakarta</classifier>
<exclusions>
@@ -374,13 +374,13 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jcache_1.0_spec</artifactId>
- <version>${geronimo-jcache_1.0_spec.version}</version>
+ <version>${version.geronimo-jcache_1.0_spec}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-jcs-jcache</artifactId>
- <version>${jcs.version}</version>
+ <version>${version.commons-jcs-cache}</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -407,7 +407,7 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>${myfaces.version}</version>
+ <version>${version.myfaces}</version>
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
@@ -418,7 +418,7 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>${myfaces.version}</version>
+ <version>${version.myfaces}</version>
<exclusions>
<exclusion>
<groupId>org.apache.myfaces.core</groupId>
diff --git a/tomee/tomee-security/pom.xml b/tomee/tomee-security/pom.xml
index 92a448bf3c..10cea92059 100644
--- a/tomee/tomee-security/pom.xml
+++ b/tomee/tomee-security/pom.xml
@@ -34,7 +34,7 @@
<properties>
<!-- Reset Jetty Version to not clash with HtmlUnit -->
- <jetty.version />
+ <version.jetty />
</properties>
<dependencies>
diff --git a/tomee/tomee-webaccess/pom.xml b/tomee/tomee-webaccess/pom.xml
index 3a03db7781..c49fce02fc 100644
--- a/tomee/tomee-webaccess/pom.xml
+++ b/tomee/tomee-webaccess/pom.xml
@@ -113,7 +113,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>${commons-io.version}</version>
+ <version>${version.commons-io}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -191,7 +191,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>${commons-codec.version}</version>
+ <version>${version.commons-codec}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
diff --git a/tomee/tomee-webapp/pom.xml b/tomee/tomee-webapp/pom.xml
index ebe124991f..5178273800 100644
--- a/tomee/tomee-webapp/pom.xml
+++ b/tomee/tomee-webapp/pom.xml
@@ -139,7 +139,7 @@
<dependency><!-- needed by myfaces -->
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
- <version>${commons-beanutils.version}</version>
+ <version>${version.commons-beanutils}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -418,7 +418,7 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>${myfaces.version}</version>
+ <version>${version.myfaces}</version>
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
@@ -429,7 +429,7 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>${myfaces.version}</version>
+ <version>${version.myfaces}</version>
<exclusions>
<exclusion>
<groupId>org.apache.myfaces.core</groupId>
diff --git a/utils/log4j2-tomee/pom.xml b/utils/log4j2-tomee/pom.xml
index 2ab9fe9399..a333a195ba 100644
--- a/utils/log4j2-tomee/pom.xml
+++ b/utils/log4j2-tomee/pom.xml
@@ -30,7 +30,7 @@
<properties>
<tomee.build.name>${project.groupId}.util.log4j2</tomee.build.name>
- <log4j2.version>2.3</log4j2.version>
+ <version.log4j2>2.3</version.log4j2>
<log4j.groupId>org.apache.logging.log4j</log4j.groupId>
</properties>
@@ -38,13 +38,13 @@
<dependency>
<groupId>${log4j.groupId}</groupId>
<artifactId>log4j-api</artifactId>
- <version>${log4j2.version}</version>
+ <version>${version.log4j2}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>${log4j.groupId}</groupId>
<artifactId>log4j-core</artifactId>
- <version>${log4j2.version}</version>
+ <version>${version.log4j2}</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/utils/openejb-core-hibernate/pom.xml
b/utils/openejb-core-hibernate/pom.xml
index af17bdeb91..820b45e3f0 100644
--- a/utils/openejb-core-hibernate/pom.xml
+++ b/utils/openejb-core-hibernate/pom.xml
@@ -107,7 +107,7 @@
<dependency>
<groupId>org.ehcache</groupId>
<artifactId>ehcache</artifactId>
- <version>${ehcache.version}</version>
+ <version>${version.ehcache}</version>
<exclusions>
<!-- Exclude some weird transient dependency to jaxb-runtime from
ehcache -->
<exclusion>
@@ -119,18 +119,18 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
- <version>${slf4j.version}</version>
+ <version>${version.slf4j}</version>
</dependency>
<!--
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
+ <version>${version.slf4j}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
+ <version>${version.log4j}</version>
</dependency>
-->
</dependencies>
