Migrate from Bintray to JFrog for publishing artifacts

Changelist: 1. Bintray is deprecated and will no longer work as an artifact management service. This commit replaces Bintray-related workflows and settings with JFrog. 2. Change the id for maven jar plugin's execution so that the test JAR doesn't get published twice. 3. Update dist-management.diff with JFrog credentials
linkedin · Apr 23, 2021 · 8b16e3e · 8b16e3e
1 parent 7839435
commit 8b16e3e
Show file tree

Hide file tree

Showing 7 changed files with 157 additions and 67 deletions.
diff --git a/.github/dist-management.diff b/.github/dist-management.diff
@@ -7,12 +7,12 @@ index b8c0d9a9d..7c2674e63 100755
      </plugins>
    </reporting>
 -
-+  
++
 +  <distributionManagement>
 +    <repository>
-+      <id>bintray-linkedin-maven</id>
-+      <name>linkedin-maven</name>
-+      <url>https://api.bintray.com/maven/linkedin/maven/zookeeper/;publish=1;override=1</url>
++      <id>jfrog-linkedin</id>
++      <name>linkedin-releases</name>
++      <url>https://linkedin.jfrog.io/artifactory/zookeeper</url>
 +    </repository>
 +  </distributionManagement>
  </project>
diff --git a/.github/workflows/ci-bintray-workflow.yml → ...hub/workflows/ci-bintray-workflow.yml_old b/.github/workflows/ci-bintray-workflow.yml → ...hub/workflows/ci-bintray-workflow.yml_old
diff --git a/.github/workflows/ci-jfrog-workflow.yml b/.github/workflows/ci-jfrog-workflow.yml
@@ -0,0 +1,49 @@
+#
+## Licensed to the Apache Software Foundation (ASF) under one
+## or more contributor license agreements.  See the NOTICE file
+## distributed with this work for additional information
+## regarding copyright ownership.  The ASF licenses this file
+## to you under the Apache License, Version 2.0 (the
+## "License"); you may not use this file except in compliance
+## with the License.  You may obtain a copy of the License at
+##
+##   http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing,
+## software distributed under the License is distributed on an
+## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+## KIND, either express or implied.  See the License for the
+## specific language governing permissions and limitations
+## under the License.
+##
+name: Publish to LinkedIn JFrog
+
+on:
+  release:
+    branches:
+      - 'li-dev/**'
+    types: [published]
+jobs:
+  deploy:
+    name: deploy
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Extract branch name
+      shell: bash
+      run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF##*/})"
+      id: extract_branch
+    - name: Update the version
+      run: |
+        sh .github/workflows/version-upgrade.sh ${{ steps.extract_branch.outputs.branch }}
+    - name: Build with Maven
+      run: |
+        mvn clean deploy -DskipTests -s .github/workflows/settings.xml -DretryFailedDeploymentCount=3
+      env:
+        MVN_DEPLOY_JFROG_KEY: ${{ secrets.MVN_DEPLOY_JFROG_KEY }}
+        MVN_DEPLOY_JFROG_USER: ${{ secrets.MVN_DEPLOY_JFROG_USER }}
+
diff --git a/.github/workflows/old_settings.xml b/.github/workflows/old_settings.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+         Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+      http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<settings xsi:schemaLocation='http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd'
+          xmlns='http://maven.apache.org/SETTINGS/1.0.0' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+<!-- Resolve arficacts -->
+  <profiles>
+    <profile>
+      <repositories>
+        <repository>
+          <snapshots>
+            <enabled>
+              false
+            </enabled>
+          </snapshots>
+          <id>
+            bintray-linkedin-maven
+          </id>
+          <name>
+            bintray
+          </name>
+          <url>
+            https://linkedin.bintray.com/maven
+          </url>
+        </repository>
+      </repositories>
+      <pluginRepositories>
+        <pluginRepository>
+          <snapshots>
+            <enabled>
+              false
+            </enabled>
+          </snapshots>
+          <id>
+            bintray-linkedin-maven
+          </id>
+          <name>
+            bintray-plugins
+          </name>
+          <url>
+            https://linkedin.bintray.com/maven
+          </url>
+        </pluginRepository>
+      </pluginRepositories>
+      <id>
+        bintray
+      </id>
+    </profile>
+  </profiles>
+  <activeProfiles>
+    <activeProfile>
+      bintray
+    </activeProfile>
+  </activeProfiles>
+
+<!-- Bintray credentials - env vars are secrets that come from linkedin/zookeeper repo secrets -->
+  <servers>
+    <server>
+      <id>bintray-linkedin-maven</id>
+      <username>${env.MVN_DEPLOY_BINTRAY_USER}</username>
+      <password>${env.MVN_DEPLOY_BINTRAY_KEY}</password>
+    </server>
+  </servers>
+</settings>
diff --git a/.github/workflows/settings.xml b/.github/workflows/settings.xml
@@ -1,79 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-         Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-      http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-<settings xsi:schemaLocation='http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd'
-          xmlns='http://maven.apache.org/SETTINGS/1.0.0' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
-
-<!-- Resolve arficacts -->
+<settings xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd" xmlns="http://maven.apache.org/SETTINGS/1.1.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <servers>
+    <server>
+      <!-- the following env vars come from linkedin/zookeeper secrets -->
+      <id>jfrog-linkedin</id>
+      <username>${env.MVN_DEPLOY_JFROG_USER}</username>
+      <password>${env.MVN_DEPLOY_JFROG_KEY}</password>
+    </server>
+  </servers>
   <profiles>
     <profile>
       <repositories>
         <repository>
           <snapshots>
