Skip to content
Permalink
Browse files
chore: bump release-plugins from 1.65 to 1.70 (#1798)
  • Loading branch information
vlsi committed Jun 10, 2020
1 parent 98a9bdc commit 826270d9825dff2f8e26954128e0d000a2c32328
Showing 2 changed files with 5 additions and 27 deletions.
@@ -10,6 +10,8 @@ import com.github.vlsi.gradle.dsl.configureEach
import com.github.vlsi.gradle.git.FindGitAttributes
import com.github.vlsi.gradle.properties.dsl.props
import com.github.vlsi.gradle.properties.dsl.stringProperty
import com.github.vlsi.gradle.publishing.dsl.simplifyXml
import com.github.vlsi.gradle.publishing.dsl.versionFromResolution
import org.postgresql.buildtools.JavaCommentPreprocessorTask

plugins {
@@ -553,33 +555,9 @@ allprojects {
// Use the resolved versions in pom.xml
// Gradle might have different resolution rules, so we set the versions
// that were used in Gradle build/test.
versionMapping {
usage(Usage.JAVA_RUNTIME) {
fromResolutionResult()
}
usage(Usage.JAVA_API) {
fromResolutionOf("runtimeClasspath")
}
}
versionFromResolution()
pom {
withXml {
val sb = asString()
var s = sb.toString()
// <scope>compile</scope> is Maven default, so delete it
s = s.replace("<scope>compile</scope>", "")
// Cut <dependencyManagement> because all dependencies have the resolved versions
s = s.replace(
Regex(
"<dependencyManagement>.*?</dependencyManagement>",
RegexOption.DOT_MATCHES_ALL
),
""
)
sb.setLength(0)
sb.append(s)
// Re-format the XML
asNode()
}
simplifyXml()
name.set(
(project.findProperty("artifact.name") as? String) ?: "pgdjbc ${project.name.capitalize()}"
)
@@ -27,7 +27,7 @@ com.github.autostyle.version=3.1
com.github.johnrengelman.shadow.version=5.1.0
com.github.lburgazzoli.karaf.version=0.5.1
com.github.spotbugs.version=2.0.0
com.github.vlsi.vlsi-release-plugins.version=1.65
com.github.vlsi.vlsi-release-plugins.version=1.70
kotlin.version=1.3.70
me.champeau.gradle.jmh.version=0.5.0
org.jetbrains.gradle.plugin.idea-ext.version=0.7

0 comments on commit 826270d

Please sign in to comment.