Complete Bintray Exodus (hyperledger#1968)

* Remote bintray publish
* Remove references to bintray repos
* Update binary download locations.

Signed-off-by: Danno Ferrin <danno.ferrin@gmail.com>

.circleci/config.yml

@@ -230,7 +230,7 @@ jobs:
       - run:
           name: Publish
           command: |
-            ./gradlew --no-daemon artifactoryPublish bintrayUpload
+            ./gradlew --no-daemon artifactoryPublish
 
   publishDocker:
     executor: besu_executor_med

CHANGELOG.md

@@ -144,7 +144,7 @@ sha256: `b0fe3942052b8fd43fc3025a298a6c701f9edae2e100f0c563a1c5a4ceef71f1`
 - [Privacy users with private transactions created using v1.3.4 or earlier](KNOWN_ISSUES.md#privacy-users-with-private-transactions-created-using-v134-or-earlier)
 
 ### Download link
-https://dl.bintray.com/hyperledger-org/besu-repo/besu-20.10.4.zip
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/20.10.4/besu-20.10.4.zip
 sha256: f15cd5243b809659bba1706c1745aecafc012d3fc44a91419522da925493537c
 
 ## 20.10.3
@@ -166,7 +166,7 @@ sha256: f15cd5243b809659bba1706c1745aecafc012d3fc44a91419522da925493537c
 - [Privacy users with private transactions created using v1.3.4 or earlier](KNOWN_ISSUES.md#privacy-users-with-private-transactions-created-using-v134-or-earlier)
 
 ### Download link
-https://dl.bintray.com/hyperledger-org/besu-repo/besu-20.10.3.zip
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/20.10.3/besu-20.10.3.zip
 sha256: `b5f46d945754dedcbbb1e5dd96bf2bfd13272ff09c6a66c0150b979a578f4389`
 
 ## 20.10.2
@@ -190,7 +190,7 @@ sha256: `b5f46d945754dedcbbb1e5dd96bf2bfd13272ff09c6a66c0150b979a578f4389`
 
 ### Download Link
 
-https://dl.bintray.com/hyperledger-org/besu-repo/besu-20.10.2.zip
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/20.10.2/besu-20.10.2.zip
 sha256: `710aed228dcbe9b8103aef39e4431b0c63e73c3a708ce88bcd1ecfa1722ad307`
 
 ## 20.10.1
@@ -235,7 +235,7 @@ The [Besu Sample Networks repository](https://github.com/ConsenSys/besu-sample-n
 
 ### Download Link
 
-https://dl.bintray.com/hyperledger-org/besu-repo/besu-20.10.1.zip
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/20.10.1/besu-20.10.1.zip
 sha256: `ac4fae310957c176564396f73c0f03c60c41129d43d078560d0dab533a69fd2a`
 
 ## 20.10.0
@@ -288,7 +288,7 @@ Deprecated in 1.5.1
 on `--privacy-onchain-groups-enabled`. [\#1222](https://github.com/hyperledger/besu/pull/1222)
 
 ### Download link
-https://dl.bintray.com/hyperledger-org/besu-repo/besu-20.10.0.zip
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/20.10.0/besu-20.10.0.zip
 
 sha256sum: `2b50a375aae64b838a2cd9d43747006492cae573f1be11745b7f643646fd5a01`
 
@@ -310,7 +310,7 @@ sha256sum: `2b50a375aae64b838a2cd9d43747006492cae573f1be11745b7f643646fd5a01`
 
 ### Download link
 
-https://dl.bintray.com/hyperledger-org/besu-repo/besu-1.5.5.zip
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/1.5.5/besu-1.5.5.zip
 
 sha256sum: `e67b0a899dc4421054eaa9a8112cb89e1e5f6a56f0d8aa1b0c5111c53dfad2ad`
 
@@ -337,7 +337,7 @@ sha256sum: `e67b0a899dc4421054eaa9a8112cb89e1e5f6a56f0d8aa1b0c5111c53dfad2ad`
 - [Changes not saved to database correctly causing inconsistent private states](KNOWN_ISSUES.md#Changes-not-saved-to-database-correctly-causing-inconsistent-private-states)
 
 ### Download link
-https://dl.bintray.com/hyperledger-org/besu-repo/besu-1.5.4.zip
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/1.5.4/besu-1.5.4.zip
 
 sha256sum: `1f4df8e1c5e3b5b3abf6289ccfe70f302aa7c29a652b2eb713ffbdc507670420`
 
@@ -375,7 +375,7 @@ To enhance control over permissions on the privacy group management contract:
 The onchain privacy support in the current version of the web3js-eea library (v0.9) will not be compatible with Besu v1.5.3.  We are actively working on an upgrade to webj3-eea that will support these changes.   
 
 ### Download link
-https://dl.bintray.com/hyperledger-org/besu-repo/besu-1.5.3.zip
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/1.5.3/besu-1.5.3.zip
 
 sha256sum: `735cd511e1dae1590f2829d9535cb383aa8c526f059b3451859e5fcfccc48985`
 
@@ -417,7 +417,7 @@ The intent is that the major Java VM version or Java VM type shipped with the de
 - [Edward Evans](https://github.com/hyperledger/besu/commits?author=EdJoJob) voluntarily moved to [emeritus status](https://github.com/hyperledger/besu/pull/1270).
 
 ### Download link
-https://dl.bintray.com/hyperledger-org/besu-repo/besu-1.5.2.zip
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/1.5.2/besu-1.5.2.zip
 
 sha256sum: `629f44e230a635b09f8d82f2196d70d31193233718118a46412f11c50772dc85`
 
@@ -458,7 +458,7 @@ Known issues are open issues categorized as [Very High or High impact](https://w
 - [Restarts caused by insufficient memory can cause inconsistent private state](KNOWN_ISSUES.md#Restart-caused-by-insufficient-memory-can-cause-inconsistent-private-state)
 
 ### Download link
-https://dl.bintray.com/hyperledger-org/besu-repo/besu-1.5.1.zip
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/1.5.1/besu-1.5.1.zip
 
 sha256sum: `c17f49b6b8686822417184952487fc135772f0be03514085926a6984fd955b88`
 
@@ -555,11 +555,11 @@ Workaround - Ensure you allocate enough memory for the Java Runtime Environment
 - [Privacy users with private transactions created using v1.3.4 or earlier](KNOWN_ISSUES.md#privacy-users-with-private-transactions-created-using-v134-or-earlier)
 
 ### Download link
-https://dl.bintray.com/hyperledger-org/besu-repo/besu-1.5.0.zip
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/1.5.0/besu-1.5.0.zip
 
 sha256sum: `56929d6a71cc681688351041c919e9630ab6df7de37dd0c4ae9e19a4f44460b2`
 
-**For download links of releases prior to 1.5.0, please visit https://dl.bintray.com/hyperledger-org/besu-repo/**
+**For download links of releases prior to 1.5.0, please visit https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/**
 
 ## 1.4.6
 

README.md

@@ -5,9 +5,9 @@
  [![Documentation Status](https://readthedocs.org/projects/hyperledger-besu/badge/?version=latest)](https://besu.hyperledger.org/en/latest/?badge=latest)
  [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/3174/badge)](https://bestpractices.coreinfrastructure.org/projects/3174)
  [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/hyperledger/besu/blob/master/LICENSE)
- [ ![Download](https://api.bintray.com/packages/hyperledger-org/besu-repo/besu/images/download.svg) ](https://bintray.com/hyperledger-org/besu-repo/besu/_latestVersion)
  [![RocketChat chat](https://open.rocket.chat/images/join-chat.svg)](https://chat.hyperledger.org/channel/besu)
 
+[Download](https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/)
 
 Besu is an Apache 2.0 licensed, MainNet compatible, Ethereum client written in Java.
 

acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/EthSignerAcceptanceTest.java

@@ -77,7 +77,7 @@ public void privateSmartContractMustDeploy() throws IOException {
   }
 
   // requires ethsigner jar > 0.3.0
-  // https://bintray.com/consensys/pegasys-repo/ethsigner
+  // https://cloudsmith.io/~consensys/repos/ethsigner/packages/
   @Test
   @Ignore
   public void privateSmartContractMustDeployNoNonce() throws IOException {

build.gradle

@@ -24,7 +24,6 @@ plugins {
   id 'com.github.ben-manes.versions' version '0.36.0'
   id 'com.github.hierynomus.license' version '0.15.0'
   id 'com.jfrog.artifactory' version '4.20.0'
-  id 'com.jfrog.bintray' version '1.8.5'
   id 'io.spring.dependency-management' version '1.0.11.RELEASE'
   id 'me.champeau.gradle.jmh' version '0.5.0' apply false
   id 'net.ltgt.errorprone' version '1.3.0'
@@ -73,24 +72,6 @@ def _strListCmdArg(name) {
   return _strListCmdArg(name, null)
 }
 
-apply plugin: 'com.jfrog.bintray'
-
-def bintrayUser = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER')
-def bintrayKey = project.hasProperty('bintrayApiKey') ? project.property('bintrayApiKey') : System.getenv('BINTRAY_KEY')
-def bintrayPackage = bintray.pkg {
-  repo = 'besu-repo'
-  name = 'besu'
-  userOrg = 'hyperledger-org'
-  licenses = ['Apache-2.0']
-  websiteUrl = 'https://github.com/hyperledger/besu'
-  vcsUrl = 'https://github.com/hyperledger/besu.git'
-
-  version {
-    name = project.version
-    released = new Date()
-  }
-}
-
 allprojects {
   apply plugin: 'java-library'
   apply plugin: 'io.spring.dependency-management'
@@ -125,11 +106,8 @@ allprojects {
     jcenter()
     mavenCentral()
     maven { url "https://hyperledger.jfrog.io/hyperledger/besu-maven" }
-    maven { url "https://hyperledger-org.bintray.com/besu-repo" }
     maven { url "https://artifacts.consensys.net/public/maven/maven/" }
-    maven { url "https://consensys.bintray.com/pegasys-repo" }
     maven { url "https://splunk.jfrog.io/splunk/ext-releases-local" }
-    maven { url "https://dl.bintray.com/open-telemetry/maven" }
     maven { url "https://dl.cloudsmith.io/public/consensys/quorum-mainnet-launcher/maven/"}
   }
 
@@ -369,7 +347,6 @@ subprojects {
 
   if (sourceSetIsPopulated("main") || sourceSetIsPopulated("testSupport")) {
     apply plugin: 'com.jfrog.artifactory'
-    apply plugin: 'com.jfrog.bintray'
     apply plugin: 'maven-publish'
 
     publishing {
@@ -409,18 +386,6 @@ subprojects {
       }
     }
 
-    bintray {
-      user = bintrayUser
-      key = bintrayKey
-
-      publications = ['mavenJava']
-      override = version.endsWith('SNAPSHOT')
-
-      publish = true
-
-      pkg = bintrayPackage
-    }
-
     def artifactoryUser = project.hasProperty('artifactoryUser') ? project.property('artifactoryUser') : System.getenv('ARTIFACTORY_USER')
     def artifactoryKey = project.hasProperty('artifactoryApiKey') ? project.property('artifactoryApiKey') : System.getenv('ARTIFACTORY_KEY')
     def artifactoryRepo = System.getenv('ARTIFACTORY_REPO') ?: 'besu-maven'
@@ -857,26 +822,9 @@ distributions {
   }
 }
 
-bintray {
-  user = bintrayUser
-  key = bintrayKey
-
-  filesSpec {
-    from distTar.destinationDirectory
-    from distZip.destinationDirectory
-    from file("plugin-api/build/libs/plugin-api-$version-javadoc.jar")
-    into '.'
-  }
-
-  publish = true
-  override = version.endsWith('SNAPSHOT')
-
-  pkg = bintrayPackage
-}
-
 check.dependsOn checkSpdxHeader
 build.dependsOn verifyDistributions
-bintrayUpload.dependsOn verifyDistributions
-bintrayUpload.mustRunAfter(distTar)
-bintrayUpload.mustRunAfter(distZip)
-bintrayUpload.mustRunAfter(javadocJar)
+artifactoryPublish.dependsOn verifyDistributions
+artifactoryPublish.mustRunAfter(distTar)
+artifactoryPublish.mustRunAfter(distZip)
+artifactoryPublish.mustRunAfter(javadocJar)