You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rz...@apache.org on 2022/09/29 12:21:06 UTC
[tomee] 01/01: Merge branch 'main' into props
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch TOMEE-4053
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 5f819a0fa7e760c0c42a1245c37ab3dd1df0dd7f
Merge: 05461c0529 b88e0a6b9c
Author: Richard Zowalla <ri...@hs-heilbronn.de>
AuthorDate: Thu Sep 29 14:19:33 2022 +0200
Merge branch 'main' into props
# Conflicts:
# pom.xml
boms/tomee-microprofile-api/pom.xml | 4 ++--
boms/tomee-microprofile/pom.xml | 10 +++++-----
boms/tomee-plume-api/pom.xml | 4 ++--
boms/tomee-plume/pom.xml | 10 +++++-----
boms/tomee-plus-api/pom.xml | 4 ++--
boms/tomee-plus/pom.xml | 10 +++++-----
boms/tomee-webprofile/pom.xml | 6 +++---
pom.xml | 4 ++--
8 files changed, 26 insertions(+), 26 deletions(-)
diff --cc pom.xml
index 63cff21850,dac96f16bb..f3e91d6eaa
--- a/pom.xml
+++ b/pom.xml
@@@ -156,90 -173,98 +156,90 @@@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <!-- Apache Commons -->
- <commons-beanutils.version>1.9.4</commons-beanutils.version>
- <commons-cli.version>1.5.0</commons-cli.version>
- <commons-logging.version>1.2</commons-logging.version>
- <commons-logging-api.version>1.1</commons-logging-api.version>
- <commons-dbcp.version>2.9.0</commons-dbcp.version>
- <commons-pool.version>2.11.1</commons-pool.version>
- <commons-collections.version>3.2.2</commons-collections.version>
- <commons-codec.version>1.15</commons-codec.version>
- <commons-fileupload.version>1.4</commons-fileupload.version>
- <commons-discovery.version>0.5</commons-discovery.version>
- <commons-lang3.version>3.12.0</commons-lang3.version>
- <commons-io.version>2.11.0</commons-io.version>
- <commons-net.version>3.8.0</commons-net.version>
-
- <bval.version>2.0.6</bval.version>
- <org.apache.activemq.version>5.16.5</org.apache.activemq.version>
- <junit.version>4.13.2</junit.version>
- <junit.jupiter.version>5.8.2</junit.jupiter.version>
- <org.apache.axis2.version>1.4.1</org.apache.axis2.version>
- <scannotation.version>1.0.2</scannotation.version>
- <geronimo.connector.version>3.1.5</geronimo.connector.version>
- <geronimo-osgi.version>1.1</geronimo-osgi.version>
- <myfaces.version>3.0.2</myfaces.version>
- <mojarra.version>3.0.2</mojarra.version>
- <slf4j.version>1.7.36</slf4j.version>
- <log4j.version>1.2.17</log4j.version>
- <log4j2.version>2.19.0</log4j2.version>
- <osgi.framework.version>4.2.0</osgi.framework.version>
- <derby.version>10.14.2.0</derby.version>
- <version.hsqldb>2.7.0</version.hsqldb>
- <version.axiom>1.3.0</version.axiom>
- <version.xalan>2.7.2</version.xalan>
- <version.hibernate.orm>6.1.3.Final</version.hibernate.orm>
- <version.hibernate.validator>7.0.5.Final</version.hibernate.validator>
- <version.eclipselink>3.0.3</version.eclipselink>
- <version.groovy>2.4.12</version.groovy>
- <version.ecj>4.6.1</version.ecj>
+ <!-- Plugins -->
+ <version.maven-bundle-plugin>3.3.0</version.maven-bundle-plugin>
+ <version.maven-javadoc-plugin>3.3.2</version.maven-javadoc-plugin>
+ <version.asciidoclet>1.5.0</version.asciidoclet>
- <!-- arquillian related -->
- <version.arquillian.bom>1.1.13.Final</version.arquillian.bom>
- <version.shrinkwrap.resolver.bom>3.1.4</version.shrinkwrap.resolver.bom>
-
- <!-- Micro Profile -->
- <microprofile.version>5.0</microprofile.version>
-
- <microprofile.config.version>3.0.2</microprofile.config.version>
- <microprofile.config.tck.version>3.0.2</microprofile.config.tck.version>
- <microprofile.config.impl.version>3.0.0</microprofile.config.impl.version>
-
- <microprofile.jwt.version>2.0</microprofile.jwt.version>
- <microprofile.jwt.tck.version>2.0</microprofile.jwt.tck.version>
- <microprofile.jwt.impl.version>${project.version}</microprofile.jwt.impl.version>
-
- <microprofile.fault-tolerance.version>4.0.1</microprofile.fault-tolerance.version>
- <microprofile.fault-tolerance.tck.version>4.0.1</microprofile.fault-tolerance.tck.version>
- <microprofile.fault-tolerance.impl.version>6.0.0</microprofile.fault-tolerance.impl.version>
-
- <microprofile.health.version>4.0</microprofile.health.version>
- <microprofile.health.tck.version>4.0</microprofile.health.tck.version>
- <microprofile.health.impl.version>4.0.0</microprofile.health.impl.version>
-
- <microprofile.metrics.version>4.0.1</microprofile.metrics.version>
- <microprofile.metrics.tck.version>4.0.1</microprofile.metrics.tck.version>
- <microprofile.metrics.impl.version>4.0.0</microprofile.metrics.impl.version>
-
- <microprofile.rest-client.version>3.0</microprofile.rest-client.version>
- <microprofile.rest-client.tck.version>3.0</microprofile.rest-client.tck.version>
- <microprofile.rest-client.impl.version>${cxf.version}</microprofile.rest-client.impl.version>
+ <!-- Java SE version -->
+ <maven.compiler.release>11</maven.compiler.release>
+ <maven.compiler.source>11</maven.compiler.source>
+ <maven.compiler.target>11</maven.compiler.target>
- <microprofile.openapi.version>3.0</microprofile.openapi.version>
- <microprofile.openapi.tck.version>3.0</microprofile.openapi.tck.version>
- <microprofile.openapi.impl.version>3.0.0</microprofile.openapi.impl.version>
+ <!-- Logging frameworks -->
+ <version.org.slf4j>1.7.36</version.org.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>
- <microprofile.opentracing.version>3.0</microprofile.opentracing.version>
- <microprofile.opentracing.tck.version>3.0</microprofile.opentracing.tck.version>
- <microprofile.opentracing.impl.version>3.0.0</microprofile.opentracing.impl.version>
- <opentracing.api>0.33.0</opentracing.api>
+ <!-- Apache Commons -->
+ <version.commons-beanutils>1.9.4</version.commons-beanutils>
+ <version.commons-cli>1.5.0</version.commons-cli>
+ <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>
+ <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>
+ <version.commons-pool2>2.11.1</version.commons-pool2>
+
+ <!-- JDBC Drivers -->
+ <version.org.apache.derby>10.16.1.1</version.org.apache.derby>
+ <version.org.hsqldb>2.7.0</version.org.hsqldb>
+
+ <!-- Micro Profile API -->
+ <version.org.eclipse.microprofile>5.0</version.org.eclipse.microprofile>
+ <version.org.eclipse.microprofile.config>3.0.2</version.org.eclipse.microprofile.config>
+ <version.org.eclipse.microprofile.fault-tolerance>4.0.1</version.org.eclipse.microprofile.fault-tolerance>
+ <version.org.eclipse.microprofile.health>4.0</version.org.eclipse.microprofile.health>
+ <version.org.eclipse.microprofile.jwt>2.0</version.org.eclipse.microprofile.jwt>
+ <version.org.eclipse.microprofile.metrics>4.0.1</version.org.eclipse.microprofile.metrics>
+ <version.org.eclipse.microprofile.openapi>3.0</version.org.eclipse.microprofile.openapi>
+ <version.org.eclipse.microprofile.opentracing>3.0</version.org.eclipse.microprofile.opentracing>
+ <version.org.eclipse.microprofile.rest-client>3.0</version.org.eclipse.microprofile.rest-client>
+
+ <version.io.opentracing>0.33.0</version.io.opentracing>
+
+ <!-- Micro Profile Impl -->
+ <version.io.smallrye.config>3.0.0</version.io.smallrye.config>
+ <version.io.smallrye.fault-tolerance>6.0.0</version.io.smallrye.fault-tolerance>
+ <version.io.smallrye.health>4.0.0</version.io.smallrye.health>
+ <version.io.smallrye.metrics>4.0.0</version.io.smallrye.metrics>
+ <version.io.smallrye.openapi>3.0.0</version.io.smallrye.openapi>
+ <version.io.smallrye.opentracing>3.0.0</version.io.smallrye.opentracing>
+
+ <!-- Jakarta EE API -->
+ <version.jakarta.xml.bind>3.0.1</version.jakarta.xml.bind>
+
+ <!-- Jakarta EE Impl -->
+ <tomcat.version>10.0.23</tomcat.version>
+ <version.com.sun.activation>2.0.1</version.com.sun.activation>
+ <version.com.sun.xml.messaging.saaj>2.0.1</version.com.sun.xml.messaging.saaj>
+ <version.org.apache.activemq>5.16.5</version.org.apache.activemq>
+ <version.org.apache.batchee>1.0.2</version.org.apache.batchee>
+ <version.org.apache.bval>2.0.6</version.org.apache.bval>
- <version.org.apache.cxf>3.5.3</version.org.apache.cxf>
++ <version.org.apache.cxf>3.5.0</version.org.apache.cxf>
+ <version.org.apache.geronimo.components>3.1.5</version.org.apache.geronimo.components>
+ <version.org.apache.johnzon>1.2.19</version.org.apache.johnzon>
+ <version.org.apache.myfaces>3.0.2</version.org.apache.myfaces>
+ <version.org.apache.openjpa>3.2.2</version.org.apache.openjpa>
+ <version.org.apache.openwebbeans>2.0.27</version.org.apache.openwebbeans>
+ <version.org.apache.santuario>3.0.1</version.org.apache.santuario>
+ <version.org.eclipse.persistence>3.0.3</version.org.eclipse.persistence>
+ <version.org.glassfish.jaxb>3.0.2</version.org.glassfish.jaxb>
+ <version.org.glassfish.mojarra>3.0.2</version.org.glassfish.mojarra>
+ <version.org.hibernate.orm>6.1.3.Final</version.org.hibernate.orm>
+ <version.org.hibernate.validator>7.0.5.Final</version.org.hibernate.validator>
<!-- Jackson required by OpenAPI Impl -->
- <jackson.version>2.13.4</jackson.version>
- <jackson.dataformat.version>2.13.4</jackson.dataformat.version>
+ <version.com.fasterxml.jackson.core>2.13.4</version.com.fasterxml.jackson.core>
+ <version.com.fasterxml.jackson.dataformat>2.13.4</version.com.fasterxml.jackson.dataformat>
<!-- required by Jackson dataformat yaml -->
- <version.org.yaml.snakeyaml>1.32</version.org.yaml.snakeyaml>
- <snakeyaml.version>1.33</snakeyaml.version>
-
- <!-- Javadoc & Asciidoclet -->
- <javadoc.version>3.3.2</javadoc.version>
- <asciidoclet.version>1.5.0</asciidoclet.version>
-
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
- <maven.compiler.release>11</maven.compiler.release>
++ <version.org.yaml.snakeyaml>1.33</version.org.yaml.snakeyaml>
</properties>