This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy-release.git
The following commit(s) were added to refs/heads/master by this push:
new 95de2a8 changes from 2.5.5 release
95de2a8 is described below
commit 95de2a8ca2f2f115b5522e1be3c1b5fa6f030fcc
Author: Paul King <[email protected]>
AuthorDate: Mon Dec 24 12:16:20 2018 +1000
changes from 2.5.5 release
---
build.gradle | 2 +-
gradle/phase1.gradle | 3 ++-
gradle/phase2.gradle | 6 ++++--
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/build.gradle b/build.gradle
index ece10ac..caffc17 100644
--- a/build.gradle
+++ b/build.gradle
@@ -74,7 +74,7 @@ buildscript {
ext {
grgitClass = org.ajoberstar.grgit.Grgit
- repoBase = 'https://git1-us-west.apache.org/repos/asf'
+ repoBase = 'https://gitbox.apache.org/repos/asf'
repoUri = "$repoBase/groovy.git"
websiteRepo = 'https://gitbox.apache.org/repos/asf/groovy-website.git'
now = new Date().format('yyyy-MM-dd')
diff --git a/gradle/phase1.gradle b/gradle/phase1.gradle
index a98b3fd..8c1bb52 100644
--- a/gradle/phase1.gradle
+++ b/gradle/phase1.gradle
@@ -221,7 +221,8 @@ task createAndPushTag(dependsOn: [assumesPropsSet,
checkDevWorkspaceVersion]) {
group = "Pre-vote phase"
description = "Creates a release tag and pushes it to the Apache Git
repository"
doLast {
- def apacheCredentials = new Credentials(username: apacheUser,
password: apachePassword)
+// def apacheCredentials = new Credentials(username: apacheUser,
password: apachePassword)
+ def apacheCredentials = new Credentials(apacheUser, apachePassword)
def grgit = grgitClass.open(dir: stagingDir, creds: apacheCredentials)
def tagName = "GROOVY_$underVersion"
def tag = null
diff --git a/gradle/phase2.gradle b/gradle/phase2.gradle
index 380bc71..8624208 100644
--- a/gradle/phase2.gradle
+++ b/gradle/phase2.gradle
@@ -304,7 +304,8 @@ task pushGroovyWebsite(dependsOn: updateGroovySitemap) {
group = "Post-passed phase"
description = "Pushes the Groovy website so that the new website is
published"
doLast {
- def githubCredentials = new Credentials(username: githubUser,
password: githubPassword)
+// def githubCredentials = new Credentials(username: githubUser,
password: githubPassword)
+ def githubCredentials = new Credentials(githubUser, githubPassword)
def grgit = grgitClass.open(dir: stagingWebsiteDir, creds:
githubCredentials)
grgit.add(patterns: ['sitemap.groovy'])
def commit = grgit.commit(message: "Release $relVersion: update
sitemap")
@@ -371,7 +372,8 @@ task bumpVersionInGit(dependsOn: createNextVersionInJira) {
group = "Post-passed phase"
description = "The version in the gradle.properties file in the branch
repo should be bumped"
doLast {
- def apacheCredentials = new Credentials(username: apacheUser,
password: apachePassword)
+// def apacheCredentials = new Credentials(username: apacheUser,
password: apachePassword)
+ def apacheCredentials = new Credentials(apacheUser, apachePassword)
def grgit = grgitClass.open(dir: stagingDir, creds: apacheCredentials)
grgit.checkout(branch: branch)
def propsFile = file("$stagingDir/gradle.properties")
