Skip to content

Commit

Permalink
Revert "chore: use type-safe DSL instead of direct XML manipulation f…
Browse files Browse the repository at this point in the history
…or pom.xml"

This reverts commit 3617edc.
  • Loading branch information
MarkoMackic committed Oct 17, 2021
1 parent 3f340ef commit 51b7410
Show file tree
Hide file tree
Showing 6 changed files with 58 additions and 52 deletions.
35 changes: 18 additions & 17 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -166,26 +166,26 @@ allprojects {
mavenOssUser = System.getenv('MAVEN_OSS_USER')
mavenOssPassword = System.getenv('MAVEN_OSS_PASSWORD')

// pom configuration for MavenPublication, as per https://docs.gradle.org/current/userguide/publishing_maven.html#sec:modifying_the_generated_pom
// pom configuration for MavenPublication
pomConfig = {
licenses {
license {
name = "The Apache Software License, version 2.0"
url = "http://www.apache.org/licenses/LICENSE-2.0.txt"
distribution = "repo"
name "The Apache Software License, version 2.0"
url "http://www.apache.org/licenses/LICENSE-2.0.txt"
distribution "repo"
}
}
developers {
developer {
id = "rpopma"
name = "Remko Popma"
email = "rpopma@apache.org"
id "rpopma"
name "Remko Popma"
email "rpopma@apache.org"
}
}
scm {
url = "https://github.com/remkop/picocli/tree/master"
connection = 'scm:git:https://github.com/remkop/picocli.git'
developerConnection = 'scm:git:ssh://github.com:remkop/picocli.git'
url "https://github.com/remkop/picocli/tree/master"
connection 'scm:git:https://github.com/remkop/picocli.git'
developerConnection 'scm:git:ssh://github.com:remkop/picocli.git'
}
}
}
Expand Down Expand Up @@ -442,14 +442,15 @@ publishing {
groupId 'info.picocli'
artifactId bintrayPackage
version "$projectVersion"
pom {
packaging = 'jar'
name = 'picocli - a mighty tiny Command Line Interface'
description = project.description
url = 'http://picocli.info'
inceptionYear = '2017'
pom.withXml {
def root = asNode()
root.appendNode('packaging', 'jar')
root.appendNode('name', 'picocli - a mighty tiny Command Line Interface')
root.appendNode('description', description)
root.appendNode('url', 'http://picocli.info')
root.appendNode('inceptionYear', '2017')
root.children().last() + pomConfig
}
pom pomConfig
}
}
}
Expand Down
15 changes: 8 additions & 7 deletions picocli-codegen/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,15 @@ publishing {
groupId 'info.picocli'
artifactId bintrayPackage
version "$projectVersion"
pom {
packaging = 'jar'
name = bintrayPackage
description = project.description
url = 'http://picocli.info'
inceptionYear = '2018'
pom.withXml {
def root = asNode()
root.appendNode('packaging', 'jar')
root.appendNode('name', bintrayPackage)
root.appendNode('description', description)
root.appendNode('url', 'http://picocli.info')
root.appendNode('inceptionYear', '2018')
root.children().last() + pomConfig
}
pom pomConfig
}
}
}
Expand Down
15 changes: 8 additions & 7 deletions picocli-groovy/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,15 @@ publishing {
groupId 'info.picocli'
artifactId bintrayPackage
version "$projectVersion"
pom {
packaging = 'jar'
name = bintrayPackage
description = project.description
url = 'http://picocli.info'
inceptionYear = '2018'
pom.withXml {
def root = asNode()
root.appendNode('packaging', 'jar')
root.appendNode('name', bintrayPackage)
root.appendNode('description', description)
root.appendNode('url', 'http://picocli.info')
root.appendNode('inceptionYear', '2018')
root.children().last() + pomConfig
}
pom pomConfig
}
}
}
15 changes: 8 additions & 7 deletions picocli-shell-jline2/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,15 @@ publishing {
groupId 'info.picocli'
artifactId bintrayPackage
version "$projectVersion"
pom {
packaging = 'jar'
name = bintrayPackage
description = project.description
url = 'http://picocli.info'
inceptionYear = '2018'
pom.withXml {
def root = asNode()
root.appendNode('packaging', 'jar')
root.appendNode('name', bintrayPackage)
root.appendNode('description', description)
root.appendNode('url', 'http://picocli.info')
root.appendNode('inceptionYear', '2018')
root.children().last() + pomConfig
}
pom pomConfig
}
}
}
15 changes: 8 additions & 7 deletions picocli-shell-jline3/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,15 @@ publishing {
groupId 'info.picocli'
artifactId bintrayPackage
version "$projectVersion"
pom {
packaging = 'jar'
name = bintrayPackage
description = project.description
url = 'http://picocli.info'
inceptionYear = '2018'
pom.withXml {
def root = asNode()
root.appendNode('packaging', 'jar')
root.appendNode('name', bintrayPackage)
root.appendNode('description', description)
root.appendNode('url', 'http://picocli.info')
root.appendNode('inceptionYear', '2018')
root.children().last() + pomConfig
}
pom pomConfig
}
}
}
15 changes: 8 additions & 7 deletions picocli-spring-boot-starter/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,15 @@ publishing {
groupId 'info.picocli'
artifactId bintrayPackage
version "$projectVersion"
pom {
packaging = 'jar'
name = bintrayPackage
description = project.description
url = 'http://picocli.info'
inceptionYear = '2019'
pom.withXml {
def root = asNode()
root.appendNode('packaging', 'jar')
root.appendNode('name', bintrayPackage)
root.appendNode('description', description)
root.appendNode('url', 'http://picocli.info')
root.appendNode('inceptionYear', '2019')
root.children().last() + pomConfig
}
pom pomConfig
}
}
}

0 comments on commit 51b7410

Please sign in to comment.