- Drop building of bundles for SourceForge

- Update release artifacts section of the release announcement
- Update Migration Guide wrt SourceForge and release artifacts
This commit is contained in:
Steve Ebersole 2022-03-31 11:52:22 -05:00
parent fa7cb3f0e9
commit 6180e94fdc
3 changed files with 39 additions and 154 deletions

View File

@ -10,7 +10,7 @@ Steve Ebersole
It has been years in the making, but ORM 6.0 Final has finally been released!
This announcement will discuss the major changes as well as give insight into why
This announcement will discuss the major changes, as well as give insight into why
certain choices were made.
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
corresponding `org.hibernate.cfg.AvailableSettings` field and are also logged using the
`org.hibernate.orm.incubating` category.
We also generate a <<documentation-artifacts,report>>.
We also generate a documentation <<release-artifacts,report>>.
[[documentation-artifacts]]
== New documentation artifacts
[[release-artifacts]]
== Release artifacts
Starting in 6.0 we also now publish additional documentation artifacts, such as:
Starting with 6.0 we will no longer be publishing zip and tgz bundles to SourceForge.
Starting in 6.0 we now publish additional documentation artifacts, such as:
- The link:{migration-guide-url}[Migration Guide]
- The generated link:{docs-url}/logging/logging.html[logging] report
- The generated link:{docs-url}/incubating/incubating.txt[incubation] report
- The generated link:{docs-url}/internals/internal.txt[internals] report
Over the next few weeks we will also begin re-evaluating both:
- The link:{docs-url}/integrationguide/[Integration Guide]
- The link:{docs-url}/topical/[Topical Guide]
Much of this content is either out-of-date or incorporated elsewhere.
== Conclusion
For additional details, see:
- the link:{user-guide-url}[User Guide]
- the link:{migration-guide-url}[Migration Guide]
- the https://hibernate.org/orm/releases/6.0/[release page].
To get in touch, use the usual channels as discussed on the https://hibernate.org/community/[website].

View File

@ -899,6 +899,19 @@ Hibernate no longer provides built-in support for integrating itself with JMX en
Hibernate no longer provides built-in support for integrating itself with JACC environments.
[[release-artifacts]]
=== Release artifacts
We no longer publishing zip and tgz bundles to SourceForge.
We now publish additional documentation artifacts, such as:
- This link:{migration-guide-url}[Migration Guide]
- The generated link:{docs-url}/logging/logging.html[logging] report
- The generated link:{docs-url}/incubating/incubating.txt[incubation] report
- The generated link:{docs-url}/internals/internal.txt[internals] report
=== Previously Deprecated features
* 'hibernate.classLoader.application', 'hibernate.classLoader.resources', 'hibernate.classLoader.hibernate' and 'hibernate.classLoader.environment': use 'hibernate.classLoaders' instead.

View File

@ -13,7 +13,6 @@ apply from: rootProject.file( 'gradle/module.gradle' )
apply from: rootProject.file( 'gradle/libraries.gradle' )
apply plugin: 'idea'
apply plugin: 'distribution'
idea.module {
}
@ -355,152 +354,6 @@ task uploadDocumentation(type:Exec) {
}
}
/**
* Configuration of the distribution plugin, used to build the ZIP and TGZ "release" bundles
*/
distributions {
main {
distributionBaseName = 'hibernate-release'
contents {
from rootProject.file( 'lgpl.txt' )
from rootProject.file( 'changelog.txt' )
from rootProject.file( 'hibernate_logo.gif' )
into('lib/required') {
from configurations.core
}
// todo (6.0) - add back
// into( 'project-template' ) {
// // todo : hook in some form of variable replacement - especially for version
// from project( ':project-template' ).files( 'src/main/dist' )
// }
into( 'lib/spatial' ) {
from( configurations.spatial - configurations.core )
}
into( 'lib/jpa-metamodel-generator' ) {
from( configurations.jpamodelgen - configurations.core )
}
into( 'lib/envers' ) {
from( configurations.envers - configurations.core )
}
// into( 'lib/testing' ) {
// from( configurations.testing - configurations.core )
// }
//
into( 'lib/optional' ) {
into( 'agroal' ) {
from( configurations.agroal - configurations.core )
}
into( 'c3p0' ) {
from( configurations.c3p0 - configurations.core )
}
into( 'hikaricp' ) {
from( configurations.hikaricp - configurations.core )
}
into( 'jcache' ) {
from( configurations.jcache - configurations.core )
}
into( 'proxool' ) {
from( configurations.proxool - configurations.core )
}
into( 'vibur' ) {
from( configurations.vibur - configurations.core )
}
}
into('documentation') {
from "${buildDir}/documentation"
}
into( 'project' ) {
from ( rootProject.projectDir ) {
exclude( '.git' )
exclude( '.gitignore' )
exclude( 'changelog.txt' )
exclude( 'lgpl.txt' )
exclude( 'hibernate_logo.gif' )
exclude( 'tagRelease.sh' )
exclude( 'gradlew' )
exclude( 'gradlew.bat' )
exclude( 'wrapper/*' )
exclude( '**/.gradle/**' )
exclude( '**/target/**' )
exclude( '.idea' )
exclude( '**/*.ipr' )
exclude( '**/*.iml' )
exclude( '**/*.iws' )
exclude( '**/atlassian-ide-plugin.xml' )
exclude( '**/.classpath' )
exclude( '**/.project' )
exclude( '**/.settings' )
exclude( '**/.nbattrs' )
exclude( '**/out/**' )
exclude( '**/bin/**' )
exclude( 'build/**' )
exclude( '*/build/**' )
}
}
}
}
}
distTar.compression = Compression.GZIP
distTar.dependsOn assembleDocumentation
distZip.dependsOn assembleDocumentation
/**
* "virtual" task for building both types of dist bundles
*/
task buildBundles {
group 'Release'
description 'Builds all release bundles (pseudonym for `assembleDist`)'
dependsOn assembleDist
}
task uploadBundlesSourceForge(type: Exec) {
group 'Release'
description 'Uploads release bundles to SourceForge'
dependsOn buildBundles
final String url = "frs.sourceforge.net:/home/frs/project/hibernate/hibernate-orm/${version}";
executable 'rsync'
args '-vr', '-e ssh', "${project.buildDir}/distributions/", url
doFirst {
if ( rootProject.ormVersion.isSnapshot ) {
logger.error( "Cannot perform upload of SNAPSHOT bundles to SourceForge" );
throw new RuntimeException( "Cannot perform upload of SNAPSHOT bundles to SourceForge" )
}
else {
logger.lifecycle( "Uploading release bundles to SourceForge..." )
}
}
doLast {
logger.lifecycle( 'Done uploading release bundles to SourceForge' )
}
}
configurations {
bundles {
description = 'Configuration used to group the archives output from the distribution plugin.'
}
}
artifacts {
bundles distTar
bundles distZip
}
task releaseChecks {
group 'Release'
description 'Checks and preparation for release'
@ -576,7 +429,6 @@ void updateVersionFile(String version) {
task publishReleaseArtifacts {
dependsOn releaseChecks
dependsOn uploadDocumentation
dependsOn uploadBundlesSourceForge
mustRunAfter gitPreparationForRelease
}