Skip to content

Commit 636dbcf

Browse files
committed
Correctly pass parameters around. Remove release plugin.
1 parent b582fed commit 636dbcf

File tree

3 files changed

+3
-20
lines changed

3 files changed

+3
-20
lines changed

Jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -355,8 +355,8 @@ def runPublish() {
355355
sh tools/publish_release.sh '$MAVEN_CENTRAL_USER' '$MAVEN_CENTRAL_PASSWORD' \
356356
'$REALM_S3_ACCESS_KEY' '$REALM_S3_SECRET_KEY' \
357357
'$DOCS_S3_ACCESS_KEY' '$DOCS_S3_SECRET_KEY' \
358-
'$SLACK_URL_RELEASE' \
359-
'$SLACK_URL_CI', '-PsignBuild=true -PsignSecretRingFile=\"${SIGN_KEY}\" -PsignPassword=${SIGN_KEY_PASSWORD} -PenableLTO=true -PbuildCore=true'
358+
'$SLACK_URL_RELEASE' '$SLACK_URL_CI' \
359+
'-PsignBuild=true -PsignSecretRingFile="${SIGN_KEY}" -PsignPassword=${SIGN_KEY_PASSWORD} -PenableLTO=true -PbuildCore=true'
360360
"""
361361
}
362362
}

build.gradle

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,8 @@ buildscript {
88
url "https://plugins.gradle.org/m2/"
99
}
1010
}
11-
dependencies {
12-
classpath "io.github.gradle-nexus:publish-plugin:${properties.get("GRADLE_NEXUS_PLUGIN")}"
13-
classpath 'ch.netzwerg:gradle-release-plugin:1.2.0'
14-
}
1511
}
1612

17-
apply plugin: 'ch.netzwerg.release'
18-
1913
def currentVersion = file("${projectDir}/version.txt").text.trim()
2014

2115
// Find property in either System environment or Gradle properties.
@@ -449,14 +443,3 @@ task mavenCentralUpload {
449443
dependsOn mavenCentralGradlePlugin
450444
dependsOn mavenCentralTransformer
451445
}
452-
453-
apply from: "mavencentral-publish.gradle"
454-
455-
// This is just a placeholder for the release plugin
456-
task build {}
457-
458-
release {
459-
push = false
460-
versionSuffix = '-SNAPSHOT'
461-
tagPrefix = 'v'
462-
}

tools/publish_release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ upload_to_mavenCentral() {
116116
# with half a release. For this reason we must manually close and release the artifacts using the Maven Central UI:
117117
# https://oss.sonatype.org/#stagingRepositories
118118
# ./gradlew mavenCentralUpload closeAndReleaseStagingRepository -PossrhUsername=$MAVEN_CENTRAL_USER -PossrhPassword=$MAVEN_CENTRAL_KEY --stacktrace
119-
./gradlew mavenCentralUpload $GRADLE_BUILD_PARAMS -PossrhUsername=$MAVEN_CENTRAL_USER -PossrhPassword=$MAVEN_CENTRAL_KEY --stacktrace
119+
eval "./gradlew mavenCentralUpload $GRADLE_BUILD_PARAMS -PossrhUsername=$MAVEN_CENTRAL_USER -PossrhPassword=$MAVEN_CENTRAL_KEY --stacktrace"
120120
cd $HERE
121121
}
122122

0 commit comments

Comments
 (0)