Skip to content

Commit

Permalink
Merge pull request #8 from grails/4.0.11-cleanup
Browse files Browse the repository at this point in the history 
Updates to support publishing to Sonatype
  • Loading branch information
@JasonTypesCodes
JasonTypesCodes authored Jun 18, 2021
2 parents be3d727 + eb85f46 commit be10d4c
Show file tree
Hide file tree
Showing 2 changed files with 131 additions and 134 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
projectVersion=4.0.12-SNAPSHOT
projectVersion=4.0.11-SNAPSHOT
grailsVersion=4.0.10
springBootVersion=2.1.18.RELEASE
groovyVersion=2.5.14
263 changes: 130 additions & 133 deletions ...oovy/org/grails/gradle/plugin/publishing/internal/GrailsCentralPublishGradlePlugin.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,15 +94,6 @@ BINTRAY_KEY=key

@Override
void apply(Project project) {
boolean isSnapshot = project.version.endsWith("SNAPSHOT")
boolean isRelease = !isSnapshot
final PluginManager pluginManager = project.getPluginManager()
pluginManager.apply(MavenPublishPlugin.class)
if (isRelease) {
pluginManager.apply(NexusPublishPlugin.class)
pluginManager.apply(SigningPlugin.class)
}

final ExtensionContainer extensionContainer = project.extensions
final TaskContainer taskContainer = project.tasks
final GrailsPublishExtension gpe = extensionContainer.create("grailsPublish", GrailsPublishExtension)
Expand All @@ -125,173 +116,179 @@ BINTRAY_KEY=key
}

project.afterEvaluate {
extensionContainer.configure(SigningExtension, {
it.required = isRelease
it.sign project.publishing.publications.maven
})
}

project.tasks.withType(Sign) {
onlyIf { isRelease }
}
boolean isSnapshot = project.version.endsWith("SNAPSHOT")
boolean isRelease = !isSnapshot
final PluginManager pluginManager = project.getPluginManager()
pluginManager.apply(MavenPublishPlugin.class)

if (isRelease) {
pluginManager.apply(NexusPublishPlugin.class)
pluginManager.apply(SigningPlugin.class)

extensionContainer.configure(SigningExtension, {
it.required = isRelease
it.sign project.publishing.publications.maven
})

project.tasks.withType(io.github.gradlenexus.publishplugin.InitializeNexusStagingRepository).configureEach {
shouldRunAfter(project.tasks.withType(Sign))
}
project.tasks.withType(io.github.gradlenexus.publishplugin.InitializeNexusStagingRepository).configureEach {
shouldRunAfter(project.tasks.withType(Sign))
}
}

