Repository: incubator-geode Updated Branches: refs/heads/feature/GEODE-1817 [created] 1cc598809
[GEODE-1817] Prepare for 'release quality' publishing - Remove releaseType property (i.e. default build will not be -SNAPSHOT) - Nexus plugin will want to sign artifacts, so disable that by default - Remove block of code which expects creds to come from Jenkins env Signed-off-by: Alexander Murmann <amurm...@pivotal.io> Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/1cc59880 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/1cc59880 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/1cc59880 Branch: refs/heads/feature/GEODE-1817 Commit: 1cc598809a9be3111e5d2fc15687fd17be70a090 Parents: 3726973 Author: Jens Deppe <jde...@pivotal.io> Authored: Thu Aug 25 10:38:55 2016 -0700 Committer: Alexander Murmann <amurm...@pivotal.io> Committed: Thu Aug 25 10:38:55 2016 -0700 ---------------------------------------------------------------------- build.gradle | 4 +--- gradle.properties | 1 - gradle/publish.gradle | 35 ++++++++++------------------------- 3 files changed, 11 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1cc59880/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index eac68d0..1444647 100755 --- a/build.gradle +++ b/build.gradle @@ -40,9 +40,7 @@ dependencyVersions.load(new FileInputStream("${project.projectDir}/gradle/depend dependencyVersions.keys().each{ k -> project.ext[k] = dependencyVersions[k]} allprojects { - - version = versionNumber + releaseType - ext.isReleaseVersion = !version.endsWith("SNAPSHOT") + version = versionNumber // We want to see all test results. This is equivalatent to setting --continue // on the command line. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1cc59880/gradle.properties ---------------------------------------------------------------------- diff --git a/gradle.properties b/gradle.properties index 06855c7..54efd00 100755 --- a/gradle.properties +++ b/gradle.properties @@ -18,7 +18,6 @@ # .M? - milestone release # <blank> - release versionNumber = 1.0.0-incubating -releaseType = -SNAPSHOT # Set the buildId to add build metadata that can be viewed from # gfsh or pulse (`gfsh version --full`). Can be set using http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1cc59880/gradle/publish.gradle ---------------------------------------------------------------------- diff --git a/gradle/publish.gradle b/gradle/publish.gradle index 2258da6..92f740b 100644 --- a/gradle/publish.gradle +++ b/gradle/publish.gradle @@ -14,9 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + +// This snippet is required so that the root project does not insist on needing to be signed. +gradle.projectsEvaluated { g -> + g.rootProject.signing { + required { false } + } +} + subprojects { apply plugin: 'com.bmuschko.nexus' - + extraArchive { sources = true javadoc = true @@ -24,7 +32,7 @@ subprojects { } nexus { - sign = true + sign = false repositoryUrl = 'https://repository.apache.org/service/local/staging/deploy/maven2' snapshotRepositoryUrl = 'https://repository.apache.org/content/repositories/snapshots' } @@ -98,29 +106,6 @@ subprojects { } } } - - // The nexus plugin reads authentication from ~/.gradle/gradle.properties but the - // jenkins server stores publishing credentials in ~/.m2/settings.xml (maven). - // We match on the expected snapshot repository id. - afterEvaluate { - if (!isReleaseVersion && System.env.USER == 'jenkins') { - def settingsXml = new File(System.getProperty('user.home'), '.m2/settings.xml') - if (settingsXml.exists()) { - def snapshotCreds = new XmlSlurper().parse(settingsXml).servers.server.find { server -> - server.id.text() == 'apache.snapshots.https' - } - - if (snapshotCreds != null) { - tasks.uploadArchives.doFirst { - repositories().withType(MavenDeployer).each { repo -> - repo.snapshotRepository.authentication.userName = snapshotCreds.username.text() - repo.snapshotRepository.authentication.password = snapshotCreds.password.text() - } - } - } - } - } - } } //Prompt the user for a password to sign archives or upload artifacts, if requested
