From c677cd8bf05da7badcc41bcd64b90826c7d72585 Mon Sep 17 00:00:00 2001 From: morazow Date: Fri, 18 Feb 2022 11:04:22 +0100 Subject: [PATCH 1/2] Added name to workflow files with matrix builds Fixes #30 --- ...elease_droid_prepare_original_checksum.yml | 3 +- .../release_droid_print_quick_checksum.yml | 1 + ...release_droid_release_on_maven_central.yml | 1 + ...ase_droid_upload_github_release_assets.yml | 8 +++- dependencies.md | 2 +- doc/changes/changes_0.4.0.md | 44 +++++++++++-------- pom.xml | 36 +++++++-------- 7 files changed, 55 insertions(+), 40 deletions(-) diff --git a/.github/workflows/release_droid_prepare_original_checksum.yml b/.github/workflows/release_droid_prepare_original_checksum.yml index 1ce35e5..8ee7c49 100644 --- a/.github/workflows/release_droid_prepare_original_checksum.yml +++ b/.github/workflows/release_droid_prepare_original_checksum.yml @@ -5,6 +5,7 @@ on: jobs: build: + name: Build for Scala version ${{ matrix.scala-version }} runs-on: ubuntu-latest strategy: fail-fast: false @@ -41,4 +42,4 @@ jobs: with: name: original_checksum retention-days: 5 - path: original_checksum \ No newline at end of file + path: original_checksum diff --git a/.github/workflows/release_droid_print_quick_checksum.yml b/.github/workflows/release_droid_print_quick_checksum.yml index 9eb5c00..02bede9 100644 --- a/.github/workflows/release_droid_print_quick_checksum.yml +++ b/.github/workflows/release_droid_print_quick_checksum.yml @@ -5,6 +5,7 @@ on: jobs: build: + name: Build for Scala version ${{ matrix.scala-version }} runs-on: ubuntu-latest strategy: fail-fast: false diff --git a/.github/workflows/release_droid_release_on_maven_central.yml b/.github/workflows/release_droid_release_on_maven_central.yml index 4e05e8f..bb4640e 100644 --- a/.github/workflows/release_droid_release_on_maven_central.yml +++ b/.github/workflows/release_droid_release_on_maven_central.yml @@ -5,6 +5,7 @@ on: jobs: publish: + name: Publish for Scala version ${{ matrix.scala-version }} runs-on: ubuntu-latest strategy: fail-fast: false diff --git a/.github/workflows/release_droid_upload_github_release_assets.yml b/.github/workflows/release_droid_upload_github_release_assets.yml index c76a142..bd74c3c 100644 --- a/.github/workflows/release_droid_upload_github_release_assets.yml +++ b/.github/workflows/release_droid_upload_github_release_assets.yml @@ -9,6 +9,7 @@ on: jobs: build: + name: Build for Scala version ${{ matrix.scala-version }} runs-on: ubuntu-latest strategy: fail-fast: false @@ -40,7 +41,9 @@ jobs: -DskipTests \ -Dproject-keeper.skip=${{ matrix.project-keeper-skip }} - name: Generate sha256sum files - run: find target -maxdepth 1 -name *.jar -exec bash -c 'sha256sum {} > {}.sha256' \; + run: | + cd target/ + find -name *.jar -exec bash -c 'sha256sum {} > {}.sha256' \; - name: Upload assets to the GitHub release draft uses: shogo82148/actions-upload-release-asset@v1 with: @@ -52,7 +55,8 @@ jobs: upload_url: ${{ github.event.inputs.upload_url }} asset_path: target/*.sha256 - name: Upload error-code-report + if: ${{ matrix.scala-version == 'scala2.13' }} uses: shogo82148/actions-upload-release-asset@v1 with: upload_url: ${{ github.event.inputs.upload_url }} - asset_path: target/error_code_report.json \ No newline at end of file + asset_path: target/error_code_report.json diff --git a/dependencies.md b/dependencies.md index 058e5da..5849cb5 100644 --- a/dependencies.md +++ b/dependencies.md @@ -54,7 +54,6 @@ | [Apache Maven Site Plugin][72] | [Apache License, Version 2.0][7] | [54]: https://github.com/exasol/project-keeper-maven-plugin -[56]: https://scoverage.github.io/scoverage-maven-plugin/1.4.1/ [18]: https://github.com/scalatest/scalatestplus-mockito [4]: https://github.com/exasol/error-reporting-java [9]: http://www.apache.org/licenses/LICENSE-2.0.txt @@ -98,6 +97,7 @@ [2]: http://www.exasol.com [70]: http://maven.apache.org/plugins/maven-install-plugin/ [34]: https://sonatype.github.io/ossindex-maven/maven-plugin/ +[56]: https://scoverage.github.io/scoverage-maven-plugin/1.4.11/ [40]: https://maven.apache.org/plugins/maven-gpg-plugin/ [22]: http://github.com/davidB/scala-maven-plugin [48]: https://maven.apache.org/plugins/maven-javadoc-plugin/ diff --git a/doc/changes/changes_0.4.0.md b/doc/changes/changes_0.4.0.md index d73346a..3554eec 100644 --- a/doc/changes/changes_0.4.0.md +++ b/doc/changes/changes_0.4.0.md @@ -1,6 +1,14 @@ -# Import Export UDF Common Scala 0.4.0, released 2021-??-?? +# Import Export UDF Common Scala 0.4.0, released 2022-02-18 -Code name: +Code name: Migrated to maven build + +## Summary + +In this release, we migrated to the Maven based build and refactored the Continuous Integration (CI) workflow files that contain matrix builds. + +## Bug Fixes + +* #30: Added name to release droid workflow file with matrix build ## Features @@ -16,40 +24,40 @@ Code name: * Added `com.fasterxml.jackson.module:jackson-module-scala_2.13:2.12.5` * Added `com.typesafe.scala-logging:scala-logging_2.13:3.9.4` * Added `org.apache.avro:avro:1.11.0` -* Added `org.scala-lang:scala-library:2.13.6` -* Added `org.slf4j:slf4j-simple:1.7.32` +* Added `org.scala-lang:scala-library:2.13.8` +* Added `org.slf4j:slf4j-simple:1.7.36` ### Test Dependency Updates -* Added `org.mockito:mockito-core:4.1.0` +* Added `org.mockito:mockito-core:4.3.1` * Added `org.scalatestplus:scalatestplus-mockito_2.13:1.0.0-M2` * Added `org.scalatest:scalatest_2.13:3.2.10` ### Plugin Dependency Updates -* Added `com.diffplug.spotless:spotless-maven-plugin:2.17.4` -* Added `com.exasol:error-code-crawler-maven-plugin:0.7.1` +* Added `com.diffplug.spotless:spotless-maven-plugin:2.20.2` +* Added `com.exasol:error-code-crawler-maven-plugin:1.0.0` * 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 `net.alchim31.maven:scala-maven-plugin:4.5.4` +* Added `io.github.evis:scalafix-maven-plugin_2.13:0.1.4_0.9.33` +* 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.10.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-javadoc-plugin:3.3.1` +* Added `org.apache.maven.plugins:maven-jar-plugin:3.2.2` +* Added `org.apache.maven.plugins:maven-javadoc-plugin:3.3.2` * 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-site-plugin:3.11.0` * Added `org.apache.maven.plugins:maven-source-plugin:3.2.1` * Added `org.apache.maven.plugins:maven-surefire-plugin:3.0.0-M4` -* Added `org.codehaus.mojo:versions-maven-plugin:2.8.1` -* Added `org.itsallcode:openfasttrace-maven-plugin:1.2.0` +* Added `org.codehaus.mojo:versions-maven-plugin:2.9.0` +* Added `org.itsallcode:openfasttrace-maven-plugin:1.4.0` * Added `org.scalastyle:scalastyle-maven-plugin:1.0.0` * Added `org.scalatest:scalatest-maven-plugin:2.0.2` -* Added `org.scoverage:scoverage-maven-plugin:1.4.1` -* Added `org.sonatype.ossindex.maven:ossindex-maven-plugin:3.1.0` +* Added `org.scoverage:scoverage-maven-plugin:1.4.11` +* Added `org.sonatype.ossindex.maven:ossindex-maven-plugin:3.2.0` * Added `org.sonatype.plugins:nexus-staging-maven-plugin:1.6.8` diff --git a/pom.xml b/pom.xml index 0b24a6c..03cb7fe 100644 --- a/pom.xml +++ b/pom.xml @@ -17,11 +17,11 @@ 1.11.0 2.12.5 3.9.4 - 1.7.32 + 1.7.36 3.2.10 1.0.0-M2 - 4.1.0 + 4.3.1 true @@ -169,7 +169,7 @@ net.alchim31.maven scala-maven-plugin - 4.5.4 + 4.5.6 scala-compile-first @@ -232,7 +232,7 @@ org.scalameta semanticdb-scalac_${scala.version} - 4.4.30 + 4.4.35 @@ -240,7 +240,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.10.0 ${java.version} ${java.version} @@ -314,7 +314,7 @@ org.codehaus.mojo versions-maven-plugin - 2.8.1 + 2.9.0 package @@ -331,7 +331,7 @@ org.sonatype.ossindex.maven ossindex-maven-plugin - 3.1.0 + 3.2.0 package @@ -364,7 +364,7 @@ org.itsallcode openfasttrace-maven-plugin - 1.2.0 + 1.4.0 trace-requirements @@ -442,7 +442,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.1 + 3.3.2 attach-javadocs @@ -463,7 +463,7 @@ io.github.zlika reproducible-build-maven-plugin - 0.14 + 0.15 strip-jar @@ -477,7 +477,7 @@ com.exasol error-code-crawler-maven-plugin - 0.7.1 + 1.0.0 @@ -530,7 +530,7 @@ org.scoverage scoverage-maven-plugin - 1.4.1 + 1.4.11 ${scala.version} true @@ -563,7 +563,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.17.4 + 2.20.2 @@ -582,7 +582,7 @@ io.github.evis scalafix-maven-plugin_${scala.compat.version} - 0.1.4_0.9.31 + 0.1.4_0.9.33 com.github.liancheng @@ -592,7 +592,7 @@ com.github.vovapolu scaluzzi_${scala.compat.version} - 0.1.20 + 0.1.21 @@ -612,7 +612,7 @@ maven-jar-plugin - 3.2.0 + 3.2.2 maven-resources-plugin @@ -620,7 +620,7 @@ maven-site-plugin - 3.9.1 + 3.11.0 @@ -632,7 +632,7 @@ true - 2.13.6 + 2.13.8 2.13 From 81eed8f817462dd9317f146e474b49614b2e2672 Mon Sep 17 00:00:00 2001 From: morazow Date: Fri, 18 Feb 2022 11:11:05 +0100 Subject: [PATCH 2/2] Disabled for now explicit types linter --- .scalafix.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.scalafix.conf b/.scalafix.conf index 6093ef3..26999c4 100644 --- a/.scalafix.conf +++ b/.scalafix.conf @@ -1,5 +1,5 @@ rules = [ - ExplicitResultTypes + // ExplicitResultTypes (Disable for now since version dependent) Disable DisableSyntax LeakingImplicitClassVal @@ -40,5 +40,5 @@ OrganizeImports { RemoveUnused { // handled by OrganizeImports - imports = false + imports = false }