-            <enabled>
-              false
-            </enabled>
+            <enabled>false</enabled>
           </snapshots>
-          <id>
-            bintray-linkedin-maven
-          </id>
-          <name>
-            bintray
-          </name>
-          <url>
-            https://linkedin.bintray.com/maven
-          </url>
+          <id>jfrog-linkedin</id>
+          <name>jfrog</name>
+          <url>https://linkedin.jfrog.io/artifactory/open-source</url>
         </repository>
       </repositories>
       <pluginRepositories>
         <pluginRepository>
           <snapshots>
-            <enabled>
-              false
-            </enabled>
+            <enabled>false</enabled>
           </snapshots>
-          <id>
-            bintray-linkedin-maven
-          </id>
-          <name>
-            bintray-plugins
-          </name>
-          <url>
-            https://linkedin.bintray.com/maven
-          </url>
+          <id>jfrog-linkedin</id>
+          <name>jfrog-plugins</name>
+          <url>https://linkedin.jfrog.io/artifactory/open-source</url>
         </pluginRepository>
       </pluginRepositories>
-      <id>
-        bintray
-      </id>
+      <id>artifactory</id>
     </profile>
   </profiles>
   <activeProfiles>
-    <activeProfile>
-      bintray
-    </activeProfile>
+    <activeProfile>artifactory</activeProfile>
   </activeProfiles>
-
-<!-- Bintray credentials - env vars are secrets that come from linkedin/zookeeper repo secrets -->
-  <servers>
-    <server>
-      <id>bintray-linkedin-maven</id>
-      <username>${env.MVN_DEPLOY_BINTRAY_USER}</username>
-      <password>${env.MVN_DEPLOY_BINTRAY_KEY}</password>
-    </server>
-  </servers>
 </settings>
+
diff --git a/pom.xml b/pom.xml
@@ -924,9 +924,9 @@
 
   <distributionManagement>
     <repository>
-      <id>bintray-linkedin-maven</id>
-      <name>linkedin-maven</name>
-      <url>https://api.bintray.com/maven/linkedin/maven/zookeeper/;publish=1;override=1</url>
+      <id>jfrog-linkedin</id>
+      <name>linkedin-releases</name>
+      <url>https://linkedin.jfrog.io/artifactory/zookeeper</url>
     </repository>
   </distributionManagement>
 </project>
diff --git a/zookeeper-server/pom.xml b/zookeeper-server/pom.xml
@@ -288,7 +288,7 @@
         <artifactId>maven-jar-plugin</artifactId>
         <executions>
           <execution>
-            <id>publish-test-jar</id>
+            <id>Jar Tests Package</id>
             <goals>
               <goal>test-jar</goal>
             </goals>