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/04/17 10:44:48 UTC
[tomee] branch tomee-8.x updated: TOMEE-3905 post release fixes
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch tomee-8.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/tomee-8.x by this push:
new 99344cdb9f TOMEE-3905 post release fixes
99344cdb9f is described below
commit 99344cdb9fe11bfc15f7eb959eaab5ff90b0bebd
Author: Cesar Hernandez <cf...@gmail.com>
AuthorDate: Thu Apr 14 16:45:04 2022 -0600
TOMEE-3905 post release fixes
---
examples/applet/pom.xml | 6 +++---
examples/bval-evaluation-redeployment/pom.xml | 2 --
examples/cdi-dynamic-inject/pom.xml | 4 ++--
examples/connector-ear/pom.xml | 3 +--
examples/mbean-auto-registration/pom.xml | 4 ++--
examples/mp-jsonb-configuration/pom.xml | 4 ++--
examples/pojo-webservice/pom.xml | 2 --
examples/pom.xml | 3 +++
examples/resources-declared-in-webapp/pom.xml | 3 +--
examples/resources-jmx-example/pom.xml | 3 +--
examples/resources-jmx-example/resources-jmx-ejb/pom.xml | 6 +++---
examples/rest-example-with-application/pom.xml | 3 +--
examples/rest-sse-example/pom.xml | 7 +++----
.../java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java | 6 ++----
examples/simple-ear/pom.xml | 3 +--
itests/ejb/pom.xml | 5 ++---
16 files changed, 27 insertions(+), 37 deletions(-)
diff --git a/examples/applet/pom.xml b/examples/applet/pom.xml
index ff7063f986..749dbc4237 100644
--- a/examples/applet/pom.xml
+++ b/examples/applet/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.superbiz.applet</groupId>
<artifactId>applet</artifactId>
<packaging>war</packaging>
- <version>8.0.11-SNAPSHOT</version>
+ <version>8.0.12-SNAPSHOT</version>
<name>TomEE :: Web Examples :: Signed Applet EJB Client</name>
<url>http://tomee.apache.org</url>
<properties>
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>openejb-client</artifactId>
- <version>8.0.11-SNAPSHOT</version>
+ <version>8.0.12-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -112,7 +112,7 @@
<artifactItem>
<groupId>org.apache.tomee</groupId>
<artifactId>openejb-client</artifactId>
- <version>8.0.11-SNAPSHOT</version>
+ <version>8.0.12-SNAPSHOT</version>
<outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
<destFileName>openejb-client.jar</destFileName>
</artifactItem>
diff --git a/examples/bval-evaluation-redeployment/pom.xml b/examples/bval-evaluation-redeployment/pom.xml
index 69302a33ee..4b13d3a6e8 100644
--- a/examples/bval-evaluation-redeployment/pom.xml
+++ b/examples/bval-evaluation-redeployment/pom.xml
@@ -25,8 +25,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tomee.test.version>8.0.11</tomee.test.version>
- <openejb.test.version>8.0.11</openejb.test.version>
</properties>
<modules>
diff --git a/examples/cdi-dynamic-inject/pom.xml b/examples/cdi-dynamic-inject/pom.xml
index c78f59f899..760a2f24ca 100644
--- a/examples/cdi-dynamic-inject/pom.xml
+++ b/examples/cdi-dynamic-inject/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.superbiz</groupId>
<artifactId>cdi-dynamic-inject</artifactId>
<packaging>jar</packaging>
- <version>8.0.11-SNAPSHOT</version>
+ <version>8.0.12-SNAPSHOT</version>
<name>TomEE :: Examples :: Dynamic Inject</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -81,7 +81,7 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>openejb-core</artifactId>
- <version>8.0.11-SNAPSHOT</version>
+ <version>8.0.12-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/examples/connector-ear/pom.xml b/examples/connector-ear/pom.xml
index b8d548228d..239db66d50 100644
--- a/examples/connector-ear/pom.xml
+++ b/examples/connector-ear/pom.xml
@@ -20,7 +20,6 @@
<name>TomEE :: Connector Examples :: Connector in EAR</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tomee.version>8.0.11</tomee.version>
<version.shrinkwrap.resolver>2.1.0</version.shrinkwrap.resolver>
<surefire.version>2.21.0</surefire.version>
</properties>
@@ -78,7 +77,7 @@
<systemProperties>
<property>
<name>tomee.version</name>
- <value>${tomee.version}</value>
+ <value>8.0.12-SNAPSHOT</value>
</property>
</systemProperties>
</configuration>
diff --git a/examples/mbean-auto-registration/pom.xml b/examples/mbean-auto-registration/pom.xml
index 240cb737a5..5c060d4a77 100644
--- a/examples/mbean-auto-registration/pom.xml
+++ b/examples/mbean-auto-registration/pom.xml
@@ -20,11 +20,11 @@
<groupId>org.superbiz</groupId>
<artifactId>mbean-auto-registration</artifactId>
<packaging>jar</packaging>
- <version>8.0.11-SNAPSHOT</version>
+ <version>8.0.12-SNAPSHOT</version>
<name>TomEE :: Examples :: MBean Auto Registration</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tomee.version>8.0.11-SNAPSHOT</tomee.version>
+ <tomee.version>8.0.12-SNAPSHOT</tomee.version>
</properties>
<build>
<defaultGoal>install</defaultGoal>
diff --git a/examples/mp-jsonb-configuration/pom.xml b/examples/mp-jsonb-configuration/pom.xml
index ef137c9480..41bf8c6ee7 100644
--- a/examples/mp-jsonb-configuration/pom.xml
+++ b/examples/mp-jsonb-configuration/pom.xml
@@ -19,13 +19,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.superbiz</groupId>
<artifactId>mp-jsonb-configuration</artifactId>
- <version>8.0.11-SNAPSHOT</version>
+ <version>8.0.12-SNAPSHOT</version>
<packaging>war</packaging>
<name>TomEE :: Examples :: Microprofile JSONB Configuration</name>
<properties>
<version.javaee-api>8.0</version.javaee-api>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tomee.version>8.0.11-SNAPSHOT</tomee.version>
+ <tomee.version>8.0.12-SNAPSHOT</tomee.version>
</properties>
<dependencies>
<dependency>
diff --git a/examples/pojo-webservice/pom.xml b/examples/pojo-webservice/pom.xml
index a2e353b8af..7e0e8523d2 100644
--- a/examples/pojo-webservice/pom.xml
+++ b/examples/pojo-webservice/pom.xml
@@ -25,7 +25,6 @@
<name>TomEE :: Web Examples :: Pojo WS</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tomee.version>8.0.11</tomee.version>
</properties>
<repositories>
<repository>
@@ -65,7 +64,6 @@
<artifactId>tomee-maven-plugin</artifactId>
<version>8.0.12-SNAPSHOT</version>
<configuration>
- <tomeeVersion>${tomee.version}</tomeeVersion>
<tomeeClassifier>plus</tomeeClassifier>
</configuration>
</plugin>
diff --git a/examples/pom.xml b/examples/pom.xml
index b4814331e7..456d3433a3 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -44,6 +44,7 @@
<module>cdi-alternative-and-stereotypes</module>
<module>cdi-application-scope</module>
<module>cdi-basic</module>
+ <module>cdi-dynamic-inject</module>
<module>cdi-ejbcontext-jaas</module>
<module>cdi-events</module>
<module>cdi-interceptors</module>
@@ -112,6 +113,7 @@
<module>mp-config-source-database</module>
<module>mp-faulttolerance-fallback</module>
<module>mp-faulttolerance-retry</module>
+ <module>mp-jsonb-configuration</module>
<module>mp-jwt-bean-validation</module>
<module>mp-jwt-bean-validation-strongly-typed</module>
<module>mp-metrics-counted</module>
@@ -144,6 +146,7 @@
<module>rest-on-ejb</module>
<module>rest-example</module>
<module>rest-example-with-application</module>
+ <module>rest-sse-example</module>
<module>rest-xml-json</module>
<module>scala-basic</module>
<module>schedule-expression</module>
diff --git a/examples/resources-declared-in-webapp/pom.xml b/examples/resources-declared-in-webapp/pom.xml
index cd3b41f980..f9d7941c64 100644
--- a/examples/resources-declared-in-webapp/pom.xml
+++ b/examples/resources-declared-in-webapp/pom.xml
@@ -25,7 +25,6 @@
<name>TomEE :: Web Examples :: Resource Declared In A Webapp</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tomee.version>8.0.11</tomee.version>
</properties>
<repositories>
<repository>
@@ -72,7 +71,7 @@
<webappArtifact>
<groupId>org.apache.tomee</groupId>
<artifactId>openejb-tomcat-plus-webapp</artifactId>
- <version>${tomee.version}</version>
+ <version>8.0.12-SNAPSHOT</version>
<contextPath>openejb</contextPath>
</webappArtifact>
</webapps>
diff --git a/examples/resources-jmx-example/pom.xml b/examples/resources-jmx-example/pom.xml
index 8eb9fa1111..a284e5f100 100644
--- a/examples/resources-jmx-example/pom.xml
+++ b/examples/resources-jmx-example/pom.xml
@@ -26,7 +26,6 @@
<name>TomEE :: Examples :: Resources/JMX Example</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tomee.version>8.0.11</tomee.version>
</properties>
<modules>
<module>resources-jmx-ejb</module>
@@ -71,7 +70,7 @@
<dependency>
<groupId>org.superbiz</groupId>
<artifactId>resources-jmx-ejb</artifactId>
- <version>${project.version}</version>
+ <version>8.0.12-SNAPSHOT</version>
<type>ejb</type>
<scope>compile</scope>
</dependency>
diff --git a/examples/resources-jmx-example/resources-jmx-ejb/pom.xml b/examples/resources-jmx-example/resources-jmx-ejb/pom.xml
index c964eba09c..d5bcbbd8bf 100644
--- a/examples/resources-jmx-example/resources-jmx-ejb/pom.xml
+++ b/examples/resources-jmx-example/resources-jmx-ejb/pom.xml
@@ -61,13 +61,13 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>arquillian-tomee-remote</artifactId>
- <version>${tomee.version}</version>
+ <version>8.0.12-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>openejb-provisionning</artifactId>
- <version>${tomee.version}</version>
+ <version>8.0.12-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>ziplock</artifactId>
- <version>${tomee.version}</version>
+ <version>8.0.12-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/examples/rest-example-with-application/pom.xml b/examples/rest-example-with-application/pom.xml
index faa04e84ea..d1a0a8c0cc 100644
--- a/examples/rest-example-with-application/pom.xml
+++ b/examples/rest-example-with-application/pom.xml
@@ -25,7 +25,6 @@
<name>TomEE :: Web Examples :: REST Example With Application</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tomee.version>8.0.11</tomee.version>
</properties>
<repositories>
<repository>
@@ -72,7 +71,7 @@
<webappArtifact>
<groupId>org.apache.tomee</groupId>
<artifactId>tomee-plus-webapp</artifactId>
- <version>${tomee.version}</version>
+ <version>8.0.12-SNAPSHOT</version>
<contextPath>openejb</contextPath>
</webappArtifact>
</webapps>
diff --git a/examples/rest-sse-example/pom.xml b/examples/rest-sse-example/pom.xml
index 28016d4c16..c8e84e7834 100644
--- a/examples/rest-sse-example/pom.xml
+++ b/examples/rest-sse-example/pom.xml
@@ -21,11 +21,10 @@
<groupId>org.superbiz</groupId>
<artifactId>rest-sse-example</artifactId>
<packaging>war</packaging>
- <version>8.0.11-SNAPSHOT</version>
+ <version>8.0.12-SNAPSHOT</version>
<name>TomEE :: Web Examples :: REST SSE Example</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tomee.version>8.0.11-SNAPSHOT</tomee.version>
<version.openjpa>3.0.0</version.openjpa>
</properties>
<repositories>
@@ -73,10 +72,10 @@
<plugin>
<groupId>org.apache.tomee.maven</groupId>
<artifactId>tomee-maven-plugin</artifactId>
- <version>${tomee.version}</version>
+ <version>8.0.12-SNAPSHOT</version>
<configuration>
<simpleLog>true</simpleLog>
- <tomeeVersion>${tomee.version}</tomeeVersion>
+ <tomeeVersion>8.0.12-SNAPSHOT</tomeeVersion>
<tomeeClassifier>plus</tomeeClassifier>
</configuration>
</plugin>
diff --git a/examples/simple-ear/moviefun-functional-tests/src/test/java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java b/examples/simple-ear/moviefun-functional-tests/src/test/java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java
index 98fa3a264c..337afd2860 100644
--- a/examples/simple-ear/moviefun-functional-tests/src/test/java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java
+++ b/examples/simple-ear/moviefun-functional-tests/src/test/java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java
@@ -28,7 +28,6 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import java.net.URL;
-import java.util.ResourceBundle;
import static org.junit.Assert.assertTrue;
@@ -38,9 +37,8 @@ public class MoviesArquillianHtmlUnitTest {
@Deployment
public static EnterpriseArchive createDeployment() {
- ResourceBundle mavenVersion = ResourceBundle.getBundle("version");
-
- final EnterpriseArchive enterpriseArchive = Maven.resolver().resolve("org.superbiz:moviefun-ear:ear:" + mavenVersion.getString("version"))
+ final String earCoordinates = "org.superbiz:moviefun-ear:ear:"+System.getProperty("tomee.version");
+ final EnterpriseArchive enterpriseArchive = Maven.resolver().resolve(earCoordinates)
.withoutTransitivity().asSingle(EnterpriseArchive.class);
System.out.println(enterpriseArchive.toString(true));
diff --git a/examples/simple-ear/pom.xml b/examples/simple-ear/pom.xml
index fe8049754c..401aa1ec14 100644
--- a/examples/simple-ear/pom.xml
+++ b/examples/simple-ear/pom.xml
@@ -33,7 +33,6 @@
</modules>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tomee.version>8.0.11</tomee.version>
</properties>
<repositories>
<repository>
@@ -69,7 +68,7 @@
<systemProperties>
<property>
<name>tomee.version</name>
- <value>${tomee.version}</value>
+ <value>8.0.12-SNAPSHOT</value>
</property>
</systemProperties>
</configuration>
diff --git a/itests/ejb/pom.xml b/itests/ejb/pom.xml
index c41ec3053c..87ae684cc7 100644
--- a/itests/ejb/pom.xml
+++ b/itests/ejb/pom.xml
@@ -19,12 +19,11 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <version>8.0.11-SNAPSHOT</version>
<parent>
<artifactId>itests</artifactId>
<groupId>org.apache.tomee</groupId>
- <version>8.0.11-SNAPSHOT</version>
+ <version>8.0.12-SNAPSHOT</version>
</parent>
<groupId>org.apache.tomee.itests</groupId>
@@ -55,7 +54,7 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>apache-tomee</artifactId>
- <version>8.0.11-SNAPSHOT</version>
+ <version>8.0.12-SNAPSHOT</version>
<type>tar.gz</type>
<classifier>microprofile</classifier>
<exclusions>