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/05/11 18:55:35 UTC
[tomee] branch master updated (dabc197eaa -> 179c6bdc78)
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
from dabc197eaa TOMEE-3956 - Fix TomEE :: Connector Examples :: Connector in WAR
new dc9c0833f5 Adds a missed javax -> jakarta conversion in arquillian-openejb-embedded
new d053ee6da3 TOMEE-3957 - Modernizes TomEE :: Examples :: DeltaSpike @ConfigProperty - Requires DeltaSpike Update
new 61c7290f94 TOMEE-3958 - Modernizes TomEE :: Examples :: DeltaSpike Exception Handling- Requires DeltaSpike Update
new 3f8bdbeed3 TOMEE-3959 - Modernizes TomEE :: Examples :: DeltaSpike I18n - Requires DeltaSpike Update
new 179c6bdc78 TOMEE-3960 - Modernizes TomEE :: Examples :: DeltaSpike ProjectStage- Requires DeltaSpike Update
The 5 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:
.../openejb/arquillian/openejb/SWClassLoader.java | 2 +-
examples/deltaspike-configproperty/pom.xml | 49 +++++++++++++++++++---
examples/deltaspike-exception-handling/pom.xml | 17 +++++---
examples/deltaspike-i18n/pom.xml | 17 +++++---
examples/projectstage-demo/pom.xml | 16 ++++++-
5 files changed, 84 insertions(+), 17 deletions(-)
[tomee] 02/05: TOMEE-3957 - Modernizes TomEE :: Examples :: DeltaSpike @ConfigProperty - Requires DeltaSpike Update
Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit d053ee6da39944c82767feda33299d6d6f79d037
Author: Richard Zowalla <13...@users.noreply.github.com>
AuthorDate: Wed May 11 20:47:51 2022 +0200
TOMEE-3957 - Modernizes TomEE :: Examples :: DeltaSpike @ConfigProperty - Requires DeltaSpike Update
---
examples/deltaspike-configproperty/pom.xml | 49 +++++++++++++++++++++++++++---
1 file changed, 44 insertions(+), 5 deletions(-)
diff --git a/examples/deltaspike-configproperty/pom.xml b/examples/deltaspike-configproperty/pom.xml
index 29985267c5..4a077424ad 100644
--- a/examples/deltaspike-configproperty/pom.xml
+++ b/examples/deltaspike-configproperty/pom.xml
@@ -25,7 +25,7 @@
<name>TomEE :: Examples :: DeltaSpike @ConfigProperty</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <version.deltaspike>1.9.3</version.deltaspike>
+ <version.deltaspike>1.9.6</version.deltaspike>
</properties>
<build>
<defaultGoal>install</defaultGoal>
@@ -33,13 +33,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.5.1</version>
+ <version>3.10.1</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>11</source>
+ <target>11</target>
</configuration>
</plugin>
-
</plugins>
</build>
<repositories>
@@ -49,6 +48,27 @@
<url>https://repository.apache.org/content/groups/snapshots</url>
</repository>
</repositories>
+ <dependencyManagement>
+ <dependencies>
+ <!-- Override dependency resolver with test version. This must go *BEFORE*
+ the Arquillian BOM. -->
+ <dependency>
+ <groupId>org.jboss.shrinkwrap.resolver</groupId>
+ <artifactId>shrinkwrap-resolver-bom</artifactId>
+ <version>3.1.4</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+ <!-- Now pull in our server-based unit testing framework -->
+ <dependency>
+ <groupId>org.jboss.arquillian</groupId>
+ <artifactId>arquillian-bom</artifactId>
+ <version>1.7.0.Alpha10</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.tomee</groupId>
@@ -60,11 +80,19 @@
<groupId>org.apache.deltaspike.core</groupId>
<artifactId>deltaspike-core-impl</artifactId>
<version>${version.deltaspike}</version>
+ <classifier>jakarta</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.deltaspike.core</groupId>
+ <artifactId>deltaspike-core-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.deltaspike.core</groupId>
<artifactId>deltaspike-core-api</artifactId>
<version>${version.deltaspike}</version>
+ <classifier>jakarta</classifier>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -72,6 +100,17 @@
<version>4.13.2</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.junit</groupId>
+ <artifactId>arquillian-junit-container</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap.resolver</groupId>
+ <artifactId>shrinkwrap-resolver-depchain</artifactId>
+ <type>pom</type>
+ <scope>test</scope>
+ </dependency>
<!-- The <scope>test</scope> guarantees that none of your runtime code
is dependent on any OpenEJB classes. -->
<dependency>
[tomee] 05/05: TOMEE-3960 - Modernizes TomEE :: Examples :: DeltaSpike ProjectStage- Requires DeltaSpike Update
Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 179c6bdc782db9cbca456a92185a0b81e59f460f
Author: Richard Zowalla <13...@users.noreply.github.com>
AuthorDate: Wed May 11 20:55:23 2022 +0200
TOMEE-3960 - Modernizes TomEE :: Examples :: DeltaSpike ProjectStage- Requires DeltaSpike Update
---
examples/projectstage-demo/pom.xml | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/examples/projectstage-demo/pom.xml b/examples/projectstage-demo/pom.xml
index 81bf1ddb5e..6d755aa571 100644
--- a/examples/projectstage-demo/pom.xml
+++ b/examples/projectstage-demo/pom.xml
@@ -24,6 +24,7 @@
<name>TomEE :: Examples :: DeltaSpike ProjectStage</name>
<properties>
<tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
+ <version.deltaspike>1.9.6</version.deltaspike>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<repositories>
@@ -40,10 +41,23 @@
<version>9.1-M2-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.deltaspike.core</groupId>
+ <artifactId>deltaspike-core-impl</artifactId>
+ <version>${version.deltaspike}</version>
+ <classifier>jakarta</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.deltaspike.core</groupId>
+ <artifactId>deltaspike-core-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.apache.deltaspike.core</groupId>
<artifactId>deltaspike-core-api</artifactId>
- <version>1.0.0</version>
+ <version>${version.deltaspike}</version>
+ <classifier>jakarta</classifier>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
[tomee] 01/05: Adds a missed javax -> jakarta conversion in arquillian-openejb-embedded
Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit dc9c0833f5712a7295d150a063237856016dbf1c
Author: Richard Zowalla <13...@users.noreply.github.com>
AuthorDate: Wed May 11 20:36:21 2022 +0200
Adds a missed javax -> jakarta conversion in arquillian-openejb-embedded
---
.../main/java/org/apache/openejb/arquillian/openejb/SWClassLoader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arquillian/arquillian-openejb-embedded/src/main/java/org/apache/openejb/arquillian/openejb/SWClassLoader.java b/arquillian/arquillian-openejb-embedded/src/main/java/org/apache/openejb/arquillian/openejb/SWClassLoader.java
index d3d1870b9f..894cb7a94a 100644
--- a/arquillian/arquillian-openejb-embedded/src/main/java/org/apache/openejb/arquillian/openejb/SWClassLoader.java
+++ b/arquillian/arquillian-openejb-embedded/src/main/java/org/apache/openejb/arquillian/openejb/SWClassLoader.java
@@ -99,7 +99,7 @@ public class SWClassLoader extends ClassLoader implements Closeable {
return super.getResources(null);
}
final boolean cdiExtensions = name.startsWith("META-INF/services/" + Extension.class.getName());
- if (cdiExtensions || !name.contains("META-INF/services/javax")) {
+ if (cdiExtensions || !name.contains("META-INF/services/jakarta")) {
final List<Archive<?>> node = findNodes(name);
if (!node.isEmpty()) {
final List<URL> urls = new ArrayList<>();
[tomee] 03/05: TOMEE-3958 - Modernizes TomEE :: Examples :: DeltaSpike Exception Handling- Requires DeltaSpike Update
Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 61c7290f9423687ef2f679a4e942916ab090cf9d
Author: Richard Zowalla <13...@users.noreply.github.com>
AuthorDate: Wed May 11 20:49:35 2022 +0200
TOMEE-3958 - Modernizes TomEE :: Examples :: DeltaSpike Exception Handling- Requires DeltaSpike Update
---
examples/deltaspike-exception-handling/pom.xml | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/examples/deltaspike-exception-handling/pom.xml b/examples/deltaspike-exception-handling/pom.xml
index 26b8651480..3f65ff9ef9 100644
--- a/examples/deltaspike-exception-handling/pom.xml
+++ b/examples/deltaspike-exception-handling/pom.xml
@@ -25,7 +25,7 @@
<name>TomEE :: Examples :: DeltaSpike Exception Handling</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <version.deltaspike>1.9.3</version.deltaspike>
+ <version.deltaspike>1.9.6</version.deltaspike>
</properties>
<build>
<defaultGoal>install</defaultGoal>
@@ -33,13 +33,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.5.1</version>
+ <version>3.10.1</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>11</source>
+ <target>11</target>
</configuration>
</plugin>
-
</plugins>
</build>
<repositories>
@@ -60,11 +59,19 @@
<groupId>org.apache.deltaspike.core</groupId>
<artifactId>deltaspike-core-impl</artifactId>
<version>${version.deltaspike}</version>
+ <classifier>jakarta</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.deltaspike.core</groupId>
+ <artifactId>deltaspike-core-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.deltaspike.core</groupId>
<artifactId>deltaspike-core-api</artifactId>
<version>${version.deltaspike}</version>
+ <classifier>jakarta</classifier>
</dependency>
<dependency>
<groupId>junit</groupId>
[tomee] 04/05: TOMEE-3959 - Modernizes TomEE :: Examples :: DeltaSpike I18n - Requires DeltaSpike Update
Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 3f8bdbeed3f18c2cc0a4e132c0bac2a8edc37a6d
Author: Richard Zowalla <13...@users.noreply.github.com>
AuthorDate: Wed May 11 20:50:58 2022 +0200
TOMEE-3959 - Modernizes TomEE :: Examples :: DeltaSpike I18n - Requires DeltaSpike Update
---
examples/deltaspike-i18n/pom.xml | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/examples/deltaspike-i18n/pom.xml b/examples/deltaspike-i18n/pom.xml
index 011560d512..4be7a9dc5e 100644
--- a/examples/deltaspike-i18n/pom.xml
+++ b/examples/deltaspike-i18n/pom.xml
@@ -25,7 +25,7 @@
<name>TomEE :: Examples :: DeltaSpike I18n</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <version.deltaspike>1.9.3</version.deltaspike>
+ <version.deltaspike>1.9.6</version.deltaspike>
</properties>
<build>
<defaultGoal>install</defaultGoal>
@@ -33,13 +33,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.5.1</version>
+ <version>3.10.1</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>11</source>
+ <target>11</target>
</configuration>
</plugin>
-
</plugins>
</build>
<repositories>
@@ -60,11 +59,19 @@
<groupId>org.apache.deltaspike.core</groupId>
<artifactId>deltaspike-core-impl</artifactId>
<version>${version.deltaspike}</version>
+ <classifier>jakarta</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.deltaspike.core</groupId>
+ <artifactId>deltaspike-core-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.deltaspike.core</groupId>
<artifactId>deltaspike-core-api</artifactId>
<version>${version.deltaspike}</version>
+ <classifier>jakarta</classifier>
</dependency>
<dependency>
<groupId>junit</groupId>