This is an automated email from the ASF dual-hosted git repository. solomax pushed a commit to branch solomax/h2-switch in repository https://gitbox.apache.org/repos/asf/openjpa.git
commit 70cf4ce29350e77283b4e33bfa4a7bf33f0f7c61 Author: Maxim Solodovnik <solo...@apache.org> AuthorDate: Fri Jul 4 14:42:12 2025 +0700 Switching CI to H2 DB (with DB driver update and test fix) --- .github/workflows/ci.yml | 2 +- .github/workflows/pr-validation.yml | 2 +- .../java/org/apache/openjpa/persistence/simple/TestJava8TimeTypes.java | 3 +-- pom.xml | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fd68a2eae..48a01f775 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,6 +34,6 @@ jobs: key: 'cache' restore-keys: 'cache' - name: 'Build with Maven' - run: mvn -B install --file pom.xml + run: mvn -B install --file pom.xml -Ptest-h2 - name: 'Remove Snapshots Before Caching' run: find ~/.m2 -name '*SNAPSHOT' | xargs rm -Rf diff --git a/.github/workflows/pr-validation.yml b/.github/workflows/pr-validation.yml index f4b36241f..71db51b2c 100644 --- a/.github/workflows/pr-validation.yml +++ b/.github/workflows/pr-validation.yml @@ -34,6 +34,6 @@ jobs: key: 'cache' restore-keys: 'cache' - name: 'Build with Maven' - run: mvn -B install --file pom.xml + run: mvn -B install --file pom.xml -Ptest-h2 - name: 'Remove Snapshots Before Caching' run: find ~/.m2 -name '*SNAPSHOT' | xargs rm -Rf diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestJava8TimeTypes.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestJava8TimeTypes.java index 6a16db356..222fb27b2 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestJava8TimeTypes.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestJava8TimeTypes.java @@ -74,7 +74,6 @@ public class TestJava8TimeTypes extends SingleEMFTestCase { em.persist(entity2); em.getTransaction().commit(); em.close(); - } public void testReadJava8Types() { @@ -127,7 +126,7 @@ public class TestJava8TimeTypes extends SingleEMFTestCase { public void testMaxLocalTime() { EntityManager em = emf.createEntityManager(); final TypedQuery<LocalTime> qry = em.createQuery("select max(t.localTimeField) from Java8TimeTypes AS t", LocalTime.class); - final LocalTime max = qry.getSingleResult(); + final LocalTime max = qry.getSingleResult().withNano(0); final LocalTime etalon = (entity1.getLocalTimeField().compareTo(entity2.getLocalTimeField()) > 0 ? entity1.getLocalTimeField() : entity2.getLocalTimeField()).withNano(0); assertEquals(etalon, max); diff --git a/pom.xml b/pom.xml index ac5af5327..06c1e4a05 100644 --- a/pom.xml +++ b/pom.xml @@ -451,7 +451,7 @@ </property> </activation> <properties> - <h2.version>1.4.200</h2.version> + <h2.version>2.3.232</h2.version> <connection.driver.name>org.h2.Driver</connection.driver.name> <connection.url>jdbc:h2:./target/database/openjpa-h2-database</connection.url> <connection.username />