[highsource#425] jpa 3.1 for hyperjaxb with hibernate 6 / eclipselink 4

mattrpav · Feb 5, 2024 · d61e920 · d61e920
1 parent f478ef1
commit d61e920
Show file tree

Hide file tree

Showing 107 changed files with 2,576 additions and 337 deletions.
diff --git a/...in/resources/org/jvnet/hyperjaxb3/ejb/strategy/customizing/impl/DefaultCustomizations.xml b/...in/resources/org/jvnet/hyperjaxb3/ejb/strategy/customizing/impl/DefaultCustomizations.xml
@@ -83,14 +83,14 @@
     <!-- 3.2.4 xsd:float -->
 	<hj:default-single-property type="xsd:float">
 		<hj:basic>
-			<orm:column scale="10" precision="20"/>
+			<orm:column precision="14"/>
 		</hj:basic>
 	</hj:default-single-property>
 
     <!-- 3.2.5 xsd:double -->
 	<hj:default-single-property type="xsd:double">
 		<hj:basic>
-			<orm:column scale="10" precision="20"/>
+			<orm:column precision="14"/>
 		</hj:basic>
 	</hj:default-single-property>
 

diff --git a/hyperjaxb/ejb/roundtrip/pom.xml b/hyperjaxb/ejb/roundtrip/pom.xml
@@ -36,19 +36,18 @@
 			<scope>provided</scope>
 		</dependency>
     <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-core-jakarta</artifactId>
+      <groupId>org.hibernate.orm</groupId>
+      <artifactId>hibernate-core</artifactId>
       <scope>test</scope>
     </dependency>
 		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-core-jakarta</artifactId>
+			<groupId>org.hibernate.orm</groupId>
+			<artifactId>hibernate-core</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-      <classifier>jdk8</classifier>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

diff --git a/hyperjaxb/ejb/samples/customerservice-cxf/pom.xml b/hyperjaxb/ejb/samples/customerservice-cxf/pom.xml
@@ -46,9 +46,9 @@
 			<version>${jpa-api.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-core-jakarta</artifactId>
-			<version>${hibernate-entitymanager.version}</version>
+			<groupId>org.hibernate.orm</groupId>
+			<artifactId>hibernate-core</artifactId>
+			<version>${hibernate-core.version}</version>
 		</dependency>
 		<!-- Hyperjaxb3 -->
 		<dependency>
@@ -59,8 +59,7 @@
 		<dependency>
 			<groupId>org.hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>${hsqldb.version}</version>
-            <classifier>jdk8</classifier>
+      <version>${hsqldb.version}</version>
 			<scope>runtime</scope>
 		</dependency>
 		<!-- Logging -->

diff --git a/hyperjaxb/ejb/samples/po-customized-eclipselink/pom.xml b/hyperjaxb/ejb/samples/po-customized-eclipselink/pom.xml
@@ -41,7 +41,6 @@
 		<dependency>
 			<groupId>org.hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-            <classifier>jdk8</classifier>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

diff --git a/hyperjaxb/ejb/samples/po-customized-eclipselink/project-pom.xml b/hyperjaxb/ejb/samples/po-customized-eclipselink/project-pom.xml
@@ -49,8 +49,7 @@
 		<dependency>
 			<groupId>org.hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>${hsqldb.version}</version>
-            <classifier>jdk8</classifier>
+      <version>${hsqldb.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

diff --git a/hyperjaxb/ejb/samples/po-initial/pom.xml b/hyperjaxb/ejb/samples/po-initial/pom.xml
@@ -29,8 +29,8 @@
 		</dependency>
 		<!-- Hibernate Dependencies -->
 		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-core-jakarta</artifactId>
+			<groupId>org.hibernate.orm</groupId>
+			<artifactId>hibernate-core</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<!-- Roundtrip -->
@@ -42,8 +42,6 @@
 		<dependency>
 			<groupId>org.hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>${hsqldb.version}</version>
-            <classifier>jdk8</classifier>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

diff --git a/hyperjaxb/ejb/samples/po-initial/project-pom.xml b/hyperjaxb/ejb/samples/po-initial/project-pom.xml
@@ -40,17 +40,16 @@
 
 		<!-- Hibernate Dependencies -->
 		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-core-jakarta</artifactId>
-			<version>${hibernate-entitymanager.version}</version>
+			<groupId>org.hibernate.orm</groupId>
+			<artifactId>hibernate-core</artifactId>
+			<version>${hibernate-core.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<!-- Database -->
 		<dependency>
 			<groupId>org.hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>${hsqldb.version}</version>
-            <classifier>jdk8</classifier>
+      <version>${hsqldb.version}</version>
 			<scope>test</scope>
 		</dependency>
 

diff --git a/hyperjaxb/ejb/samples/po-maven-jaxb2-plugin/project-pom.xml b/hyperjaxb/ejb/samples/po-maven-jaxb2-plugin/project-pom.xml
@@ -35,17 +35,16 @@
 
 		<!-- Hibernate Dependencies -->
 		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-core-jakarta</artifactId>
-			<version>${hibernate-entitymanager.version}</version>
+			<groupId>org.hibernate.orm</groupId>
+			<artifactId>hibernate-core</artifactId>
+			<version>${hibernate-core.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<!-- Database -->
 		<dependency>
 			<groupId>org.hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>${hsqldb.version}</version>
-            <classifier>jdk8</classifier>
+      <version>${hsqldb.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

diff --git a/hyperjaxb/ejb/samples/uniprot/pom.xml b/hyperjaxb/ejb/samples/uniprot/pom.xml
@@ -29,8 +29,8 @@
 		</dependency>
 		<!-- Hibernate Dependencies -->
 		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-core-jakarta</artifactId>
+			<groupId>org.hibernate.orm</groupId>
+			<artifactId>hibernate-core</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<!-- Roundtrip -->
@@ -42,7 +42,6 @@
 		<dependency>
 			<groupId>org.hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-      <classifier>jdk8</classifier>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

diff --git a/hyperjaxb/ejb/samples/uniprot/project-pom.xml b/hyperjaxb/ejb/samples/uniprot/project-pom.xml
@@ -40,17 +40,16 @@
 
 		<!-- Hibernate Dependencies -->
 		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-core-jakarta</artifactId>
-			<version>${hibernate-entitymanager.version}</version>
+			<groupId>org.hibernate.orm</groupId>
+			<artifactId>hibernate-core</artifactId>
+			<version>${hibernate-core.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<!-- Database -->
 		<dependency>
 			<groupId>org.hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
 			<version>${hsqldb.version}</version>
-      <classifier>jdk8</classifier>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

diff --git a/...zations/src/main/java/org/jvnet/hyperjaxb3/ejb/schemas/customizations/Customizations.java b/...zations/src/main/java/org/jvnet/hyperjaxb3/ejb/schemas/customizations/Customizations.java
@@ -109,7 +109,7 @@ public static QName orm(String localPart) {
 	public static final QName EMBEDDED_ELEMENT_NAME = hj("embedded");
 
 	public static QName GENERATED_ELEMENT_NAME = new QName(
-			"http://jaxb2-commons.dev.java.net/basic", "generated");
+			"urn:jaxb.jvnet.org:plugin", "generated");
 
 
 

diff --git a/hyperjaxb/ejb/schemas/customizations/src/main/resources/customizations.xsd b/hyperjaxb/ejb/schemas/customizations/src/main/resources/customizations.xsd
@@ -11,7 +11,7 @@
 	xmlns:inheritance="urn:jaxb.jvnet.org:plugin:inheritance">
 
 	<xsd:import namespace="https://jakarta.ee/xml/ns/persistence/orm"
-		schemaLocation="orm/orm_3_0.xsd"/>
+		schemaLocation="orm/orm_3_1.xsd"/>
 	<xsd:import namespace="https://jakarta.ee/xml/ns/persistence"
 		schemaLocation="persistence_3_0.xsd"/>
 

diff --git a/...ations/src/main/resources/orm/orm_3_0.xsd → ...ations/src/main/resources/orm/orm_3_1.xsd b/...ations/src/main/resources/orm/orm_3_0.xsd → ...ations/src/main/resources/orm/orm_3_1.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2008, 2020 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,7 +18,7 @@
   xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
   elementFormDefault="qualified" 
   attributeFormDefault="unqualified" 
-  version="3.0">
+  version="3.1">
 
   <xsd:annotation>
      <xsd:documentation><![CDATA[
@@ -40,8 +40,8 @@
       <entity-mappings xmlns="https://jakarta.ee/xml/ns/persistence/orm"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence/orm
-          https://jakarta.ee/xml/ns/persistence/orm/orm_3_0.xsd"
-        version="3.0">
+          https://jakarta.ee/xml/ns/persistence/orm/orm_3_1.xsd"
+        version="3.1">
           ...
       </entity-mappings>
 
@@ -132,7 +132,7 @@
                      minOccurs="0" maxOccurs="unbounded"/>
       </xsd:sequence>
       <xsd:attribute name="version" type="orm:versionType" 
-                     fixed="3.0" use="required"/>
+                     fixed="3.1" use="required"/>
     </xsd:complexType>
   </xsd:element>
 
@@ -1057,14 +1057,15 @@
     <xsd:annotation>
       <xsd:documentation>
 
-        public enum GenerationType { TABLE, SEQUENCE, IDENTITY, AUTO };
+        public enum GenerationType { TABLE, SEQUENCE, IDENTITY, UUID, AUTO };
 
       </xsd:documentation>
     </xsd:annotation>
     <xsd:restriction base="xsd:token">
       <xsd:enumeration value="TABLE"/>
       <xsd:enumeration value="SEQUENCE"/>
       <xsd:enumeration value="IDENTITY"/>
+      <xsd:enumeration value="UUID"/>
       <xsd:enumeration value="AUTO"/>
     </xsd:restriction>
   </xsd:simpleType>

diff --git a/...ain/resources/persistence/orm/orm_3_0.xsd → ...rjaxb/ejb/schemas/persistence/orm_3_1.xsd b/...ain/resources/persistence/orm/orm_3_0.xsd → ...rjaxb/ejb/schemas/persistence/orm_3_1.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2008, 2020 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,7 +18,7 @@
   xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
   elementFormDefault="qualified" 
   attributeFormDefault="unqualified" 
-  version="3.0">
+  version="3.1">
 
   <xsd:annotation>
      <xsd:documentation><![CDATA[
@@ -40,8 +40,8 @@
       <entity-mappings xmlns="https://jakarta.ee/xml/ns/persistence/orm"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence/orm
-          https://jakarta.ee/xml/ns/persistence/orm/orm_3_0.xsd"
-        version="3.0">
+          https://jakarta.ee/xml/ns/persistence/orm/orm_3_1.xsd"
+        version="3.1">
           ...
       </entity-mappings>
 
@@ -132,7 +132,7 @@
                      minOccurs="0" maxOccurs="unbounded"/>
       </xsd:sequence>
       <xsd:attribute name="version" type="orm:versionType" 
-                     fixed="3.0" use="required"/>
+                     fixed="3.1" use="required"/>
     </xsd:complexType>
   </xsd:element>
 
@@ -1057,14 +1057,15 @@
     <xsd:annotation>
       <xsd:documentation>
 
-        public enum GenerationType { TABLE, SEQUENCE, IDENTITY, AUTO };
+        public enum GenerationType { TABLE, SEQUENCE, IDENTITY, UUID, AUTO };
 
       </xsd:documentation>
     </xsd:annotation>
     <xsd:restriction base="xsd:token">
       <xsd:enumeration value="TABLE"/>
       <xsd:enumeration value="SEQUENCE"/>
       <xsd:enumeration value="IDENTITY"/>
+      <xsd:enumeration value="UUID"/>
       <xsd:enumeration value="AUTO"/>
     </xsd:restriction>
   </xsd:simpleType>

diff --git a/hyperjaxb/ejb/schemas/persistence/pom.xml b/hyperjaxb/ejb/schemas/persistence/pom.xml
@@ -51,7 +51,7 @@
 					<extension>true</extension>
 					<schemaIncludes>
             <include>**/persistence_3_0.xsd</include>
-            <include>**/orm_3_0.xsd</include>
+            <include>**/orm_3_1.xsd</include>
 					</schemaIncludes>
 					<args>
 						<arg>-Xequals</arg>

diff --git a/...chemas/persistence/src/main/java/org/jvnet/hyperjaxb3/persistence/jpa3/JPA3Constants.java b/...chemas/persistence/src/main/java/org/jvnet/hyperjaxb3/persistence/jpa3/JPA3Constants.java
@@ -10,6 +10,6 @@ private JPA3Constants() {
 	public static final String SCHEMA_LOCATION = PersistenceConstants.PERSISTENCE_NAMESPACE_URI
 			+ " https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd\n"
 			+ PersistenceConstants.ORM_NAMESPACE_URI
-			+ " https://jakarta.ee/xml/ns/persistence/orm/orm_3_0.xsd";
+			+ " https://jakarta.ee/xml/ns/persistence/orm/orm_3_1.xsd";
 
 }