diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index a495d43..f568835 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -14,8 +14,8 @@ jobs: fail-fast: false matrix: include: - - { scala-version: 'scala2.12', project-keeper-skip: true } - - { scala-version: 'scala2.13', project-keeper-skip: false } + - { scala-version: 'scala2.12' } + - { scala-version: 'scala2.13' } concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true @@ -47,8 +47,7 @@ jobs: mvn --batch-mode verify \ -P${{ matrix.scala-version }} \ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \ - -DtrimStackTrace=false \ - -Dproject-keeper.skip=${{ matrix.project-keeper-skip }} + -DtrimStackTrace=false - name: Publish Test Report uses: scacap/action-surefire-report@v1 if: ${{ always() && github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]' && startsWith(matrix.scala-version, 'scala2.13') }} diff --git a/.github/workflows/release_droid_prepare_original_checksum.yml b/.github/workflows/release_droid_prepare_original_checksum.yml index 7f84e59..bf7f60d 100644 --- a/.github/workflows/release_droid_prepare_original_checksum.yml +++ b/.github/workflows/release_droid_prepare_original_checksum.yml @@ -11,8 +11,8 @@ jobs: fail-fast: false matrix: include: - - { scala-version: 'scala2.12', project-keeper-skip: true } - - { scala-version: 'scala2.13', project-keeper-skip: false } + - { scala-version: 'scala2.12' } + - { scala-version: 'scala2.13' } steps: - name: Checkout the repository uses: actions/checkout@v3 @@ -27,8 +27,7 @@ jobs: - name: Run tests and build with Maven for ${{ matrix.scala-version }} run: | mvn --batch-mode clean verify --file pom.xml \ - -P${{ matrix.scala-version }} \ - -Dproject-keeper.skip=${{ matrix.project-keeper-skip }} + -P${{ matrix.scala-version }} - 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 index 6b484e6..d2ae266 100644 --- a/.github/workflows/release_droid_print_quick_checksum.yml +++ b/.github/workflows/release_droid_print_quick_checksum.yml @@ -11,8 +11,8 @@ jobs: fail-fast: false matrix: include: - - { scala-version: 'scala2.12', project-keeper-skip: true } - - { scala-version: 'scala2.13', project-keeper-skip: false } + - { scala-version: 'scala2.12' } + - { scala-version: 'scala2.13' } steps: - name: Checkout the repository uses: actions/checkout@v3 @@ -28,7 +28,6 @@ jobs: run: | mvn --batch-mode clean verify \ -P${{ matrix.scala-version }} \ - -DskipTests \ - -Dproject-keeper.skip=${{ matrix.project-keeper-skip }} + -DskipTests - 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 index 580e236..7028ba7 100644 --- a/.github/workflows/release_droid_release_on_maven_central.yml +++ b/.github/workflows/release_droid_release_on_maven_central.yml @@ -11,8 +11,8 @@ jobs: fail-fast: false matrix: include: - - { scala-version: 'scala2.12', project-keeper-skip: true } - - { scala-version: 'scala2.13', project-keeper-skip: false } + - { scala-version: 'scala2.12' } + - { scala-version: 'scala2.13' } steps: - name: Checkout the repository uses: actions/checkout@v3 @@ -35,8 +35,7 @@ jobs: -P${{ matrix.scala-version }} \ -Dgpg.skip=false \ -Dgpg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} \ - -DskipTests \ - -Dproject-keeper.skip=${{ matrix.project-keeper-skip }} + -DskipTests env: MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} \ No newline at end of file diff --git a/.github/workflows/release_droid_upload_github_release_assets.yml b/.github/workflows/release_droid_upload_github_release_assets.yml index f47670e..599152e 100644 --- a/.github/workflows/release_droid_upload_github_release_assets.yml +++ b/.github/workflows/release_droid_upload_github_release_assets.yml @@ -15,8 +15,8 @@ jobs: fail-fast: false matrix: include: - - { scala-version: 'scala2.12', project-keeper-skip: true } - - { scala-version: 'scala2.13', project-keeper-skip: false } + - { scala-version: 'scala2.12' } + - { scala-version: 'scala2.13' } steps: - name: Checkout the repository uses: actions/checkout@v3 @@ -32,8 +32,7 @@ jobs: run: | mvn --batch-mode clean verify \ -P${{ matrix.scala-version }} \ - -DskipTests \ - -Dproject-keeper.skip=${{ matrix.project-keeper-skip }} + -DskipTests - 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/doc/changes/changes_0.4.1.md b/doc/changes/changes_0.4.1.md index 73c1e66..38c24e3 100644 --- a/doc/changes/changes_0.4.1.md +++ b/doc/changes/changes_0.4.1.md @@ -18,49 +18,33 @@ This release fixes vulnerabilities in the following dependencies: ### Compile Dependency Updates -* Added `com.exasol:error-reporting-java:0.4.1` -* Added `com.exasol:exasol-script-api:6.1.7` -* Added `com.fasterxml.jackson.core:jackson-databind:2.12.7` -* Added `com.fasterxml.jackson.module:jackson-module-scala_2.13:2.12.7` -* Added `com.typesafe.scala-logging:scala-logging_2.13:3.9.5` -* Added `org.apache.avro:avro:1.11.1` -* Added `org.scala-lang:scala-library:2.13.8` -* Added `org.slf4j:slf4j-simple:1.7.36` +* Updated `com.fasterxml.jackson.core:jackson-databind:2.12.5` to `2.12.7` +* Updated `com.fasterxml.jackson.module:jackson-module-scala_2.13:2.12.5` to `2.12.7` +* Updated `com.typesafe.scala-logging:scala-logging_2.13:3.9.4` to `3.9.5` +* Updated `org.apache.avro:avro:1.11.0` to `1.11.1` ### Test Dependency Updates -* Added `org.mockito:mockito-core:4.6.1` -* Added `org.scalatestplus:scalatestplus-mockito_2.13:1.0.0-M2` -* Added `org.scalatest:scalatest_2.13:3.2.13` +* Updated `org.mockito:mockito-core:4.3.1` to `4.6.1` +* Updated `org.scalatest:scalatest_2.13:3.2.10` to `3.2.13` ### Plugin Dependency Updates -* Added `com.diffplug.spotless:spotless-maven-plugin:2.22.8` -* Added `com.exasol:error-code-crawler-maven-plugin:1.1.1` -* Added `com.exasol:project-keeper-maven-plugin:2.5.0` -* Added `io.github.evis:scalafix-maven-plugin_2.13:0.1.6_0.10.0` -* Added `io.github.zlika:reproducible-build-maven-plugin:0.15` -* Added `net.alchim31.maven:scala-maven-plugin:4.6.3` -* Added `org.apache.maven.plugins:maven-assembly-plugin:3.3.0` -* Added `org.apache.maven.plugins:maven-clean-plugin:2.5` -* Added `org.apache.maven.plugins:maven-compiler-plugin:3.10.1` -* 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.4` -* Added `org.apache.maven.plugins:maven-jar-plugin:2.4` -* Added `org.apache.maven.plugins:maven-javadoc-plugin:3.4.0` -* Added `org.apache.maven.plugins:maven-resources-plugin:2.6` -* Added `org.apache.maven.plugins:maven-site-plugin:3.3` -* Added `org.apache.maven.plugins:maven-source-plugin:3.2.1` -* Added `org.apache.maven.plugins:maven-surefire-plugin:3.0.0-M5` +* Updated `com.diffplug.spotless:spotless-maven-plugin:2.20.2` to `2.22.8` +* Updated `com.exasol:error-code-crawler-maven-plugin:1.0.0` to `1.1.1` +* Updated `com.exasol:project-keeper-maven-plugin:1.3.4` to `2.5.0` +* Updated `io.github.evis:scalafix-maven-plugin_2.13:0.1.4_0.9.33` to `0.1.6_0.10.0` +* Updated `net.alchim31.maven:scala-maven-plugin:4.5.6` to `4.6.3` +* Updated `org.apache.maven.plugins:maven-clean-plugin:3.1.0` to `2.5` +* Updated `org.apache.maven.plugins:maven-compiler-plugin:3.10.0` to `3.10.1` +* Updated `org.apache.maven.plugins:maven-install-plugin:2.5.2` to `2.4` +* Updated `org.apache.maven.plugins:maven-jar-plugin:3.2.2` to `2.4` +* Updated `org.apache.maven.plugins:maven-javadoc-plugin:3.3.2` to `3.4.0` +* Updated `org.apache.maven.plugins:maven-resources-plugin:3.2.0` to `2.6` +* Updated `org.apache.maven.plugins:maven-site-plugin:3.11.0` to `3.3` +* Updated `org.apache.maven.plugins:maven-surefire-plugin:3.0.0-M4` to `3.0.0-M5` * Added `org.codehaus.mojo:flatten-maven-plugin:1.2.7` -* Added `org.codehaus.mojo:versions-maven-plugin:2.10.0` -* Added `org.itsallcode:openfasttrace-maven-plugin:1.4.0` +* Updated `org.codehaus.mojo:versions-maven-plugin:2.9.0` to `2.10.0` * Added `org.jacoco:jacoco-maven-plugin:0.8.8` -* 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.11` * Added `org.sonarsource.scanner.maven:sonar-maven-plugin:3.9.1.2184` -* Added `org.sonatype.ossindex.maven:ossindex-maven-plugin:3.2.0` -* Added `org.sonatype.plugins:nexus-staging-maven-plugin:1.6.13` +* Updated `org.sonatype.plugins:nexus-staging-maven-plugin:1.6.8` to `1.6.13` diff --git a/pom.xml b/pom.xml index d32697d..9203c2e 100644 --- a/pom.xml +++ b/pom.xml @@ -383,6 +383,7 @@ 2.13.8 2.13 + false @@ -390,6 +391,7 @@ 2.12.15 2.12 + true