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
The following commit(s) were added to refs/heads/master by this push:
new 2973c09 Small fixes
2973c09 is described below
commit 2973c09f0e68c701780167b871555b84d1bf3610
Author: Jean-Louis Monteiro <[email protected]>
AuthorDate: Thu Mar 24 00:53:23 2022 +0100
Small fixes
---
boms/tomee-microprofile-api/pom.xml | 2 +-
boms/tomee-microprofile/pom.xml | 2 +-
boms/tomee-plume-api/pom.xml | 2 +-
boms/tomee-plume/pom.xml | 13 +------------
boms/tomee-plus-api/pom.xml | 2 +-
boms/tomee-plus/pom.xml | 13 +------------
boms/tomee-webprofile-api/pom.xml | 2 +-
boms/tomee-webprofile/pom.xml | 2 +-
examples/java-modules/pom.xml | 4 ++++
tck/bval-embedded/src/test/resources/dev.xml | 2 +-
tck/bval-tomee/src/test/resources/dev.xml | 5 ++++-
.../resources/META-INF/openwebbeans/openwebbeans.properties | 1 -
12 files changed, 17 insertions(+), 33 deletions(-)
diff --git a/boms/tomee-microprofile-api/pom.xml
b/boms/tomee-microprofile-api/pom.xml
index 30540a0..9d57ea5 100644
--- a/boms/tomee-microprofile-api/pom.xml
+++ b/boms/tomee-microprofile-api/pom.xml
@@ -197,7 +197,7 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>jakartaee-api</artifactId>
- <version>9.1-M1</version>
+ <version>9.1-M2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/boms/tomee-microprofile/pom.xml b/boms/tomee-microprofile/pom.xml
index bc776ca..d239733 100644
--- a/boms/tomee-microprofile/pom.xml
+++ b/boms/tomee-microprofile/pom.xml
@@ -941,7 +941,7 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>jakartaee-api</artifactId>
- <version>9.1-M1</version>
+ <version>9.1-M2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/boms/tomee-plume-api/pom.xml b/boms/tomee-plume-api/pom.xml
index 471c466..e4d7ba5 100644
--- a/boms/tomee-plume-api/pom.xml
+++ b/boms/tomee-plume-api/pom.xml
@@ -175,7 +175,7 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>jakartaee-api</artifactId>
- <version>9.1-M1</version>
+ <version>9.1-M2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/boms/tomee-plume/pom.xml b/boms/tomee-plume/pom.xml
index 91c6834..ca62d0d 100644
--- a/boms/tomee-plume/pom.xml
+++ b/boms/tomee-plume/pom.xml
@@ -310,17 +310,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-openwire-legacy</artifactId>
- <version>5.16.4</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.apache.batchee</groupId>
<artifactId>batchee-jbatch</artifactId>
<version>1.0.2-SNAPSHOT</version>
@@ -1030,7 +1019,7 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>jakartaee-api</artifactId>
- <version>9.1-M1</version>
+ <version>9.1-M2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/boms/tomee-plus-api/pom.xml b/boms/tomee-plus-api/pom.xml
index ffd5393..40ea2dc 100644
--- a/boms/tomee-plus-api/pom.xml
+++ b/boms/tomee-plus-api/pom.xml
@@ -164,7 +164,7 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>jakartaee-api</artifactId>
- <version>9.1-M1</version>
+ <version>9.1-M2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/boms/tomee-plus/pom.xml b/boms/tomee-plus/pom.xml
index f4f1ea8..789a000 100644
--- a/boms/tomee-plus/pom.xml
+++ b/boms/tomee-plus/pom.xml
@@ -310,17 +310,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-openwire-legacy</artifactId>
- <version>5.16.4</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.apache.batchee</groupId>
<artifactId>batchee-jbatch</artifactId>
<version>1.0.2-SNAPSHOT</version>
@@ -1041,7 +1030,7 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>jakartaee-api</artifactId>
- <version>9.1-M1</version>
+ <version>9.1-M2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/boms/tomee-webprofile-api/pom.xml
b/boms/tomee-webprofile-api/pom.xml
index 4b41698..98dc8a0 100644
--- a/boms/tomee-webprofile-api/pom.xml
+++ b/boms/tomee-webprofile-api/pom.xml
@@ -142,7 +142,7 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>jakartaee-api</artifactId>
- <version>9.1-M1</version>
+ <version>9.1-M2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/boms/tomee-webprofile/pom.xml b/boms/tomee-webprofile/pom.xml
index 289ebec..5338aa8 100644
--- a/boms/tomee-webprofile/pom.xml
+++ b/boms/tomee-webprofile/pom.xml
@@ -724,7 +724,7 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>jakartaee-api</artifactId>
- <version>9.1-M1</version>
+ <version>9.1-M2-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/examples/java-modules/pom.xml b/examples/java-modules/pom.xml
index 660352d..67bdbb6 100644
--- a/examples/java-modules/pom.xml
+++ b/examples/java-modules/pom.xml
@@ -49,6 +49,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
+ <configuration>
+ <source>17</source>
+ <target>17</target>
+ </configuration>
</plugin>
<plugin>
<groupId>org.tomitribe.transformer</groupId>
diff --git a/tck/bval-embedded/src/test/resources/dev.xml
b/tck/bval-embedded/src/test/resources/dev.xml
index b2ec173..f4969ec 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.integration.ee.JndiRetrievalTest"
/>
+ <class
name="org.hibernate.beanvalidation.tck.tests.methodvalidation.ValidateReturnValueTest"
/>
</classes>
</test>
</suite>
diff --git a/tck/bval-tomee/src/test/resources/dev.xml
b/tck/bval-tomee/src/test/resources/dev.xml
index 3c73916..779eefb 100644
--- a/tck/bval-tomee/src/test/resources/dev.xml
+++ b/tck/bval-tomee/src/test/resources/dev.xml
@@ -18,8 +18,11 @@
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"; >
<suite name="BVal-TCK" verbose="1">
<test name="BVal-TCK">
+ <packages>
+ <package
name="org.hibernate.beanvalidation.tck.tests.xmlconfiguration"/>
+ </packages>
<classes>
- <class
name="org.hibernate.beanvalidation.tck.tests.bootstrap.customprovider.BootstrapCustomProviderDefinedInServiceFileTest"
/>
+ <class
name="org.hibernate.beanvalidation.tck.tests.bootstrap.customprovider.BootstrapNonAvailableValidationProviderTest"
/>
</classes>
</test>
</suite>
diff --git
a/tck/cdi-tomee/src/test/resources/META-INF/openwebbeans/openwebbeans.properties
b/tck/cdi-tomee/src/test/resources/META-INF/openwebbeans/openwebbeans.properties
index 4be158d..3c795fb 100644
---
a/tck/cdi-tomee/src/test/resources/META-INF/openwebbeans/openwebbeans.properties
+++
b/tck/cdi-tomee/src/test/resources/META-INF/openwebbeans/openwebbeans.properties
@@ -27,7 +27,6 @@ org.apache.webbeans.application.supportsProducerInterception
= false
# enable verification of programmatic qualifiers
org.apache.webbeans.strictDynamicValidation = true
-org.apache.webbeans.spi.ConversationService =
org.apache.openwebbeans.tck.conversation.TckConversationService
org.apache.webbeans.application.supportsConversation=true
