Skip to content

Commit 6180e94

Browse files
committed
- Drop building of bundles for SourceForge
- Update release artifacts section of the release announcement - Update Migration Guide wrt SourceForge and release artifacts
1 parent fa7cb3f commit 6180e94

File tree

3 files changed

+39
-154
lines changed

3 files changed

+39
-154
lines changed

design/working/6.0-posts.adoc

+26-6
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Steve Ebersole
1010

1111
It has been years in the making, but ORM 6.0 Final has finally been released!
1212

13-
This announcement will discuss the major changes as well as give insight into why
13+
This announcement will discuss the major changes, as well as give insight into why
1414
certain choices were made.
1515

1616
We will also be following up with a series of more focused posts targeting specific
@@ -236,15 +236,35 @@ Sometimes settings are considered incubating. These are indicated by `@Incubati
236236
corresponding `org.hibernate.cfg.AvailableSettings` field and are also logged using the
237237
`org.hibernate.orm.incubating` category.
238238

239-
We also generate a <<documentation-artifacts,report>>.
239+
We also generate a documentation <<release-artifacts,report>>.
240240

241241

242-
[[documentation-artifacts]]
243-
== New documentation artifacts
242+
[[release-artifacts]]
243+
== Release artifacts
244244

245-
Starting in 6.0 we also now publish additional documentation artifacts, such as:
245+
Starting with 6.0 we will no longer be publishing zip and tgz bundles to SourceForge.
246+
247+
Starting in 6.0 we now publish additional documentation artifacts, such as:
246248

247249
- The link:{migration-guide-url}[Migration Guide]
248250
- The generated link:{docs-url}/logging/logging.html[logging] report
249251
- The generated link:{docs-url}/incubating/incubating.txt[incubation] report
250-
- The generated link:{docs-url}/internals/internal.txt[internals] report
252+
- The generated link:{docs-url}/internals/internal.txt[internals] report
253+
254+
Over the next few weeks we will also begin re-evaluating both:
255+
256+
- The link:{docs-url}/integrationguide/[Integration Guide]
257+
- The link:{docs-url}/topical/[Topical Guide]
258+
259+
Much of this content is either out-of-date or incorporated elsewhere.
260+
261+
262+
== Conclusion
263+
264+
For additional details, see:
265+
266+
- the link:{user-guide-url}[User Guide]
267+
- the link:{migration-guide-url}[Migration Guide]
268+
- the https://hibernate.org/orm/releases/6.0/[release page].
269+
270+
To get in touch, use the usual channels as discussed on the https://hibernate.org/community/[website].

migration-guide.adoc

+13
Original file line numberDiff line numberDiff line change
@@ -899,6 +899,19 @@ Hibernate no longer provides built-in support for integrating itself with JMX en
899899
Hibernate no longer provides built-in support for integrating itself with JACC environments.
900900

901901

902+
[[release-artifacts]]
903+
=== Release artifacts
904+
905+
We no longer publishing zip and tgz bundles to SourceForge.
906+
907+
We now publish additional documentation artifacts, such as:
908+
909+
- This link:{migration-guide-url}[Migration Guide]
910+
- The generated link:{docs-url}/logging/logging.html[logging] report
911+
- The generated link:{docs-url}/incubating/incubating.txt[incubation] report
912+
- The generated link:{docs-url}/internals/internal.txt[internals] report
913+
914+
902915
=== Previously Deprecated features
903916

904917
* 'hibernate.classLoader.application', 'hibernate.classLoader.resources', 'hibernate.classLoader.hibernate' and 'hibernate.classLoader.environment': use 'hibernate.classLoaders' instead.

release/release.gradle

-148
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ apply from: rootProject.file( 'gradle/module.gradle' )
1313
apply from: rootProject.file( 'gradle/libraries.gradle' )
1414

1515
apply plugin: 'idea'
16-
apply plugin: 'distribution'
1716

1817
idea.module {
1918
}
@@ -355,152 +354,6 @@ task uploadDocumentation(type:Exec) {
355354
}
356355
}
357356

358-
/**
359-
* Configuration of the distribution plugin, used to build the ZIP and TGZ "release" bundles
360-
*/
361-
distributions {
362-
main {
363-
distributionBaseName = 'hibernate-release'
364-
contents {
365-
from rootProject.file( 'lgpl.txt' )
366-
from rootProject.file( 'changelog.txt' )
367-
from rootProject.file( 'hibernate_logo.gif' )
368-
369-
into('lib/required') {
370-
from configurations.core
371-
}
372-
373-
// todo (6.0) - add back
374-
// into( 'project-template' ) {
375-
// // todo : hook in some form of variable replacement - especially for version
376-
// from project( ':project-template' ).files( 'src/main/dist' )
377-
// }
378-
379-
into( 'lib/spatial' ) {
380-
from( configurations.spatial - configurations.core )
381-
}
382-
383-
into( 'lib/jpa-metamodel-generator' ) {
384-
from( configurations.jpamodelgen - configurations.core )
385-
}
386-
387-
into( 'lib/envers' ) {
388-
from( configurations.envers - configurations.core )
389-
}
390-
391-
// into( 'lib/testing' ) {
392-
// from( configurations.testing - configurations.core )
393-
// }
394-
//
395-
into( 'lib/optional' ) {
396-
into( 'agroal' ) {
397-
from( configurations.agroal - configurations.core )
398-
}
399-
into( 'c3p0' ) {
400-
from( configurations.c3p0 - configurations.core )
401-
}
402-
into( 'hikaricp' ) {
403-
from( configurations.hikaricp - configurations.core )
404-
}
405-
into( 'jcache' ) {
406-
from( configurations.jcache - configurations.core )
407-
}
408-
into( 'proxool' ) {
409-
from( configurations.proxool - configurations.core )
410-
}
411-
into( 'vibur' ) {
412-
from( configurations.vibur - configurations.core )
413-
}
414-
}
415-
416-
into('documentation') {
417-
from "${buildDir}/documentation"
418-
}
419-
420-
into( 'project' ) {
421-
from ( rootProject.projectDir ) {
422-
exclude( '.git' )
423-
exclude( '.gitignore' )
424-
exclude( 'changelog.txt' )
425-
exclude( 'lgpl.txt' )
426-
exclude( 'hibernate_logo.gif' )
427-
exclude( 'tagRelease.sh' )
428-
exclude( 'gradlew' )
429-
exclude( 'gradlew.bat' )
430-
exclude( 'wrapper/*' )
431-
exclude( '**/.gradle/**' )
432-
exclude( '**/target/**' )
433-
exclude( '.idea' )
434-
exclude( '**/*.ipr' )
435-
exclude( '**/*.iml' )
436-
exclude( '**/*.iws' )
437-
exclude( '**/atlassian-ide-plugin.xml' )
438-
exclude( '**/.classpath' )
439-
exclude( '**/.project' )
440-
exclude( '**/.settings' )
441-
exclude( '**/.nbattrs' )
442-
exclude( '**/out/**' )
443-
exclude( '**/bin/**' )
444-
exclude( 'build/**' )
445-
exclude( '*/build/**' )
446-
}
447-
}
448-
}
449-
}
450-
}
451-
452-
distTar.compression = Compression.GZIP
453-
454-
distTar.dependsOn assembleDocumentation
455-
distZip.dependsOn assembleDocumentation
456-
457-
/**
458-
* "virtual" task for building both types of dist bundles
459-
*/
460-
task buildBundles {
461-
group 'Release'
462-
description 'Builds all release bundles (pseudonym for `assembleDist`)'
463-
464-
dependsOn assembleDist
465-
}
466-
467-
task uploadBundlesSourceForge(type: Exec) {
468-
group 'Release'
469-
description 'Uploads release bundles to SourceForge'
470-
471-
dependsOn buildBundles
472-
473-
final String url = "frs.sourceforge.net:/home/frs/project/hibernate/hibernate-orm/${version}";
474-
475-
executable 'rsync'
476-
args '-vr', '-e ssh', "${project.buildDir}/distributions/", url
477-
478-
doFirst {
479-
if ( rootProject.ormVersion.isSnapshot ) {
480-
logger.error( "Cannot perform upload of SNAPSHOT bundles to SourceForge" );
481-
throw new RuntimeException( "Cannot perform upload of SNAPSHOT bundles to SourceForge" )
482-
}
483-
else {
484-
logger.lifecycle( "Uploading release bundles to SourceForge..." )
485-
}
486-
}
487-
488-
doLast {
489-
logger.lifecycle( 'Done uploading release bundles to SourceForge' )
490-
}
491-
}
492-
493-
configurations {
494-
bundles {
495-
description = 'Configuration used to group the archives output from the distribution plugin.'
496-
}
497-
}
498-
499-
artifacts {
500-
bundles distTar
501-
bundles distZip
502-
}
503-
504357
task releaseChecks {
505358
group 'Release'
506359
description 'Checks and preparation for release'
@@ -576,7 +429,6 @@ void updateVersionFile(String version) {
576429
task publishReleaseArtifacts {
577430
dependsOn releaseChecks
578431
dependsOn uploadDocumentation
579-
dependsOn uploadBundlesSourceForge
580432

581433
mustRunAfter gitPreparationForRelease
582434
}

0 commit comments

Comments
 (0)