You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2022/04/05 11:30:34 UTC
[tomee] branch master updated (a2fff57952 -> cab8f15089)
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
from a2fff57952 Rework and fix most of the microprofile config TCK failures
new d285c0aba8 Update surefire for all TCK and avoid reuseFork for the moment so it's easier to see issues without impact from others
new cab8f15089 Small tweak to avoid failure related to TCK use cases
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/openejb/assembler/classic/ValidatorBuilder.java | 7 ++++++-
tck/bval-embedded/pom.xml | 11 ++++-------
tck/bval-embedded/src/test/resources/dev.xml | 2 +-
tck/cdi-embedded/pom.xml | 4 ++--
tck/cdi-tomee/pom.xml | 2 +-
tck/microprofile-tck/fault-tolerance/pom.xml | 2 +-
tck/microprofile-tck/health/pom.xml | 2 +-
tck/microprofile-tck/metrics/pom.xml | 2 +-
tck/microprofile-tck/openapi/pom.xml | 2 +-
tck/microprofile-tck/opentracing/pom.xml | 2 +-
tck/microprofile-tck/rest-client/pom.xml | 2 +-
11 files changed, 20 insertions(+), 18 deletions(-)
[tomee] 01/02: Update surefire for all TCK and avoid reuseFork for the moment so it's easier to see issues without impact from others
Posted by jl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit d285c0aba89c93fbc09d0a56e41280dcccf43539
Author: Jean-Louis Monteiro <jl...@tomitribe.com>
AuthorDate: Tue Apr 5 13:30:12 2022 +0200
Update surefire for all TCK and avoid reuseFork for the moment so it's easier to see issues without impact from others
---
tck/bval-embedded/pom.xml | 11 ++++-------
tck/bval-embedded/src/test/resources/dev.xml | 2 +-
tck/cdi-embedded/pom.xml | 4 ++--
tck/cdi-tomee/pom.xml | 2 +-
tck/microprofile-tck/fault-tolerance/pom.xml | 2 +-
tck/microprofile-tck/health/pom.xml | 2 +-
tck/microprofile-tck/metrics/pom.xml | 2 +-
tck/microprofile-tck/openapi/pom.xml | 2 +-
tck/microprofile-tck/opentracing/pom.xml | 2 +-
tck/microprofile-tck/rest-client/pom.xml | 2 +-
10 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/tck/bval-embedded/pom.xml b/tck/bval-embedded/pom.xml
index 63d607ff90..843e78f20a 100644
--- a/tck/bval-embedded/pom.xml
+++ b/tck/bval-embedded/pom.xml
@@ -140,16 +140,13 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
- <reuseForks>true</reuseForks>
+ <reuseForks>false</reuseForks>
<suiteXmlFiles>
<suiteXmlFile>${project.build.directory}/dependency/beanvalidation-tck-tests-suite.xml</suiteXmlFile>
</suiteXmlFiles>
- <systemProperties>
- <property>
- <name>validation.provider</name>
- <value>${validation.provider}</value>
- </property>
- </systemProperties>
+ <systemPropertyVariables>
+ <validation.provider>${validation.provider}</validation.provider>
+ </systemPropertyVariables>
<parallel>methods</parallel>
<threadCount>4</threadCount>
</configuration>
diff --git a/tck/bval-embedded/src/test/resources/dev.xml b/tck/bval-embedded/src/test/resources/dev.xml
index f4969ec272..74d40bba0e 100644
--- a/tck/bval-embedded/src/test/resources/dev.xml
+++ b/tck/bval-embedded/src/test/resources/dev.xml
@@ -19,7 +19,7 @@
<suite name="BVAL-TCK" verbose="1">
<test name="BVAL-TCK">
<classes>
- <class name="org.hibernate.beanvalidation.tck.tests.methodvalidation.ValidateReturnValueTest" />
+ <class name="org.hibernate.beanvalidation.tck.tests.xmlconfiguration.versioning.Version30InMappingXmlTest" />
</classes>
</test>
</suite>
diff --git a/tck/cdi-embedded/pom.xml b/tck/cdi-embedded/pom.xml
index 51cad0dcbd..df15710db1 100644
--- a/tck/cdi-embedded/pom.xml
+++ b/tck/cdi-embedded/pom.xml
@@ -29,7 +29,7 @@
<properties>
<testngSuiteXml>src/test/resources/passing.xml</testngSuiteXml>
- <surefire.argline>-Xmx2g</surefire.argline>
+ <surefire.argline>-Xmx3g</surefire.argline>
</properties>
<dependencies>
@@ -241,7 +241,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
- <reuseForks>true</reuseForks>
+ <reuseForks>false</reuseForks>
<forkCount>1</forkCount>
<argLine>${surefire.argline}</argLine>
<useFile>false</useFile>
diff --git a/tck/cdi-tomee/pom.xml b/tck/cdi-tomee/pom.xml
index b69e57de89..af6112a700 100644
--- a/tck/cdi-tomee/pom.xml
+++ b/tck/cdi-tomee/pom.xml
@@ -245,7 +245,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
- <reuseForks>true</reuseForks>
+ <reuseForks>false</reuseForks>
<forkCount>1</forkCount>
<useFile>false</useFile>
<disableXmlReport>false</disableXmlReport>
diff --git a/tck/microprofile-tck/fault-tolerance/pom.xml b/tck/microprofile-tck/fault-tolerance/pom.xml
index 7ccddd5724..334d35021a 100644
--- a/tck/microprofile-tck/fault-tolerance/pom.xml
+++ b/tck/microprofile-tck/fault-tolerance/pom.xml
@@ -33,7 +33,7 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<!-- Updated version to fix hanging text -->
- <version>3.0.0-M1</version>
+ <version>3.0.0-M6</version>
<configuration>
<dependenciesToScan>
<dependency>org.eclipse.microprofile.fault-tolerance:microprofile-fault-tolerance-tck</dependency>
diff --git a/tck/microprofile-tck/health/pom.xml b/tck/microprofile-tck/health/pom.xml
index 76c054bbc2..776bea6bf1 100644
--- a/tck/microprofile-tck/health/pom.xml
+++ b/tck/microprofile-tck/health/pom.xml
@@ -33,7 +33,7 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<!-- Updated version to fix hanging text -->
- <version>2.22.0</version>
+ <version>3.0.0-M6</version>
<configuration>
<dependenciesToScan>
<dependency>org.eclipse.microprofile.health:microprofile-health-tck</dependency>
diff --git a/tck/microprofile-tck/metrics/pom.xml b/tck/microprofile-tck/metrics/pom.xml
index 28d307839b..dc2fbb24af 100644
--- a/tck/microprofile-tck/metrics/pom.xml
+++ b/tck/microprofile-tck/metrics/pom.xml
@@ -33,7 +33,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.0</version>
+ <version>3.0.0-M6</version>
<configuration>
<reuseForks>false</reuseForks>
<dependenciesToScan>
diff --git a/tck/microprofile-tck/openapi/pom.xml b/tck/microprofile-tck/openapi/pom.xml
index 65076ad33e..5700e6a68e 100644
--- a/tck/microprofile-tck/openapi/pom.xml
+++ b/tck/microprofile-tck/openapi/pom.xml
@@ -33,7 +33,7 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<!-- Updated version to fix hanging text -->
- <version>2.22.0</version>
+ <version>3.0.0-M6</version>
<configuration>
<dependenciesToScan>
<dependency>org.eclipse.microprofile.openapi:microprofile-openapi-tck</dependency>
diff --git a/tck/microprofile-tck/opentracing/pom.xml b/tck/microprofile-tck/opentracing/pom.xml
index af5f5d96d6..8ba2b6a27f 100644
--- a/tck/microprofile-tck/opentracing/pom.xml
+++ b/tck/microprofile-tck/opentracing/pom.xml
@@ -33,7 +33,7 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<!-- Updated version to fix hanging text -->
- <version>2.22.0</version>
+ <version>3.0.0-M6</version>
<configuration>
<dependenciesToScan>
<dependency>org.eclipse.microprofile.opentracing:microprofile-opentracing-tck</dependency>
diff --git a/tck/microprofile-tck/rest-client/pom.xml b/tck/microprofile-tck/rest-client/pom.xml
index 9755559886..fa531571b0 100644
--- a/tck/microprofile-tck/rest-client/pom.xml
+++ b/tck/microprofile-tck/rest-client/pom.xml
@@ -59,7 +59,7 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.0</version>
+ <version>3.0.0-M6</version>
<configuration>
<dependenciesToScan>
<dependency>org.eclipse.microprofile.rest.client:microprofile-rest-client-tck</dependency>
[tomee] 02/02: Small tweak to avoid failure related to TCK use cases
Posted by jl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit cab8f150890c9e63ce7b5b69d0f0d419a55356af
Author: Jean-Louis Monteiro <jl...@tomitribe.com>
AuthorDate: Tue Apr 5 13:30:26 2022 +0200
Small tweak to avoid failure related to TCK use cases
---
.../org/apache/openejb/assembler/classic/ValidatorBuilder.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ValidatorBuilder.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ValidatorBuilder.java
index 6a587dc53a..c62a4a2a21 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ValidatorBuilder.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ValidatorBuilder.java
@@ -186,7 +186,12 @@ public final class ValidatorBuilder {
info.valueExtractorClassNames == null ? null : new LinkedHashSet<>(info.valueExtractorClassNames));
final OpenEjbConfig config = new OpenEjbConfig(bootstrapConfig, target);
- target.ignoreXmlConfiguration();
+ try {
+ target.ignoreXmlConfiguration();
+ logger.info("Ignoring XML Configuration for validator " + target.getClass().getName());
+ } catch (final Exception e) {
+ logger.warning("Unable to ignore XML Configuration for validator " + target.getClass().getName(), e);
+ }
final String messageInterpolatorClass = info.messageInterpolatorClass;
if (messageInterpolatorClass != null) {