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
The following commit(s) were added to refs/heads/master by this push:
new d017b87 Minor: Modernizes Hibernate Arquillian example
new 02717fd Merge remote-tracking branch 'origin/master'
d017b87 is described below
commit d017b87a1b3d6206bc24b19b2c276d594d4c3126
Author: Richard Zowalla <[email protected]>
AuthorDate: Thu Mar 24 10:06:26 2022 +0100
Minor: Modernizes Hibernate Arquillian example
---
examples/jpa-hibernate-arquillian/README.adoc | 20 ++++++++---------
examples/jpa-hibernate-arquillian/pom.xml | 26 +++++-----------------
.../superbiz/injection/{h3jpa => h5jpa}/Movie.java | 2 +-
.../injection/{h3jpa => h5jpa}/Movies.java | 2 +-
.../src/main/resources/META-INF/beans.xml | 9 ++++----
.../src/main/resources/META-INF/persistence.xml | 2 +-
.../src/test/resources/arquillian.xml | 15 +++++--------
7 files changed, 28 insertions(+), 48 deletions(-)
diff --git a/examples/jpa-hibernate-arquillian/README.adoc
b/examples/jpa-hibernate-arquillian/README.adoc
index 8c39814..357e1ac 100644
--- a/examples/jpa-hibernate-arquillian/README.adoc
+++ b/examples/jpa-hibernate-arquillian/README.adoc
@@ -14,16 +14,16 @@ Links to the documentation have been added in key parts of
the example for the c
== Movie
Here we have a class with some details. See the annotation
-link:https://tomee.apache.org/tomee-8.0/javadoc/javax/persistence/Entity.html[@Entity]
+link:https://tomee.apache.org/tomee-9.0/javadoc/jakarta/persistence/Entity.html[@Entity]
above the declaration, with it we are saying that this class is an entity (a
table in the database). We still have two more annotations above the attribute
id, one of them is
-link:https://tomee.apache.org/tomee-8.0/javadoc/javax/persistence/Id.html[@Id]
+link:https://tomee.apache.org/tomee-9.0/javadoc/jakarta/persistence/Id.html[@Id]
annotation, it indicates that this attribute is the identifier of the entity
and the other annotation
-link:https://tomee.apache.org/tomee-8.0/javadoc/javax/persistence/GeneratedValue.html[@GeneratedValue]
+link:https://tomee.apache.org/tomee-9.0/javadoc/jakarta/persistence/GeneratedValue.html[@GeneratedValue]
indicates that the unique identifier value generation of the entity will be
managed by the persistence provider.
[source,java]
----
-package org.superbiz.injection.h3jpa;
+package org.superbiz.injection.h5jpa;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
@@ -80,17 +80,17 @@ public class Movie {
== Movies
Now we have two important things:
-link:https://tomee.apache.org/tomee-8.0/javadoc/javax/persistence/PersistenceContext.html[@PersistenceContext]
+link:https://tomee.apache.org/tomee-9.0/javadoc/jakarta/persistence/PersistenceContext.html[@PersistenceContext]
annotation and the
-link:https://tomee.apache.org/tomee-8.0/javadoc/javax/persistence/EntityManager.html[EntityManager]
+link:https://tomee.apache.org/tomee-9.0/javadoc/jakarta/persistence/EntityManager.html[EntityManager]
declaration.
The
-link:https://tomee.apache.org/tomee-8.0/javadoc/javax/persistence/EntityManager.html[EntityManager]
+link:https://tomee.apache.org/tomee-9.0/javadoc/javax/persistence/EntityManager.html[EntityManager]
is the interface with the core methods of JPA like persist, remove, merge,
find and others...
We annotate the
-link:https://tomee.apache.org/tomee-8.0/javadoc/javax/persistence/EntityManager.html[EntityManager]
+link:https://tomee.apache.org/tomee-9.0/javadoc/jakarta/persistence/EntityManager.html[EntityManager]
with
-link:https://tomee.apache.org/tomee-8.0/javadoc/javax/persistence/PersistenceContext.html[@PersistenceContext],
a persistence context is an entity management where every persistence context
associated with a persistence unit, we will create a persistence.xml soon for
this.
+link:https://tomee.apache.org/tomee-9.0/javadoc/jakarta/persistence/PersistenceContext.html[@PersistenceContext],
a persistence context is an entity management where every persistence context
associated with a persistence unit, we will create a persistence.xml soon for
this.
[source,java]
----
@@ -224,7 +224,7 @@ Now we do a test with the following workflow:
[source,java]
----
-package org.superbiz.injection.h3jpa;
+package org.superbiz.injection.h5jpa;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
diff --git a/examples/jpa-hibernate-arquillian/pom.xml
b/examples/jpa-hibernate-arquillian/pom.xml
index 79591ee..49512b0 100644
--- a/examples/jpa-hibernate-arquillian/pom.xml
+++ b/examples/jpa-hibernate-arquillian/pom.xml
@@ -34,28 +34,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.5.1</version>
+ <version>3.8.1</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>11</source>
+ <target>11</target>
</configuration>
</plugin>
- <plugin>
- <groupId>org.tomitribe.transformer</groupId>
- <artifactId>org.eclipse.transformer.maven</artifactId>
- <version>0.1.1a</version>
- <configuration>
- <classifier>jakartaee9</classifier>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>run</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
<repositories>
@@ -95,7 +79,7 @@
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId>
- <version>1.0.3.Final</version>
+ <version>1.7.0.Alpha10</version>
<scope>import</scope>
<type>pom</type>
</dependency>
@@ -113,7 +97,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.12</version>
+ <version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/examples/jpa-hibernate-arquillian/src/main/java/org/superbiz/injection/h3jpa/Movie.java
b/examples/jpa-hibernate-arquillian/src/main/java/org/superbiz/injection/h5jpa/Movie.java
similarity index 97%
rename from
examples/jpa-hibernate-arquillian/src/main/java/org/superbiz/injection/h3jpa/Movie.java
rename to
examples/jpa-hibernate-arquillian/src/main/java/org/superbiz/injection/h5jpa/Movie.java
index 7986527..59a9a09 100644
---
a/examples/jpa-hibernate-arquillian/src/main/java/org/superbiz/injection/h3jpa/Movie.java
+++
b/examples/jpa-hibernate-arquillian/src/main/java/org/superbiz/injection/h5jpa/Movie.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.superbiz.injection.h3jpa;
+package org.superbiz.injection.h5jpa;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
diff --git
a/examples/jpa-hibernate-arquillian/src/main/java/org/superbiz/injection/h3jpa/Movies.java
b/examples/jpa-hibernate-arquillian/src/main/java/org/superbiz/injection/h5jpa/Movies.java
similarity index 98%
rename from
examples/jpa-hibernate-arquillian/src/main/java/org/superbiz/injection/h3jpa/Movies.java
rename to
examples/jpa-hibernate-arquillian/src/main/java/org/superbiz/injection/h5jpa/Movies.java
index 4d652d9..86dd195 100644
---
a/examples/jpa-hibernate-arquillian/src/main/java/org/superbiz/injection/h3jpa/Movies.java
+++
b/examples/jpa-hibernate-arquillian/src/main/java/org/superbiz/injection/h5jpa/Movies.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.superbiz.injection.h3jpa;
+package org.superbiz.injection.h5jpa;
import jakarta.ejb.Stateful;
import jakarta.persistence.EntityManager;
diff --git
a/examples/jpa-hibernate-arquillian/src/main/resources/META-INF/beans.xml
b/examples/jpa-hibernate-arquillian/src/main/resources/META-INF/beans.xml
index 1d7c79f..1eb2da4 100644
--- a/examples/jpa-hibernate-arquillian/src/main/resources/META-INF/beans.xml
+++ b/examples/jpa-hibernate-arquillian/src/main/resources/META-INF/beans.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,9 +16,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee";
+<beans xmlns="https://jakarta.ee/xml/ns/jakartaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd";
- bean-discovery-mode="all"
- version="2.0">
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd";
+ bean-discovery-mode="all">
</beans>
\ No newline at end of file
diff --git
a/examples/jpa-hibernate-arquillian/src/main/resources/META-INF/persistence.xml
b/examples/jpa-hibernate-arquillian/src/main/resources/META-INF/persistence.xml
index 372bf7b..d7eb7b7 100644
---
a/examples/jpa-hibernate-arquillian/src/main/resources/META-INF/persistence.xml
+++
b/examples/jpa-hibernate-arquillian/src/main/resources/META-INF/persistence.xml
@@ -24,7 +24,7 @@
<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
<jta-data-source>movieDatabase</jta-data-source>
<non-jta-data-source>movieDatabaseUnmanaged</non-jta-data-source>
- <class>org.superbiz.injection.h3jpa.Movie</class>
+ <class>org.superbiz.injection.h5jpa.Movie</class>
<properties>
<property name="hibernate.hbm2ddl.auto" value="update"/>
<property name="hibernate.dialect"
value="org.hibernate.dialect.HSQLDialect"/>
diff --git
a/examples/jpa-hibernate-arquillian/src/test/resources/arquillian.xml
b/examples/jpa-hibernate-arquillian/src/test/resources/arquillian.xml
index e55b693..99d834a 100644
--- a/examples/jpa-hibernate-arquillian/src/test/resources/arquillian.xml
+++ b/examples/jpa-hibernate-arquillian/src/test/resources/arquillian.xml
@@ -29,18 +29,15 @@
<property name="cleanOnStartUp">true</property>
<property name="additionalLibs">
<!-- add hibernate 5 need it jars to the server-->
- mvn:org.hibernate:hibernate-entitymanager:5.4.10.Final
- mvn:org.hibernate:hibernate-core:5.4.10.Final
-
mvn:org.hibernate.common:hibernate-commons-annotations:5.1.0.Final
+ mvn:org.hibernate:hibernate-core-jakarta:5.6.7.Final
+
mvn:org.hibernate.common:hibernate-commons-annotations:5.1.2.Final
mvn:antlr:antlr:2.7.7
- mvn:org.jboss:jandex:1.1.0.Final
+ mvn:org.jboss:jandex:2.4.2.Final
mvn:org.jboss.logging:jboss-logging:3.3.2.Final
- mvn:dom4j:dom4j:1.6.1
- mvn:org.javassist:javassist:3.18.1-GA
- mvn:net.bytebuddy:byte-buddy:1.10.2
- mvn:com.fasterxml:classmate:1.0.0
+ mvn:net.bytebuddy:byte-buddy:1.12.8
+ mvn:com.fasterxml:classmate:1.5.1
</property>
-
+ <property name="debug">true</property>
</configuration>
</container>
</arquillian>
