diff --git a/ci/release/Jenkinsfile b/ci/release/Jenkinsfile index b2931215db51..91fb48d0060d 100644 --- a/ci/release/Jenkinsfile +++ b/ci/release/Jenkinsfile @@ -169,6 +169,7 @@ pipeline { env.RELEASE_VERSION = releaseVersion.toString() env.DEVELOPMENT_VERSION = developmentVersion.toString() env.SCRIPT_OPTIONS = params.RELEASE_DRY_RUN ? "-d" : "" + env.JRELEASER_DRY_RUN = params.RELEASE_DRY_RUN // Determine version id to check if Jira version exists sh ".release/scripts/determine-jira-version-id.sh ${env.JIRA_KEY} ${releaseVersion.withoutFinalQualifier}" @@ -194,7 +195,7 @@ pipeline { // Increase the amount of memory for this part since asciidoctor doc rendering consumes a lot of metaspace "GRADLE_OPTS=-Dorg.gradle.jvmargs='-Dlog4j2.disableJmx -Xmx4g -XX:MaxMetaspaceSize=768m -XX:+HeapDumpOnOutOfMemoryError -Duser.language=en -Duser.country=US -Duser.timezone=UTC -Dfile.encoding=UTF-8'" ]) { - sh ".release/scripts/prepare-release.sh -b ${env.GIT_BRANCH} -d ${env.DEVELOPMENT_VERSION} ${env.PROJECT} ${env.RELEASE_VERSION}" + sh ".release/scripts/prepare-release.sh -j -b ${env.GIT_BRANCH} -v ${env.DEVELOPMENT_VERSION} ${env.PROJECT} ${env.RELEASE_VERSION}" } } } @@ -233,8 +234,7 @@ pipeline { withEnv([ "DISABLE_REMOTE_GRADLE_CACHE=true" ]) { - env.RELEASE_GPG_HOMEDIR = env.WORKSPACE_TMP + '/.gpg' - sh ".release/scripts/publish.sh ${env.SCRIPT_OPTIONS} ${env.PROJECT} ${env.RELEASE_VERSION} ${env.DEVELOPMENT_VERSION} ${env.GIT_BRANCH}" + sh ".release/scripts/publish.sh -j ${env.SCRIPT_OPTIONS} ${env.PROJECT} ${env.RELEASE_VERSION} ${env.DEVELOPMENT_VERSION} ${env.GIT_BRANCH}" } } } diff --git a/jreleaser.yml b/jreleaser.yml deleted file mode 100644 index a5974acec1e4..000000000000 --- a/jreleaser.yml +++ /dev/null @@ -1,41 +0,0 @@ -project: - languages: - java: - groupId: org.hibernate.orm - -release: - github: - skipTag: true - skipRelease: true - tagName: '{{projectVersion}}' - -# File signing is always active -signing: - mode: COMMAND - active: RELEASE - armored: true - -deploy: - maven: - # TODO: HHH-19309: Remove the entire nexus2 section: - nexus2: - maven-central: - active: RELEASE - url: https://oss.sonatype.org/service/local - snapshotUrl: https://oss.sonatype.org/content/repositories/snapshots/ - closeRepository: true - releaseRepository: false - stagingRepositories: - - target/staging-deploy/maven - mavenCentral: - maven-central: - # TODO: HHH-19309: Change to RELEASE once switching to Maven-Central: - # Note, this is an untested configuration, hence might need further adjustments - active: NEVER - url: https://central.sonatype.com/api/v1/publisher - snapshotSupported: false - applyMavenCentralRules: true - stagingRepositories: - - target/staging-deploy/maven - # Deployment identifier used for publication. - # deploymentId: dd9991b0-18a7-41e7-b1fe-37b8ea936f85