project.publishing {
if (isSnapshot) {
repositories {
maven {
credentials {
username = artifactoryUsername
password = artifactoryPassword
project.publishing {
if (isSnapshot) {
repositories {
maven {
credentials {
username = artifactoryUsername
password = artifactoryPassword
}
url getDefaultGrailsCentralSnapshotRepo()
}
url getDefaultGrailsCentralSnapshotRepo()
}
}
}

publications {
maven(MavenPublication) {
artifactId project.name
publications {
maven(MavenPublication) {
artifactId project.name

doAddArtefact(project, delegate)
def sourcesJar = taskContainer.findByName("sourcesJar")
if (sourcesJar != null) {
artifact sourcesJar
}
def javadocJar = taskContainer.findByName("javadocJar")
if (javadocJar != null) {
artifact javadocJar
}
def extraArtefact = getDefaultExtraArtifact(project)
if (extraArtefact) {
artifact extraArtefact
}
doAddArtefact(project, delegate)
def sourcesJar = taskContainer.findByName("sourcesJar")
if (sourcesJar != null) {
artifact sourcesJar
}
def javadocJar = taskContainer.findByName("javadocJar")
if (javadocJar != null) {
artifact javadocJar
}
def extraArtefact = getDefaultExtraArtifact(project)
if (extraArtefact) {
artifact extraArtefact
}

pom.withXml {
Node pomNode = asNode()
pom.withXml {
Node pomNode = asNode()

if (pomNode.dependencyManagement) {
pomNode.dependencyManagement[0].replaceNode {}
}
if (pomNode.dependencyManagement) {
pomNode.dependencyManagement[0].replaceNode {}
}

if (gpe != null) {
pomNode.children().last() + {
def title = gpe.title ?: project.name
delegate.name title
delegate.description gpe.desc ?: title
if (gpe != null) {
pomNode.children().last() + {
def title = gpe.title ?: project.name
delegate.name title
delegate.description gpe.desc ?: title

def websiteUrl = gpe.websiteUrl ?: gpe.githubSlug ? "https://github.com/$gpe.githubSlug" : ''
if (!websiteUrl) {
throw new RuntimeException(getErrorMessage('websiteUrl'))
}
def websiteUrl = gpe.websiteUrl ?: gpe.githubSlug ? "https://github.com/$gpe.githubSlug" : ''
if (!websiteUrl) {
throw new RuntimeException(getErrorMessage('websiteUrl'))
}

delegate.url websiteUrl
delegate.url websiteUrl


def license = gpe.license
if (license != null) {
def license = gpe.license
if (license != null) {

def concreteLicense = GrailsPublishExtension.License.LICENSES.get(license.name)
if (concreteLicense != null) {
def concreteLicense = GrailsPublishExtension.License.LICENSES.get(license.name)
if (concreteLicense != null) {

delegate.licenses {
delegate.license {
delegate.name concreteLicense.name
delegate.url concreteLicense.url
delegate.distribution concreteLicense.distribution
delegate.licenses {
delegate.license {
delegate.name concreteLicense.name
delegate.url concreteLicense.url
delegate.distribution concreteLicense.distribution
}
}
}
} else if (license.name && license.url) {
delegate.licenses {
delegate.license {
delegate.name license.name
delegate.url license.url
delegate.distribution license.distribution
} else if (license.name && license.url) {
delegate.licenses {
delegate.license {
delegate.name license.name
delegate.url license.url
delegate.distribution license.distribution
}
}
}
} else {
throw new RuntimeException(getErrorMessage('license'))
}
} else {
throw new RuntimeException(getErrorMessage('license'))
}

if (gpe.githubSlug) {
delegate.scm {
delegate.url "https://github.com/$gpe.githubSlug"
delegate.connection "scm:git@github.com:${gpe.githubSlug}.git"
delegate.developerConnection "scm:git@github.com:${gpe.githubSlug}.git"
}
delegate.issueManagement {
delegate.system "Github Issues"
delegate.url "https://github.com/$gpe.githubSlug/issues"
}
} else {
if (gpe.vcsUrl) {
if (gpe.githubSlug) {
delegate.scm {
delegate.url gpe.vcsUrl
delegate.connection "scm:$gpe.vcsUrl"
delegate.developerConnection "scm:$gpe.vcsUrl"
delegate.url "https://github.com/$gpe.githubSlug"
delegate.connection "scm:git@github.com:${gpe.githubSlug}.git"
delegate.developerConnection "scm:git@github.com:${gpe.githubSlug}.git"
}
} else {
throw new RuntimeException(getErrorMessage('vcsUrl'))
}

if (gpe.issueTrackerUrl) {
delegate.issueManagement {
delegate.system "Issue Tracker"
delegate.url gpe.issueTrackerUrl
delegate.system "Github Issues"
delegate.url "https://github.com/$gpe.githubSlug/issues"
}
} else {
throw new RuntimeException(getErrorMessage('issueTrackerUrl'))
}
if (gpe.vcsUrl) {
delegate.scm {
delegate.url gpe.vcsUrl
delegate.connection "scm:$gpe.vcsUrl"
delegate.developerConnection "scm:$gpe.vcsUrl"
}
} else {
throw new RuntimeException(getErrorMessage('vcsUrl'))
}

}
if (gpe.issueTrackerUrl) {
delegate.issueManagement {
delegate.system "Issue Tracker"
delegate.url gpe.issueTrackerUrl
}
} else {
throw new RuntimeException(getErrorMessage('issueTrackerUrl'))
}

if (gpe.developers) {
}

delegate.developers {
for (entry in gpe.developers.entrySet()) {
delegate.developer {
delegate.id entry.key
delegate.name entry.value
if (gpe.developers) {

delegate.developers {
for (entry in gpe.developers.entrySet()) {
delegate.developer {
delegate.id entry.key
delegate.name entry.value
}
}
}
} else {
throw new RuntimeException(getErrorMessage('developers'))
}
} else {
throw new RuntimeException(getErrorMessage('developers'))
}
}

}
}

// simply remove dependencies without a version
// version-less dependencies are handled with dependencyManagement
// see https://github.com/spring-gradle-plugins/dependency-management-plugin/issues/8 for more complete solutions
pomNode.dependencies.dependency.findAll {
it.version.text().isEmpty()
}.each {
it.replaceNode {}
// simply remove dependencies without a version
// version-less dependencies are handled with dependencyManagement
// see https://github.com/spring-gradle-plugins/dependency-management-plugin/issues/8 for more complete solutions
pomNode.dependencies.dependency.findAll {
it.version.text().isEmpty()
}.each {
it.replaceNode {}
}
}
}
}
}
}

project.nexusPublishing {
repositories {
sonatype {
// nexusUrl = project.uri(ossNexusUrl)
// snapshotRepositoryUrl = project.uri(ossSnapshotUrl)
username = ossUser
password = ossPass
stagingProfileId = ossStagingProfileId
if (isRelease) {
project.nexusPublishing {
repositories {
sonatype {
// nexusUrl = project.uri(ossNexusUrl)
// snapshotRepositoryUrl = project.uri(ossSnapshotUrl)
username = ossUser
password = ossPass
stagingProfileId = ossStagingProfileId
}
}
}
}
}

project.afterEvaluate {
def installTask = taskContainer.findByName("install")
def publishToSonatypeTask = taskContainer.findByName('publishToSonatype')
def closeAndReleaseSonatypeStagingRepositoryTask = taskContainer.findByName('closeAndReleaseSonatypeStagingRepository')
Expand Down

0 comments on commit be10d4c

Please sign in to comment.