From daebe31134dbd515a76dc9051915173813030e74 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 12 Aug 2024 08:47:27 +0200 Subject: [PATCH] Upgrade to Hibernate 6.6. Closes #3574 --- Jenkinsfile | 43 ------------------------------------------- pom.xml | 29 +++-------------------------- 2 files changed, 3 insertions(+), 69 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5fceae1007..3cfe2ce914 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -80,49 +80,6 @@ pipeline { } } } - stage("test: baseline (hibernate 6.5 snapshots)") { - agent { - label 'data' - } - options { timeout(time: 30, unit: 'MINUTES')} - environment { - ARTIFACTORY = credentials("${p['artifactory.credentials']}") - DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}") - TESTCONTAINERS_IMAGE_SUBSTITUTOR = 'org.springframework.data.jpa.support.ProxyImageNameSubstitutor' - } - steps { - script { - docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) { - docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) { - sh "PROFILE=all-dbs,hibernate-65-snapshots " + - "JENKINS_USER_NAME=${p['jenkins.user.name']} " + - "ci/test.sh" - } - } - } - } - } - stage("test: baseline (hibernate 6.6 preview)") { - agent { - label 'data' - } - options { timeout(time: 30, unit: 'MINUTES')} - environment { - ARTIFACTORY = credentials("${p['artifactory.credentials']}") - DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}") - DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}") - TESTCONTAINERS_IMAGE_SUBSTITUTOR = 'org.springframework.data.jpa.support.ProxyImageNameSubstitutor' - } - steps { - script { - docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) { - sh "PROFILE=all-dbs,hibernate-66 " + - "JENKINS_USER_NAME=${p['jenkins.user.name']} " + - "ci/test.sh" - } - } - } - } stage("test: baseline (hibernate 6.6 snapshots)") { agent { label 'data' diff --git a/pom.xml b/pom.xml index 9fb83c6cd3..5efaf59330 100755 --- a/pom.xml +++ b/pom.xml @@ -30,11 +30,9 @@ 4.13.0 3.0.4 4.0.2 - 6.5.0.Final - 6.2.28.Final - 6.5.3-SNAPSHOT - 6.6.0.CR1 - 6.6.0-SNAPSHOT + 6.6.0.Final + 6.2.30.Final + 6.6.1-SNAPSHOT 7.0.0.Beta1 7.0.0-SNAPSHOT 2.7.1 @@ -72,27 +70,6 @@ ${hibernate-62} - - hibernate-65-snapshots - - ${hibernate-65-snapshots} - - - - sonatype-oss - https://oss.sonatype.org/content/repositories/snapshots - - false - - - - - - hibernate-66 - - ${hibernate-66} - - hibernate-66-snapshots