Try fix CI issues

Author: beikov

.github/workflows/ci.yaml

@@ -48,13 +48,6 @@ jobs:
             jdk: 17
             native: true
 ################################################
-# Test different spring-data and deltaspike versions
-################################################
-          - rdbms: h2
-            provider: hibernate-6.6
-            jdk: 17
-            spring-data: spring-data-3.3.x
-################################################
 # A Hibernate 6.6 profile that also runs the entity-view-annotation-processor
 ################################################
           - rdbms: postgresql
@@ -74,26 +67,22 @@ jobs:
           - rdbms: h2
             provider: hibernate-6.2
             jdk: 17
-            spring-data: spring-data-3.1.x
+            spring-data: spring-data-3.2.x
 
 ################################################
 # hibernate-6.4
 ################################################
           - rdbms: h2
             provider: hibernate-6.4
             jdk: 17
-            spring-data: spring-data-3.2.x
+            spring-data: spring-data-3.3.x
 ################################################
 # hibernate-6.6
 ################################################
           - rdbms: h2
             provider: hibernate-6.6
             jdk: 17
             spring-data: spring-data-3.4.x
-          - rdbms: h2
-            provider: hibernate-6.6
-            jdk: 17
-            spring-data: spring-data-3.5.x
 ################################################
 # hibernate-7.1
 ################################################
@@ -115,9 +104,6 @@ jobs:
             provider: hibernate-6.6
             jdk: 17
             build-jdk: 17
-################################################
-# Latest GA JDK
-################################################
           - rdbms: h2
             provider: hibernate-6.6
             jdk: 21
@@ -126,15 +112,27 @@ jobs:
             jdk: 21
             build-jdk: 21
 ################################################
+# Latest GA JDK
+################################################
+          - rdbms: h2
+            provider: hibernate-7.2
+            jdk: 25
+            spring-data: spring-data-4.0.x
+          - rdbms: h2
+            provider: hibernate-7.2
+            jdk: 25
+            build-jdk: 25
+            spring-data: spring-data-4.0.x
+################################################
 # Early access JDKs
 ################################################
 #          - rdbms: h2
 #            provider: hibernate-6.6
-#            jdk: 22-ea
+#            jdk: 26-ea
 #          - rdbms: h2
 #            provider: hibernate-6.6
-#            jdk: 22-ea
-#            build-jdk: 22-ea
+#            jdk: 26-ea
+#            build-jdk: 26-ea
     steps:
       - uses: actions/checkout@v4
       - name: Update /etc/hosts file
@@ -161,19 +159,32 @@ jobs:
           java-version: ${{ matrix.jdk }}
           distribution: 'zulu'
 
-      - name: Get year/month for cache key
-        id: get-date
+      - name: Generate cache key
+        id: cache-key
         run: |
-          echo "::set-output name=yearmonth::$(/bin/date -u "+%Y-%m")"
-        shell: bash
+          CURRENT_BRANCH="${{ github.repository != 'Blazebit/blaze-persistence' && 'fork' || github.base_ref || github.ref_name }}"
+          CURRENT_MONTH=$(/bin/date -u "+%Y-%m")
+          CURRENT_DAY=$(/bin/date -u "+%d")
+          ROOT_CACHE_KEY="buildtool-cache"
+          echo "buildtool-monthly-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}" >> $GITHUB_OUTPUT
+          echo "buildtool-monthly-branch-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}-${CURRENT_BRANCH}" >> $GITHUB_OUTPUT
+          echo "buildtool-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}-${CURRENT_BRANCH}-${CURRENT_DAY}" >> $GITHUB_OUTPUT
       - name: Cache Maven local repository
         uses: actions/cache@v4
         id: cache-maven
+        # if it's not a pull request, we restore and save the cache
+        if: github.event_name != 'pull_request'
         with:
           path: |
