HHH-17377 - Migrate to JPA 3.2

https://hibernate.atlassian.net/browse/HHH-17377 Change GitHub workflow to use Java 17
hibernate · Nov 17, 2023 · 606c86e · 606c86e
1 parent 19ef8d3
commit 606c86e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/atlas.yml b/.github/workflows/atlas.yml
@@ -29,7 +29,7 @@ jobs:
   build:
     permissions:
       contents: read
-    name: Java 17
+    name: Hibernate ORM
     #    runs-on: ubuntu-latest
     runs-on: [self-hosted, Linux, X64, OCI]
     strategy:
@@ -51,7 +51,7 @@ jobs:
           RDBMS: ${{ matrix.rdbms }}
           RUNID: ${{ github.run_number }}
         run: ci/database-start.sh
-      - name: Set up Java 17
+      - name: Set up JDK
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'

diff --git a/.github/workflows/contributor-build.yml b/.github/workflows/contributor-build.yml
@@ -29,7 +29,7 @@ jobs:
   build:
     permissions:
       contents: read
-    name: Java 11
+    name: Java 17
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -60,11 +60,11 @@ jobs:
         env:
           RDBMS: ${{ matrix.rdbms }}
         run: ci/database-start.sh
-      - name: Set up Java 11
+      - name: Set up Java 17
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '17'
       - name: Get year/month for cache key
         id: get-date
         run: echo "yearmonth=$(/bin/date -u "+%Y-%m")" >> $GITHUB_OUTPUT

diff --git a/...radle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/misc/TransformHbmXmlTask.java b/...radle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/misc/TransformHbmXmlTask.java
@@ -24,7 +24,7 @@
 import org.hibernate.boot.jaxb.hbm.transform.HbmXmlTransformer;
 import org.hibernate.boot.jaxb.hbm.transform.UnsupportedFeatureHandling;
 import org.hibernate.boot.jaxb.internal.MappingBinder;
-import org.hibernate.boot.jaxb.mapping.JaxbEntityMappings;
+import org.hibernate.boot.jaxb.mapping.spi.JaxbEntityMappingsImpl;
 import org.hibernate.boot.jaxb.spi.Binding;
 import org.hibernate.boot.xsd.MappingXsdSupport;
 
@@ -146,7 +146,7 @@ private void transformFile(MappingBinder mappingBinder, Marshaller marshaller, F
 
 		final HbmXmlTransformer.Options transformationOptions = unsupportedFeatures::get;
 
-		final JaxbEntityMappings transformed = HbmXmlTransformer.transform( binding.getRoot(), origin, transformationOptions );
+		final JaxbEntityMappingsImpl transformed = HbmXmlTransformer.transform( binding.getRoot(), origin, transformationOptions );
 
 		final String copyName = determineCopyName( hbmXmlFile );
 		final File copyFile = determineCopyFile( copyName, hbmXmlFile );