Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-14634 : Gradle Enterprise 

- Allow for passing `hibernatePublishUsername`, `hibernatePublishPassword`, ``hibernatePluginPortalUsername` and hibernatePluginPortalPassword` as system-properties (-D) as well as property-properties (-P).  Jenkins needs to specify them as system-properties
This commit is contained in:
Steve Ebersole 2021-05-24 15:44:21 -05:00
parent 63c10e8ec0
commit b2bdcf9778
2 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
build.gradle
View File

@ -88,18 +88,26 @@ task publish {
ext {
// look for command-line overrides of the username/password pairs for publishing
if ( project.hasProperty( 'hibernatePublishUsername' ) ) {
credentials.hibernatePublishUsername = project.property( 'hibernatePublishUsername' )
if ( ! project.hasProperty( 'hibernatePublishPassword' ) ) {
throw new GradleException( "Should specify both `hibernatePublishUsername` and `hibernatePublishPassword` as project properties" );
}
if ( project.hasProperty( 'hibernatePublishPassword' ) ) {
credentials.hibernatePublishUsername = project.property( 'hibernatePublishUsername' )
credentials.hibernatePublishPassword = project.property( 'hibernatePublishPassword' )
}
else if ( System.properties.hibernatePublishUsername != null ) {
if ( System.properties.hibernatePublishPassword == null ) {
throw new GradleException( "Should specify both `hibernatePublishUsername` and `hibernatePublishPassword` as system properties" );
}
credentials.hibernatePublishUsername = System.properties.hibernatePublishUsername
credentials.hibernatePublishPassword = System.properties.hibernatePublishPassword
}
}
nexusPublishing {
repositories {
sonatype {
username = project.credentials.hibernatePublishUsername
password = project.credentials.hibernatePublishPassword
username = credentials.hibernatePublishUsername
password = credentials.hibernatePublishPassword
}
}
}
@ -118,12 +126,12 @@ gradle.taskGraph.addTaskExecutionGraphListener(
for ( String taskToLookFor : tasksToLookFor ) {
if ( graph.hasTask( taskToLookFor ) ) {
// trying to publish - make sure the needed tokens are available
// trying to publish - make sure the needed credentials are available
if ( project.credentials.hibernatePublishUsername == null ) {
if ( credentials.hibernatePublishUsername == null ) {
throw new GradleException( "Publishing credentials not specified" );
}
if ( project.credentials.hibernatePublishPassword == null ) {
if ( credentials.hibernatePublishPassword == null ) {
throw new GradleException( "Publishing credentials not specified" );
}

18
tooling/hibernate-gradle-plugin/hibernate-gradle-plugin.gradle
View File

@ -22,18 +22,20 @@ ext {
pluginId = 'org.hibernate.orm'
pluginVersion = project.version
// look for command-line overrides of the username/password pairs for publishing
if ( project.hasProperty( 'hibernatePluginPortalUsername' ) ) {
if ( ! project.hasProperty( 'hibernatePluginPortalPassword' ) ) {
throw new GradleException( "Should specify both `hibernatePluginPortalUsername` and `hibernatePluginPortalPassword` as project properties" );
}
credentials.hibernatePluginPortalUsername = project.property( 'hibernatePluginPortalUsername' )
}
if ( credentials.hibernatePluginPortalUsername != null ) {
project.setProperty( 'gradle.publish.key', credentials.hibernatePluginPortalUsername )
}
if ( project.hasProperty( 'hibernatePluginPortalPassword' ) ) {
credentials.hibernatePluginPortalPassword = project.property( 'hibernatePluginPortalPassword' )
}
if ( credentials.hibernatePluginPortalPassword != null ) {
project.setProperty( 'gradle.publish.secret', credentials.hibernatePluginPortalPassword )
else if ( System.properties.hibernatePluginPortalUsername != null ) {
if ( System.properties.hibernatePluginPortalPassword == null ) {
throw new GradleException( "Should specify both `hibernatePluginPortalUsername` and `hibernatePluginPortalPassword` as system properties" );
}
credentials.hibernatePluginPortalUsername = System.properties.hibernatePluginPortalUsername
credentials.hibernatePluginPortalPassword = System.properties.hibernatePluginPortalPassword
}
}