-            ~/.m2/repository
-          # refresh cache every month to avoid unlimited growth
-          key: maven-localrepo-${{ steps.get-date.outputs.yearmonth }}
+            ~/.m2/repository/
+            ~/.m2/wrapper/
+          # A new cache will be stored daily. After that first store of the day, cache save actions will fail because the cache is immutable but it's not a problem.
+          # The whole cache is dropped monthly to prevent unlimited growth.
+          # The cache is per branch but in case we don't find a branch for a given branch, we will get a cache from another branch.
+          key: ${{ steps.cache-key.outputs.buildtool-cache-key }}
+          restore-keys: |
+            ${{ steps.cache-key.outputs.buildtool-monthly-branch-cache-key }}-
+            ${{ steps.cache-key.outputs.buildtool-monthly-cache-key }}-
       - name: Set up Maven
         run: ./mvnw -v
 

build.sh

@@ -29,24 +29,14 @@ if [[ "$BUILD_JDK" != "" ]]; then
     export BUILD_JDK=${BUILD_JDK::-3}
   fi
   PROPERTIES="$PROPERTIES -Dmain.java.version=$BUILD_JDK -Dtest.java.version=$BUILD_JDK"
-  if [[ "$BUILD_JDK" == "21" ]] || [[ "$BUILD_JDK" == "22" ]]; then
+  if [[ "$BUILD_JDK" == "21" ]] || [[ "$BUILD_JDK" == "25" ]] || [[ "$BUILD_JDK" == "26" ]]; then
     # Until Deltaspike releases a version with ASM 9.5, we have to exclude these parts from the build
     PROPERTIES="-pl !integration/deltaspike-data/testsuite $PROPERTIES"
   fi
 fi
 
-if [[ "$JDK" != "" ]]; then
-  if [[ "$JDK" == *-ea ]]; then
-    export JDK=${JDK::-3}
-  fi
-  if [[ "$JDK" == "21" ]] || [[ "$JDK" == "22" ]]; then
-    # As of JDK 21 Javac produces parameter attributes with a null name that old BND versions can't read
-    PROPERTIES="$PROPERTIES -Dversion.bnd=7.0.0"
-  fi
-fi
-
 if [[ "$NATIVE" == "true" ]]; then
-  exec $DIR/mvnw -B -P ${JPAPROVIDER},${RDBMS},${SPRING_DATA:-spring-data-3.3.x},${DELTASPIKE:-deltaspike-2.0},native${ADDITIONAL_PROFILES} clean install -am -V $PROPERTIES
+  exec $DIR/mvnw -B -P ${JPAPROVIDER},${RDBMS},${SPRING_DATA:-spring-data-3.5.x},${DELTASPIKE:-deltaspike-2.0},native${ADDITIONAL_PROFILES} clean install -am -V $PROPERTIES
 else
-  exec $DIR/mvnw -B -P ${JPAPROVIDER},${RDBMS},${SPRING_DATA:-spring-data-3.3.x},${DELTASPIKE:-deltaspike-2.0}${ADDITIONAL_PROFILES} clean install -am -V $PROPERTIES
+  exec $DIR/mvnw -B -P ${JPAPROVIDER},${RDBMS},${SPRING_DATA:-spring-data-3.5.x},${DELTASPIKE:-deltaspike-2.0}${ADDITIONAL_PROFILES} clean install -am -V $PROPERTIES
 fi

core/testsuite-hibernate/pom.xml

@@ -253,7 +253,7 @@
                             <reportsDirectory>${project.build.directory}/surefire-reports/${surefire.forkNumber}</reportsDirectory>
                             <excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoOracle,${jpa.excludedGroups}</excludedGroups>
                             <systemPropertyVariables>
-                                <jdbc.url>jdbc:oracle:thin:@${dbHost}:1521:XE</jdbc.url>
+                                <jdbc.url>jdbc:oracle:thin:@//${dbHost}:1521/freepdb1</jdbc.url>
                                 <jdbc.user>SYSTEM</jdbc.user>
                                 <jdbc.password>Oracle18</jdbc.password>
                                 <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
@@ -647,7 +647,7 @@
             <id>hibernate-7.1</id>
             <properties>
                 <jpa-api-version>${version.jakarta-jpa-3.2-api}</jpa-api-version>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate70</jpa.excludedGroups>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate70</jpa.excludedGroups>
             </properties>
             <dependencies>
                 <dependency>
