Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,9 @@ bin/
.vscode/

### Mac OS ###
.DS_Store
.DS_Store

# Our build scripts - necessary for our release jobs
hibernate-noorm-release-scripts
hibernate-release-scripts
jreleaser
10 changes: 5 additions & 5 deletions buildSrc/src/main/groovy/release-process.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ plugins {
// Release processing
//
// Processes should execute the following tasks in order
// - prepareForRelease (this script)
// - releasePrepare (this script)
// - publishToSonatype (io.github.gradle-nexus.publish-plugin)
// - closeSonatypeStagingRepository (io.github.gradle-nexus.publish-plugin)
// - releasePerform (this script)
Expand All @@ -27,10 +27,10 @@ def gitBranch = determineGitBranch( project )
// - change version in `/version.txt` to the release version
// - commit the version change
//
// Processes should execute `prepareForRelease`
// Processes should execute `releasePrepare`
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

def releasePreparationTask = tasks.register( "releasePrepare" ) {
def releasePreparationTask = tasks.register( "releasePreparation" ) {
doFirst {
logger.lifecycle "Release version : {}", releaseVersion
logger.lifecycle "Development version : {}", developmentVersion
Expand All @@ -45,7 +45,7 @@ def releasePreparationTask = tasks.register( "releasePrepare" ) {
// String diffWithUpstream = executeGitCommand( 'diff', '@{u}' )
// if ( !diffWithUpstream.isEmpty() ) {
// throw new GradleException(
// "Cannot perform `prepareForRelease` tasks because there are un-pushed local commits .\n" +
// "Cannot perform `releasePrepare` tasks because there are un-pushed local commits .\n" +
// "Push your commits first."
// );
// }
Expand Down Expand Up @@ -74,7 +74,7 @@ def changeToReleaseVersionTask = tasks.register( "changeToReleaseVersion" ) {
}
}

tasks.register( "prepareForRelease" ) {
tasks.register( "releasePrepare" ) {
dependsOn releasePreparationTask
dependsOn changeToReleaseVersionTask
}
Expand Down
2 changes: 1 addition & 1 deletion ci/release/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ pipeline {
sh 'git clone https://github.com/hibernate/hibernate-release-scripts.git'
env.RELEASE_GPG_HOMEDIR = env.WORKSPACE_TMP + '/.gpg'
sh """
bash -xe hibernate-release-scripts/release.sh ${params.RELEASE_DRY_RUN ? '-d' : ''} -b ${env.BRANCH_NAME} \
bash -xe hibernate-release-scripts/release.sh ${params.RELEASE_DRY_RUN ? '-d' : ''} \
models ${releaseVersion.toString()} ${developmentVersion.toString()}
"""
}
Expand Down
253 changes: 0 additions & 253 deletions jreleaser/LICENSE

This file was deleted.

13 changes: 0 additions & 13 deletions jreleaser/NOTICE

This file was deleted.

Loading
Loading