[TOMEE-4053] Dependency properties cleanup (cherry pick from 9.x)
diff --git a/arquillian/arquillian-tomee-common/pom.xml b/arquillian/arquillian-tomee-common/pom.xml
index 986d266..630f264 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 9a477b1..702de28 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 fea09d2..9b8e476 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 c2ba965..53a4d5b 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 e922d32..ebb11e9 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 3de68f3..78322f2 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 82858c8..e5a6102 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 9c7c801..8539bac 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 2e9175c..642b9fd 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 c8d5d14..2e52d04 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 03e85d0..433eb5f 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 1171910..1f4a953 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 67cecb7..3a2c5d0 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 6d60a20..97c5592 100644
--- a/maven/jarstxt-maven-plugin/pom.xml
+++ b/maven/jarstxt-maven-plugin/pom.xml
@@ -50,7 +50,7 @@
<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 5d3e469..6977f3b 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 1e05d6e..0791975 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,7 +86,7 @@
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/tomee.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/tomee.git</developerConnection>
<url>http://git-wip-us.apache.org/repos/asf/tomee.git</url>
- <tag>tomee-project-9.0.0-M8</tag>
+ <tag>HEAD</tag>
</scm>
<properties>
@@ -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.5</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>
@@ -174,72 +174,62 @@
<maven.compiler.release>11</maven.compiler.release>
<!-- Micro Profile API -->
- <microprofile.version>5.0</microprofile.version>
- <microprofile.config.version>3.0.3</microprofile.config.version>
- <microprofile.config.tck.version>3.0.3</microprofile.config.tck.version>
- <microprofile.fault-tolerance.version>4.0.2</microprofile.fault-tolerance.version>
- <microprofile.fault-tolerance.tck.version>4.0.2</microprofile.fault-tolerance.tck.version>
- <microprofile.health.version>4.0.1</microprofile.health.version>
- <microprofile.health.tck.version>4.0.1</microprofile.health.tck.version>
- <microprofile.jwt.version>2.0</microprofile.jwt.version>
- <microprofile.jwt.tck.version>2.0</microprofile.jwt.tck.version>
- <microprofile.metrics.version>4.0.1</microprofile.metrics.version>
- <microprofile.metrics.tck.version>4.0.1</microprofile.metrics.tck.version>
- <microprofile.openapi.version>3.0</microprofile.openapi.version>
- <microprofile.openapi.tck.version>3.0</microprofile.openapi.tck.version>
- <microprofile.opentracing.version>3.0</microprofile.opentracing.version>
- <microprofile.opentracing.tck.version>3.0</microprofile.opentracing.tck.version>
- <microprofile.rest-client.version>3.0.1</microprofile.rest-client.version>
- <microprofile.rest-client.tck.version>3.0.1</microprofile.rest-client.tck.version>
+ <version.microprofile>5.0</version.microprofile>
+ <version.microprofile.config>3.0.2</version.microprofile.config>
+ <version.microprofile.fault-tolerance>4.0.2</version.microprofile.fault-tolerance>
+ <version.microprofile.health>4.0.1</version.microprofile.health>
+ <version.microprofile.jwt>2.0</version.microprofile.jwt>
+ <version.microprofile.metrics>4.0.1</version.microprofile.metrics>
+ <version.microprofile.openapi>3.0</version.microprofile.openapi>
+ <version.microprofile.opentracing>3.0</version.microprofile.opentracing>
+ <version.microprofile.rest-client>3.0.1</version.microprofile.rest-client>
- <opentracing.api>0.33.0</opentracing.api>
+ <version.io.opentracing>0.33.0</version.io.opentracing>
<!-- Micro Profile Impl. -->
- <microprofile.config.impl.version>3.0.0</microprofile.config.impl.version>
- <microprofile.fault-tolerance.impl.version>6.2.2</microprofile.fault-tolerance.impl.version>
- <microprofile.health.impl.version>4.0.1</microprofile.health.impl.version>
- <microprofile.metrics.impl.version>4.0.0</microprofile.metrics.impl.version>
- <microprofile.openapi.impl.version>3.0.1</microprofile.openapi.impl.version>
- <microprofile.opentracing.impl.version>3.0.3</microprofile.opentracing.impl.version>
-
- <microprofile.jwt.impl.version>${project.version}</microprofile.jwt.impl.version>
- <microprofile.rest-client.impl.version>${cxf.version}</microprofile.rest-client.impl.version>
+ <version.microprofile.impl.config>3.0.0</version.microprofile.impl.config>
+ <version.microprofile.impl.fault-tolerance>6.0.0</version.microprofile.impl.fault-tolerance>
+ <version.microprofile.impl.health>4.0.1</version.microprofile.impl.health>
+ <version.microprofile.impl.metrics>4.0.0</version.microprofile.impl.metrics>
+ <version.microprofile.impl.openapi>3.0.1</version.microprofile.impl.openapi>
+ <version.microprofile.impl.opentracing>3.0.0</version.microprofile.impl.opentracing>
<!-- 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>
- <geronimo-jcache_1.0_spec.version>1.0-alpha-1</geronimo-jcache_1.0_spec.version>
+ <!-- Other API and Impl. not in Jakarta EE -->
+ <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>
@@ -1058,6 +1048,61 @@
</pluginRepositories>
<dependencyManagement>
<dependencies>
+ <!-- Micro Profile API -->
+ <dependency>
+ <groupId>org.eclipse.microprofile.config</groupId>
+ <artifactId>microprofile-config-api</artifactId>
+ <version>${version.microprofile.config}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.fault-tolerance</groupId>
+ <artifactId>microprofile-fault-tolerance-api</artifactId>
+ <version>${version.microprofile.fault-tolerance}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.health</groupId>
+ <artifactId>microprofile-health-api</artifactId>
+ <version>${version.microprofile.health}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.jwt</groupId>
+ <artifactId>microprofile-jwt-auth-api</artifactId>
+ <version>${version.microprofile.jwt}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.metrics</groupId>
+ <artifactId>microprofile-metrics-api</artifactId>
+ <version>${version.microprofile.metrics}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.openapi</groupId>
+ <artifactId>microprofile-openapi-api</artifactId>
+ <version>${version.microprofile.openapi}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.opentracing</groupId>
+ <artifactId>microprofile-opentracing-api</artifactId>
+ <version>${version.microprofile.opentracing}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.rest.client</groupId>
+ <artifactId>microprofile-rest-client-api</artifactId>
+ <version>${version.microprofile.rest-client}</version>
+ </dependency>
+ <!-- Open Tracing API -->
+ <dependency>
+ <groupId>io.opentracing</groupId>
+ <artifactId>opentracing-api</artifactId>
+ <version>${version.io.opentracing}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.opentracing</groupId>
+ <artifactId>opentracing-mock</artifactId>
+ <version>${version.io.opentracing}</version>
+ </dependency>
+ <!-- Following dependencies remain to be cleaned up -->
+
+
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jakartaee-api</artifactId>
@@ -1089,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>
@@ -1155,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>
@@ -1214,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>
@@ -1274,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>
@@ -1335,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>
@@ -1364,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>
@@ -1384,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>
@@ -1400,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>
@@ -1437,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>
@@ -1554,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>
@@ -1570,7 +1615,7 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
+ <version>${version.log4j}</version>
</dependency>
<dependency>
<artifactId>commons-collections</artifactId>
@@ -1580,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>
@@ -1601,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>
@@ -1617,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>
@@ -1629,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>
@@ -1646,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 -->
@@ -1663,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 -->
@@ -1684,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 -->
@@ -1701,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>
@@ -1713,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 -->
@@ -1811,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>
@@ -1821,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>
@@ -1831,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>
@@ -1948,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 34973dd..3bc5f28 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 6715329..8863836 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>
@@ -147,12 +147,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>
@@ -167,7 +167,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>
@@ -219,7 +219,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 a0babf4..a1aac20 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 1974f92..c39607e 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 9d16660..3e3567f 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 5e17ce4..cfdfab2 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 bbe5c5b..c6946fd 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 0374251..661f353 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 c1713d1..0e17bf0 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 5a3134c..fe66828 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>
@@ -709,7 +709,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>
@@ -739,7 +739,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 e09279c..b09b3c5 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 18e0808..b9dddba 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 341cbac..ec284c8 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 571849c..b1f88e1 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 e8c44a4..0402e03 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 3ce97c6..fbd7e85 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 b155752..8e5d8dc 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 adf5057..2f27a5e 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 efba3e9..6e372ef 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 8ba0b16..b02fe5e 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 7982b6e..2bb0415 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>