@@ -748,7 +748,7 @@
             <id>hibernate-7.2</id>
             <properties>
                 <jpa-api-version>${version.jakarta-jpa-3.2-api}</jpa-api-version>
-                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate70</jpa.excludedGroups>
+                <jpa.excludedGroups>com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate70</jpa.excludedGroups>
             </properties>
             <dependencies>
                 <dependency>

core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue1167Test.java

@@ -5,6 +5,7 @@
 
 package com.blazebit.persistence.testsuite.hibernate;
 
+import org.hibernate.annotations.SQLRestriction;
 import org.hibernate.annotations.Where;
 import org.junit.Test;
 
@@ -27,6 +28,7 @@ protected Class<?>[] getEntityClasses() {
 
     @Entity(name = "BasicEntity")
     @Where(clause = "deleted_char <> 't'")
+    @SQLRestriction("deleted_char <> 't'")
     public static class BasicEntity {
         @Id
         Long id;

core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue1436Test.java

@@ -16,6 +16,8 @@
 import jakarta.persistence.ManyToOne;
 import java.io.Serializable;
 
+import org.hibernate.annotations.processing.Exclude;
+
 import static org.junit.Assert.assertEquals;
 
 /**
@@ -38,6 +40,7 @@ public void testBuild() {
     }
 
     @Entity
+	@Exclude
     public static class Item implements Serializable {
         @Id
         Long id1;
@@ -49,6 +52,7 @@ public Item() {
     }
 
     @Entity
+	@Exclude
     public static class OrderItem implements Serializable {
         @Id
         Long id;

core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue1704Test.java

@@ -9,6 +9,7 @@
 import java.util.List;
 import java.util.Set;
 
+import org.hibernate.annotations.SQLRestriction;
 import org.hibernate.annotations.Where;
 
 import org.junit.Assert;
@@ -67,6 +68,7 @@ public void work(EntityManager em) {
 
     @Entity(name = "WhereEntity")
     @Where(clause = "0=0")
+    @SQLRestriction("0=0")
     public static class WhereEntity {
 
         private Long id;

core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue519Test.java

@@ -11,6 +11,8 @@
 import org.hibernate.annotations.Generated;
 import org.hibernate.annotations.GenerationTime;
 import org.hibernate.annotations.Subselect;
+import org.hibernate.generator.EventType;
+
 import org.junit.Test;
 
 import jakarta.persistence.Column;
@@ -74,7 +76,7 @@ public static class A {
         @Id
         private Long id;
 
-        @Generated(GenerationTime.INSERT)
+        @Generated(value = GenerationTime.INSERT, event = EventType.INSERT)
         @OneToOne(mappedBy = "a")
         private B b;
 

core/testsuite-hibernate/src/test/java/org/hibernate/annotations/Generated.java

@@ -0,0 +1,26 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+
+package org.hibernate.annotations;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import org.hibernate.generator.EventType;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static org.hibernate.generator.EventType.INSERT;
+
+@Target( {FIELD, METHOD} )
+@Retention( RUNTIME )
+public @interface Generated {
+	EventType[] event() default INSERT;
+	@Deprecated(since = "6.2")
+	GenerationTime value() default GenerationTime.INSERT;
+	String sql() default "";
+	boolean writable() default false;
+}

core/testsuite-hibernate/src/test/java/org/hibernate/annotations/GenerationTime.java

@@ -0,0 +1,13 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+
+package org.hibernate.annotations;
+
+public enum GenerationTime {
+	NEVER,
+	INSERT,
+	UPDATE,
+	ALWAYS;
+}

core/testsuite-hibernate/src/test/java/org/hibernate/annotations/SQLRestriction.java

@@ -0,0 +1,20 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Blazebit
+ */
+
+package org.hibernate.annotations;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Target({TYPE, METHOD, FIELD})
+@Retention(RUNTIME)
+public @interface SQLRestriction {
+    String value();
+}