#111: Fixed issues with cross releasing with updated release droid wo…

…rkflows (#114) Fixes #111
exasol · Jan 18, 2022 · 35a3cf7 · 35a3cf7
1 parent c75a742
commit 35a3cf7
Show file tree

Hide file tree

Showing 10 changed files with 117 additions and 76 deletions.
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        exasol-docker-version: [ 7.1.3 ]
+        exasol-docker-version: [ 7.1.4 ]
         mvn:
           [
             {

diff --git a/.github/workflows/release_droid_prepare_original_checksum.yml b/.github/workflows/release_droid_prepare_original_checksum.yml
@@ -9,11 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - { profile: '-Pspark3.2', project-keeper-skip: false }
-          - { profile: '-Pspark3.2 -Pscala2.12', project-keeper-skip: true }
-          - { profile: '-Pspark3.1', project-keeper-skip: true }
-          - { profile: '-Pspark2.4', project-keeper-skip: true }
+        profile: [ '-Pspark3.2', '-Pspark3.2 -Pscala2.12', '-Pspark3.1', '-Pspark2.4' ]
     steps:
       - name: Checkout the repository
         uses: actions/checkout@v2
@@ -31,10 +27,16 @@ jobs:
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-maven-
+      - name: Install xmlstarlet
+        run: sudo apt install -y --no-install-recommends xmlstarlet
+      - name: Create release pom file
+        run: ./tools/createReleasePom.sh
       - name: Run tests and build with Maven
         run: |
-          mvn --batch-mode clean verify --file pom.xml ${{ matrix.profile }} \
-              -Dproject-keeper.skip=${{ matrix.project-keeper-skip }}
+          mvn --batch-mode --file release.xml clean verify ${{ matrix.profile }} \
+              -Dproject-keeper.skip=false
+      - name: Remove release pom file
+        run: rm -rf release.xml
       - name: Prepare checksum
         run: find target -maxdepth 1 -name *.jar -exec sha256sum "{}" + > original_checksum
       - name: Upload checksum to the artifactory

diff --git a/.github/workflows/release_droid_print_quick_checksum.yml b/.github/workflows/release_droid_print_quick_checksum.yml
@@ -9,11 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - { profile: '-Pspark3.2', project-keeper-skip: false }
-          - { profile: '-Pspark3.2 -Pscala2.12', project-keeper-skip: true }
-          - { profile: '-Pspark3.1', project-keeper-skip: true }
-          - { profile: '-Pspark2.4', project-keeper-skip: true }
+        profile: [ '-Pspark3.2', '-Pspark3.2 -Pscala2.12', '-Pspark3.1', '-Pspark2.4' ]
     steps:
       - name: Checkout the repository
         uses: actions/checkout@v2
@@ -31,11 +27,17 @@ jobs:
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-maven-
+      - name: Install xmlstarlet
+        run: sudo apt install -y --no-install-recommends xmlstarlet
+      - name: Create release pom file
+        run: ./tools/createReleasePom.sh
       - name: Build with Maven skipping tests
         run: |
-          mvn --batch-mode clean verify ${{ matrix.profile }} \
+          mvn --batch-mode --file release.xml clean verify ${{ matrix.profile }} \
               -DskipTests \
-              -Dproject-keeper.skip=${{ matrix.project-keeper-skip }}
+              -Dproject-keeper.skip=false
+      - name: Remove release pom file
+        run: rm -rf release.xml
       - name: Print checksum
         run: echo 'checksum_start==';find target -maxdepth 1 -name *.jar -exec sha256sum "{}" + | xargs;echo '==checksum_end'
 
diff --git a/.github/workflows/release_droid_release_on_maven_central.yml b/.github/workflows/release_droid_release_on_maven_central.yml
@@ -9,11 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - { profile: '-Pspark3.2', project-keeper-skip: false }
-          - { profile: '-Pspark3.2 -Pscala2.12', project-keeper-skip: true }
-          - { profile: '-Pspark3.1', project-keeper-skip: true }
-          - { profile: '-Pspark2.4', project-keeper-skip: true }
+        profile: [ '-Pspark3.2', '-Pspark3.2 -Pscala2.12', '-Pspark3.1', '-Pspark2.4' ]
     steps:
       - name: Checkout the repository
         uses: actions/checkout@v2
@@ -37,13 +33,19 @@ jobs:
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-maven-
+      - name: Install xmlstarlet
+        run: sudo apt install -y --no-install-recommends xmlstarlet
+      - name: Create release pom file
+        run: ./tools/createReleasePom.sh
       - name: Publish to Central Repository
         run: |
-          mvn clean deploy ${{ matrix.profile }} \
+          mvn --file release.xml clean deploy ${{ matrix.profile }} \
               -Dgpg.skip=false \
               -Dgpg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} \
               -DskipTests \
-              -Dproject-keeper.skip=${{ matrix.project-keeper-skip }}
+              -Dproject-keeper.skip=false
         env:
           MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
+      - name: Remove release pom file
+        run: rm -rf release.xml
diff --git a/.github/workflows/release_droid_upload_github_release_assets.yml b/.github/workflows/release_droid_upload_github_release_assets.yml
@@ -13,11 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - { profile: '-Pspark3.2', project-keeper-skip: false }
-          - { profile: '-Pspark3.2 -Pscala2.12', project-keeper-skip: true }
-          - { profile: '-Pspark3.1', project-keeper-skip: true }
-          - { profile: '-Pspark2.4', project-keeper-skip: true }
+        profile: [ '-Pspark3.2', '-Pspark3.2 -Pscala2.12', '-Pspark3.1', '-Pspark2.4' ]
     steps:
       - name: Checkout the repository
         uses: actions/checkout@v2
@@ -35,11 +31,17 @@ jobs:
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-maven-
+      - name: Install xmlstarlet
+        run: sudo apt install -y --no-install-recommends xmlstarlet
+      - name: Create release pom file
+        run: ./tools/createReleasePom.sh
       - name: Build with Maven skipping tests
         run: |
-          mvn --batch-mode clean verify ${{ matrix.profile }} \
+          mvn --batch-mode --file release.xml clean verify ${{ matrix.profile }} \
               -DskipTests \
-              -Dproject-keeper.skip=${{ matrix.project-keeper-skip }}
+              -Dproject-keeper.skip=false
+      - name: Remove release pom file
+        run: rm -rf release.xml
       - name: Generate sha256sum files
         run: find target -maxdepth 1 -name *.jar -exec bash -c 'sha256sum {} > {}.sha256' \;
       - name: Upload assets to the GitHub release draft

diff --git a/dependencies.md b/dependencies.md
@@ -42,7 +42,7 @@
 | [Apache Maven Source Plugin][47]                        | [Apache License, Version 2.0][18]              |
 | [Apache Maven Javadoc Plugin][49]                       | [Apache License, Version 2.0][18]              |
 | [Apache Maven JAR Plugin][51]                           | [Apache License, Version 2.0][18]              |
-| [Apache Maven Assembly Plugin][53]                      | [Apache License, Version 2.0][18]              |
+| [Apache Maven Shade Plugin][53]                         | [Apache License, Version 2.0][18]              |
 | [Versions Maven Plugin][55]                             | [Apache License, Version 2.0][18]              |
 | [org.sonatype.ossindex.maven:ossindex-maven-plugin][57] | [ASL2][13]                                     |
 | [Reproducible Build Maven Plugin][59]                   | [Apache 2.0][13]                               |
@@ -69,6 +69,7 @@
 [3]: https://docs.exasol.com/connect_exasol/drivers/jdbc.htm
 [5]: https://opensource.org/licenses/MIT
 [23]: https://github.com/mockito/mockito
+[53]: https://maven.apache.org/plugins/maven-shade-plugin/
 [55]: http://www.mojohaus.org/versions-maven-plugin/
 [35]: https://maven.apache.org/plugins/maven-compiler-plugin/
 [79]: https://maven.apache.org/plugins/maven-resources-plugin/
@@ -114,4 +115,3 @@
 [8]: http://spark.apache.org/
 [49]: https://maven.apache.org/plugins/maven-javadoc-plugin/
 [65]: https://github.com/exasol/error-code-crawler-maven-plugin
-[53]: https://maven.apache.org/plugins/maven-assembly-plugin/
diff --git a/doc/changes/changes_1.2.0.md b/doc/changes/changes_1.2.0.md
@@ -1,4 +1,4 @@
-# Spark Exasol Connector 1.2.0, released 2021-12-??
+# Spark Exasol Connector 1.2.0, released 2022-01-18
 
 Code name: Added support for certificate fingerprint
 
@@ -13,6 +13,7 @@ In this release we added an option for providing Exasol certificate fingerprint
 ## Bugs
 
 * #106: Fixed Log4J CVE-2021-44228 vulnerability
+* #111: Fixed issues related to cross releasing with updated release droid workflows
 * #112: Updated Log4J dependency to 2.17.0 version
 
 ## Refactorings
@@ -29,44 +30,44 @@ In this release we added an option for providing Exasol certificate fingerprint
 ### Compile Dependency Updates
 
 * Added `com.exasol:error-reporting-java8:0.4.1`
-* Added `com.exasol:exasol-jdbc:7.1.3`
+* Added `com.exasol:exasol-jdbc:7.1.4`
 * Added `com.exasol:sql-statement-builder-java8:4.5.0`
 * Added `org.scala-lang:scala-library:2.13.5`
 
 ### Test Dependency Updates
 
 * Added `com.exasol:exasol-testcontainers:5.1.1`
 * Added `com.exasol:hamcrest-resultset-matcher:1.5.1`
-* Added `com.exasol:test-db-builder-java:3.2.1`
-* Added `org.apache.logging.log4j:log4j-1.2-api:2.17.0`
+* Added `com.exasol:test-db-builder-java:3.2.2`
+* Added `org.apache.logging.log4j:log4j-1.2-api:2.17.1`
 * Added `org.mockito:mockito-core:4.2.0`
 * Added `org.scalatestplus:scalatestplus-mockito_2.13:1.0.0-M2`
 * Added `org.scalatest:scalatest_2.13:3.2.9`
 
 ### Plugin Dependency Updates
 
-* Added `com.diffplug.spotless:spotless-maven-plugin:2.17.7`
+* Added `com.diffplug.spotless:spotless-maven-plugin:2.20.0`
 * Added `com.exasol:artifact-reference-checker-maven-plugin:0.4.0`
 * Added `com.exasol:error-code-crawler-maven-plugin:0.7.1`
 * Added `com.exasol:project-keeper-maven-plugin:1.3.4`
 * Added `io.github.evis:scalafix-maven-plugin_2.13:0.1.4_0.9.31`
-* Added `io.github.zlika:reproducible-build-maven-plugin:0.14`
+* Added `io.github.zlika:reproducible-build-maven-plugin:0.15`
 * Added `net.alchim31.maven:scala-maven-plugin:4.5.6`
-* Added `org.apache.maven.plugins:maven-assembly-plugin:3.3.0`
 * Added `org.apache.maven.plugins:maven-clean-plugin:3.1.0`
-* Added `org.apache.maven.plugins:maven-compiler-plugin:3.8.1`
+* Added `org.apache.maven.plugins:maven-compiler-plugin:3.9.0`
 * Added `org.apache.maven.plugins:maven-deploy-plugin:3.0.0-M1`
 * Added `org.apache.maven.plugins:maven-enforcer-plugin:3.0.0`
 * Added `org.apache.maven.plugins:maven-gpg-plugin:3.0.1`
 * Added `org.apache.maven.plugins:maven-install-plugin:2.5.2`
-* Added `org.apache.maven.plugins:maven-jar-plugin:3.2.0`
+* Added `org.apache.maven.plugins:maven-jar-plugin:3.2.2`
 * Added `org.apache.maven.plugins:maven-javadoc-plugin:3.3.1`
 * Added `org.apache.maven.plugins:maven-resources-plugin:3.2.0`
-* Added `org.apache.maven.plugins:maven-site-plugin:3.9.1`
+* Added `org.apache.maven.plugins:maven-shade-plugin:3.2.4`
+* Added `org.apache.maven.plugins:maven-site-plugin:3.10.0`
 * Added `org.apache.maven.plugins:maven-source-plugin:3.2.1`
 * Added `org.apache.maven.plugins:maven-surefire-plugin:2.12.4`
 * Added `org.codehaus.mojo:versions-maven-plugin:2.8.1`
-* Added `org.itsallcode:openfasttrace-maven-plugin:1.2.1`
+* Added `org.itsallcode:openfasttrace-maven-plugin:1.3.0`
 * Added `org.jacoco:jacoco-maven-plugin:0.8.7`
 * Added `org.scalastyle:scalastyle-maven-plugin:1.0.0`
 * Added `org.scalatest:scalatest-maven-plugin:2.0.2`