File tree Expand file tree Collapse file tree 8 files changed +24
-470
lines changed
local-build-plugins/src/main
tooling/hibernate-gradle-plugin Expand file tree Collapse file tree 8 files changed +24
-470
lines changed Original file line number Diff line number Diff line change @@ -47,14 +47,6 @@ tasks.register( 'releasePrepare' ) {
4747 // See `:release:releasePrepare` which does a lot of heavy lifting here
4848}
4949
50- tasks. register( ' releasePerform' ) {
51- group " release-perform"
52- description " Scripted release 'Release Perform' stage. " +
53- " Generally this entails publishing artifacts to various servers. " +
54- " Sub-projects register their own `releasePerform` to hook into this stage."
55- // See `:release:releasePerform` which does a lot of heavy lifting here
56- }
57-
5850// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
5951// CI Build Task
6052
Original file line number Diff line number Diff line change @@ -222,7 +222,15 @@ pipeline {
222222 withEnv([
223223 " DISABLE_REMOTE_GRADLE_CACHE=true"
224224 ]) {
225- sh " .release/scripts/publish.sh -j ${ env.SCRIPT_OPTIONS} ${ env.PROJECT} ${ env.RELEASE_VERSION} ${ env.DEVELOPMENT_VERSION} ${ env.GIT_BRANCH} "
225+ def notesFiles = findFiles(glob : ' release_notes.md' )
226+ if ( notesFiles. length < 1 ) {
227+ throw new IllegalStateException ( " Could not locate `release_notes.md`" )
228+ }
229+ if ( notesFiles. length > 1 ) {
230+ throw new IllegalStateException ( " Located more than 1 `release_notes.md`" )
231+ }
232+
233+ sh " .release/scripts/publish.sh -j --notes=${ notesFiles[0].path} ${ env.SCRIPT_OPTIONS} ${ env.PROJECT} ${ env.RELEASE_VERSION} ${ env.DEVELOPMENT_VERSION} ${ env.GIT_BRANCH} "
226234 }
227235 }
228236 }
@@ -271,25 +279,6 @@ pipeline {
271279 }
272280 }
273281 }
274- stage(' Create GitHub release' ) {
275- steps {
276- script {
277- checkoutReleaseScripts()
278-
279- def notesFiles = findFiles(glob : ' release_notes.md' )
280- if ( notesFiles. length < 1 ) {
281- throw new IllegalStateException ( " Could not locate `release_notes.md`" )
282- }
283- if ( notesFiles. length > 1 ) {
284- throw new IllegalStateException ( " Located more than 1 `release_notes.md`" )
285- }
286-
287- withCredentials([string(credentialsId : ' Hibernate-CI.github.com' , variable : ' GITHUB_API_TOKEN' )]) {
288- sh " .release/scripts/github-release.sh ${ env.SCRIPT_OPTIONS} --notes=${ notesFiles[0].path} ${ env.PROJECT} ${ env.RELEASE_VERSION} "
289- }
290- }
291- }
292- }
293282 }
294283 post {
295284 always {
Original file line number Diff line number Diff line change @@ -912,4 +912,11 @@ tasks.withType(AsciidoctorTask).configureEach {
912912 separateOutputDirs = false
913913 backends ' html5'
914914 }
915+ // See https://docs.asciidoctor.org/gradle-plugin/latest/common-task-configuration/#choosing-an-execution-mode-for-asciidoctorj
916+ executionMode = org.ysb33r.grolifant.api.core.jvm.ExecutionMode . JAVA_EXEC
917+ }
918+
919+ tasks. withType(AsciidoctorPdfTask ). configureEach {
920+ // See https://docs.asciidoctor.org/gradle-plugin/latest/common-task-configuration/#choosing-an-execution-mode-for-asciidoctorj
921+ executionMode = org.ysb33r.grolifant.api.core.jvm.ExecutionMode . JAVA_EXEC
915922}
Original file line number Diff line number Diff line change @@ -50,6 +50,9 @@ def releasePrepareTask = tasks.register("releasePrepare") {
5050 dependsOn tasks. check
5151 dependsOn tasks. generateMetadataFileForPublishedArtifactsPublication
5252 dependsOn tasks. generatePomFileForPublishedArtifactsPublication
53+ // we depend on publishAllPublicationsToStagingRepository to make sure that the artifacts are "published" to a local staging directory
54+ // used by JReleaser during the release process
55+ dependsOn tasks. publishAllPublicationsToStagingRepository
5356}
5457
5558// used from the h2 CI job
Original file line number Diff line number Diff line change 1616 * @author Steve Ebersole
1717 */
1818public abstract class OrmBuildDetails {
19- private final ReleaseDetails releaseDetails ;
2019 private final Provider <File > versionFileAccess ;
2120 private final HibernateVersion hibernateVersion ;
2221
@@ -26,12 +25,9 @@ public abstract class OrmBuildDetails {
2625
2726 @ Inject
2827 public OrmBuildDetails (Project project ) {
29- releaseDetails = new ReleaseDetails ( project );
3028 versionFileAccess = project .provider ( () -> new File ( project .getRootDir (), HibernateVersion .RELATIVE_FILE ) );
3129
32- hibernateVersion = releaseDetails .getReleaseVersion () != null
33- ? releaseDetails .getReleaseVersion ()
34- : fromVersionFile ( versionFileAccess .get () );
30+ hibernateVersion = fromVersionFile ( versionFileAccess .get () );
3531 project .setVersion ( hibernateVersion .getFullName () );
3632
3733 jpaVersion = JpaVersion .from ( project );
@@ -59,10 +55,6 @@ public String getHibernateVersionNameOsgi() {
5955 return getHibernateVersion ().getOsgiVersion ();
6056 }
6157
62- public ReleaseDetails getReleaseDetails () {
63- return releaseDetails ;
64- }
65-
6658 public JpaVersion getJpaVersion () {
6759 return jpaVersion ;
6860 }
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments