fixes to in-line jakarta transformation tasks
- fix path replacements (test bundles) - drop inaccurate attempts to access javadoc/sources jar tasks and outputs for jakarta projects - they are not producing them (alternatively, and eventually will have to, we could have them produce those artifacts) - skip jakarta modules for aggregated javadoc building
This commit is contained in:
parent
4734897601
commit
fe3b6690c1
|
@ -18,6 +18,10 @@ ext {
|
|||
'hibernate-ehcache',
|
||||
'hibernate-java8',
|
||||
'hibernate-integrationtest-java-modules',
|
||||
'hibernate-core-jakarta',
|
||||
'hibernate-testing-jakarta',
|
||||
'hibernate-envers-jakarta',
|
||||
'hibernate-jpamodelgen-jakarta',
|
||||
'release'
|
||||
]
|
||||
}
|
||||
|
|
|
@ -0,0 +1,79 @@
|
|||
|
||||
/*
|
||||
* Hibernate, Relational Persistence for Idiomatic Java
|
||||
*
|
||||
* License: GNU Lesser General Public License (LGPL), version 2.1 or later
|
||||
* See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
|
||||
*/
|
||||
apply from: rootProject.file( 'gradle/java-module.gradle' )
|
||||
apply from: rootProject.file( 'gradle/publishing-pom.gradle' )
|
||||
|
||||
publishing {
|
||||
publications {
|
||||
publishedArtifacts {
|
||||
from components.java
|
||||
}
|
||||
|
||||
relocationArtifacts( MavenPublication ) {
|
||||
pom {
|
||||
name = project.name + ' - relocation'
|
||||
groupId = 'org.hibernate'
|
||||
artifactId = project.name
|
||||
version = project.version
|
||||
|
||||
description = project.description
|
||||
url = 'https://hibernate.org/orm'
|
||||
|
||||
organization {
|
||||
name = 'Hibernate.org'
|
||||
url = 'https://hibernate.org'
|
||||
}
|
||||
|
||||
licenses {
|
||||
license {
|
||||
name = 'GNU Library General Public License v2.1 or later'
|
||||
url = 'https://www.opensource.org/licenses/LGPL-2.1'
|
||||
comments = 'See discussion at https://hibernate.org/community/license/ for more details.'
|
||||
distribution = 'repo'
|
||||
}
|
||||
}
|
||||
|
||||
scm {
|
||||
url = 'https://github.com/hibernate/hibernate-orm'
|
||||
connection = 'scm:git:https://github.com/hibernate/hibernate-orm.git'
|
||||
developerConnection = 'scm:git:git@github.com:hibernate/hibernate-orm.git'
|
||||
}
|
||||
|
||||
developers {
|
||||
developer {
|
||||
id = 'hibernate-team'
|
||||
name = 'The Hibernate Development Team'
|
||||
organization = 'Hibernate.org'
|
||||
organizationUrl = 'https://hibernate.org'
|
||||
}
|
||||
}
|
||||
|
||||
issueManagement {
|
||||
system = 'jira'
|
||||
url = 'https://hibernate.atlassian.net/browse/HHH'
|
||||
}
|
||||
|
||||
distributionManagement {
|
||||
relocation {
|
||||
groupId = 'org.hibernate.orm'
|
||||
artifactId = project.name
|
||||
version = project.version
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
// Release / publishing tasks
|
||||
|
||||
task ciBuild( dependsOn: [test, publish] )
|
||||
|
||||
task release(dependsOn: [test, publishToSonatype])
|
||||
publishToSonatype.mustRunAfter test
|
|
@ -9,7 +9,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
|
|||
|
||||
description = 'Hibernate O/RM implementation of the Jakarta Persistence specification'
|
||||
|
||||
apply from: rootProject.file( 'gradle/published-java-module.gradle' )
|
||||
apply from: rootProject.file( 'gradle/jakarta-java-module.gradle' )
|
||||
|
||||
configurations {
|
||||
tests {
|
||||
|
@ -96,10 +96,13 @@ jar {
|
|||
mustRunAfter project(':hibernate-core').tasks.testJar
|
||||
dependsOn project(':hibernate-core').tasks.jar
|
||||
dependsOn project(':hibernate-core').tasks.testJar
|
||||
|
||||
def baseDir = project(':hibernate-core').buildDir
|
||||
def baseJars = fileTree(baseDir).matching {include 'libs/*.jar' }
|
||||
|
||||
inputs.files(baseJars).skipWhenEmpty()
|
||||
outputs.dir project.buildDir
|
||||
|
||||
doLast {
|
||||
new File(project.buildDir, "libs").mkdirs()
|
||||
fileTree(project.buildDir).matching { include 'libs/*.jar' }.each { delete it }
|
||||
|
@ -155,7 +158,7 @@ task copyBundleResources (type: Copy) {
|
|||
// There are persistence.xml files referencing jar files through their absolute path so we
|
||||
// have to replace 'hibernate-core/hibernate-core' in the path with 'hibernate-core/hibernate-core-jakarta'
|
||||
filter { line ->
|
||||
line.replaceAll( 'hibernate-core/hibernate-core', 'hibernate-core/hibernate-core-jakarta' )
|
||||
line.replaceAll( 'hibernate-core/target', 'hibernate-core-jakarta/target' )
|
||||
}
|
||||
doFirst {
|
||||
ext.bundlesTargetDir.mkdirs()
|
||||
|
|
|
@ -9,7 +9,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
|
|||
|
||||
description = 'Hibernate\'s entity version (audit/history) support Jakarta edition'
|
||||
|
||||
apply from: rootProject.file( 'gradle/published-java-module.gradle' )
|
||||
apply from: rootProject.file( 'gradle/jakarta-java-module.gradle' )
|
||||
|
||||
configurations {
|
||||
jakartaeeTransformJars
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
description = 'Support for testing Hibernate ORM Jakarta functionality'
|
||||
|
||||
apply from: rootProject.file( 'gradle/published-java-module.gradle' )
|
||||
apply from: rootProject.file( 'gradle/jakarta-java-module.gradle' )
|
||||
|
||||
configurations {
|
||||
jakartaeeTransformJars
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
description = 'Annotation Processor to generate JPA 3 static metamodel classes'
|
||||
|
||||
apply from: rootProject.file( 'gradle/published-java-module.gradle' )
|
||||
apply from: rootProject.file( 'gradle/jakarta-java-module.gradle' )
|
||||
|
||||
configurations {
|
||||
jakartaeeTransformJars
|
||||
|
|
Loading…
Reference in New Issue