From 364834cdbdd9a3c7159961b1b20e40d16c317abb Mon Sep 17 00:00:00 2001
From: Edward <edward.joshua.evans@gmail.com>
Date: Thu, 28 Nov 2019 12:38:42 +1000
Subject: [PATCH] Remove last remnants of Jenkins tooling and configuration
 (#224)

Signed-off-by: Edward Evans <edward.joshua.evans@gmail.com>
---
 branch-from-tag.sh | 51 ----------------------------------------------
 build.gradle       | 13 ++++--------
 2 files changed, 4 insertions(+), 60 deletions(-)
 delete mode 100755 branch-from-tag.sh

diff --git a/branch-from-tag.sh b/branch-from-tag.sh
deleted file mode 100755
index ee8d5d0730..0000000000
--- a/branch-from-tag.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh -e
-
-#
-# Creates a new branch from a release tag, updating the gradle.properties version number.
-#
-# Assumed format of the version number: major.minor.bugfix
-# Assumed location of the version number: gradle.properties
-#
-# NOTE: Any additional markers after the bugfix (i.e. -RC2) will be lost.
-
-if [ -z "${1}" ]
-then
-  echo "[ERROR] Missing required first argument of tag name"
-  exit 1
-fi
-
-if [ -z "${2}" ]
-then
-  echo "[ERROR] Missing required second argument of branch name"
-  exit 1
-fi
-
-
-tag_name=${1}
-branch_name=${2}
-
-# Locally create a branch from the tag
-git checkout -b ${branch_name} ${tag_name}
-
-# extract the version from gradle.properties
-tag_version=$(grep "^version" gradle.properties | cut -d'=' -f2)
-
-# Assuming semantic naming format of major.minor.bugfix[-RC|-SNAPSHOT|-other]
-major_version=$(echo ${tag_version} | cut -d'.' -f1)
-minor_version=$(echo ${tag_version} | cut -d'.' -f2)
-bugfix_version=$(echo ${tag_version} | cut -d'.' -f3 | cut -d'-' -f1)
-
-# Increment the bugfix version that goes on the new branch
-branch_bugfix_version=$((${bugfix_version}+1))
-
-# Reconstruct the version number for the branch
-branch_version="${major_version}.${minor_version}.${branch_bugfix_version}-SNAPSHOT"
-
-# Change the local gradle.properties version to branch version
-sed -i "s/${tag_version}/${branch_version}/g" gradle.properties
-
-# Update the Jenkins job default branch name
-sed -i "s#defaultValue: 'master'#defaultValue: '${branch_name}'#g" Jenkinsfile.release
-
-git commit -am"[Release Script] Updating version to ${branch_version}"
-git push --set-upstream origin ${branch_name}
diff --git a/build.gradle b/build.gradle
index 21b34ca021..1a3dcb6ef7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -118,15 +118,10 @@ allprojects {
   targetCompatibility = 11
 
   repositories {
-    if ("$System.env.JENKINS_URL" == 'https://jenkins.pegasys.tech/') {
-      maven { url "https://nexus.int.pegasys.tech/repository/consensys-pegasys/" }
-      maven { url "https://nexus.int.pegasys.tech/repository/jcenter/" }
-    } else {
-      jcenter()
-      mavenCentral()
-      mavenLocal()
-      maven { url "https://consensys.bintray.com/pegasys-repo" }
-    }
+    jcenter()
+    mavenCentral()
+    mavenLocal()
+    maven { url "https://consensys.bintray.com/pegasys-repo" }
   }
 
   dependencies { errorprone("com.google.errorprone:error_prone_core") }