Skip to content

Commit 553e223

Browse files
#40: Upgrade dependencies (#42)
Co-authored-by: morazow <916295+morazow@users.noreply.github.com>
1 parent 1e644eb commit 553e223

19 files changed

+190
-229
lines changed

.gitattributes

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
*.sh text eol=lf
2+
3+
.github/workflows/release_droid_upload_github_release_assets.yml linguist-generated=true
4+
.github/workflows/ci-build-next-java.yml linguist-generated=true
5+
.github/workflows/broken_links_checker.yml linguist-generated=true
6+
.github/workflows/dependencies_check.yml linguist-generated=true
7+
dependencies.md linguist-generated=true
8+
pk_generated_parent.pom linguist-generated=true
9+
doc/changes/changelog.md linguist-generated=true

.github/workflows/ci-build-next-java.yml

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/ci-build.yml

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,9 @@ on:
88

99
jobs:
1010
build:
11-
name: Building with Scala ${{ matrix.scala-version }}
1211
runs-on: ubuntu-latest
1312
strategy:
1413
fail-fast: false
15-
matrix:
16-
include:
17-
- { scala-version: 'scala2.12' }
18-
- { scala-version: 'scala2.13' }
1914
concurrency:
2015
group: ${{ github.workflow }}-${{ github.ref }}
2116
cancel-in-progress: true
@@ -39,27 +34,24 @@ jobs:
3934
- name: Run scalafix linting
4035
run: |
4136
mvn --batch-mode clean compile test scalafix:scalafix \
42-
-P${{ matrix.scala-version }} \
4337
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
4438
-DtrimStackTrace=false
4539
- name: Run tests and build with Maven
4640
run: |
47-
mvn --batch-mode verify \
48-
-P${{ matrix.scala-version }} \
41+
mvn --batch-mode clean verify \
4942
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
5043
-DtrimStackTrace=false
5144
- name: Publish Test Report
5245
uses: scacap/action-surefire-report@v1
53-
if: ${{ always() && github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]' && startsWith(matrix.scala-version, 'scala2.13') }}
46+
if: ${{ always() && github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]' }}
5447
with:
5548
github_token: ${{ secrets.GITHUB_TOKEN }}
5649
- name: Sonar analysis
57-
if: ${{ env.SONAR_TOKEN != null && startsWith(matrix.scala-version, 'scala2.13') }}
50+
if: ${{ env.SONAR_TOKEN != null }}
5851
run: |
5952
mvn --batch-mode org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
6053
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
6154
-DtrimStackTrace=false \
62-
-P${{ matrix.scala-version }} \
6355
-Dsonar.organization=exasol \
6456
-Dsonar.host.url=https://sonarcloud.io \
6557
-Dsonar.login=$SONAR_TOKEN

.github/workflows/createReleasePom.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
#!/usr/bin/env bash
22

3+
set -o errexit
4+
set -o nounset
5+
set -o pipefail
6+
37
if ! command -v xmlstarlet &> /dev/null
48
then
59
echo "xmlstarlet tool is not available, please install it to continue."

.github/workflows/release_droid_prepare_original_checksum.yml

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,7 @@ on:
55

66
jobs:
77
build:
8-
name: Build for Scala version ${{ matrix.scala-version }}
98
runs-on: ubuntu-latest
10-
strategy:
11-
fail-fast: false
12-
matrix:
13-
include:
14-
- { scala-version: 'scala2.12' }
15-
- { scala-version: 'scala2.13' }
169
steps:
1710
- name: Checkout the repository
1811
uses: actions/checkout@v3
@@ -24,15 +17,15 @@ jobs:
2417
distribution: 'temurin'
2518
java-version: 11
2619
cache: 'maven'
27-
- name: Run tests and build with Maven for ${{ matrix.scala-version }}
28-
run: |
29-
mvn --batch-mode clean verify --file pom.xml \
30-
-P${{ matrix.scala-version }}
20+
- name: Enable testcontainer reuse
21+
run: echo 'testcontainers.reuse.enable=true' > "$HOME/.testcontainers.properties"
22+
- name: Run tests and build with Maven
23+
run: mvn --batch-mode clean verify --file pom.xml
3124
- name: Prepare checksum
3225
run: find target -maxdepth 1 -name *.jar -exec sha256sum "{}" + > original_checksum
3326
- name: Upload checksum to the artifactory
3427
uses: actions/upload-artifact@v3
3528
with:
3629
name: original_checksum
3730
retention-days: 5
38-
path: original_checksum
31+
path: original_checksum

.github/workflows/release_droid_print_quick_checksum.yml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,7 @@ on:
55

66
jobs:
77
build:
8-
name: Build for Scala version ${{ matrix.scala-version }}
98
runs-on: ubuntu-latest
10-
strategy:
11-
fail-fast: false
12-
matrix:
13-
include:
14-
- { scala-version: 'scala2.12' }
15-
- { scala-version: 'scala2.13' }
169
steps:
1710
- name: Checkout the repository
1811
uses: actions/checkout@v3
@@ -24,10 +17,8 @@ jobs:
2417
distribution: 'temurin'
2518
java-version: 11
2619
cache: 'maven'
27-
- name: Build with Maven skipping tests for ${{ matrix.scala-version }}
28-
run: |
29-
mvn --batch-mode clean verify \
30-
-P${{ matrix.scala-version }} \
31-
-DskipTests
20+
- name: Build with Maven skipping tests
21+
run: mvn --batch-mode clean verify -DskipTests
3222
- name: Print checksum
3323
run: echo 'checksum_start==';find target -maxdepth 1 -name *.jar -exec sha256sum "{}" + | xargs;echo '==checksum_end'
24+

.github/workflows/release_droid_release_on_maven_central.yml

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,7 @@ on:
55

66
jobs:
77
publish:
8-
name: Publish for Scala version ${{ matrix.scala-version }}
98
runs-on: ubuntu-latest
10-
strategy:
11-
fail-fast: false
12-
matrix:
13-
include:
14-
- { scala-version: 'scala2.12' }
15-
- { scala-version: 'scala2.13' }
169
steps:
1710
- name: Checkout the repository
1811
uses: actions/checkout@v3
@@ -33,15 +26,11 @@ jobs:
3326
run: sudo apt install -y --no-install-recommends xmlstarlet
3427
- name: Update release pom file
3528
run: ./.github/workflows/createReleasePom.sh
36-
- name: Publish to Central Repository for ${{ matrix.scala-version }}
37-
run: |
38-
mvn --file release-pom.xml clean deploy \
39-
-P${{ matrix.scala-version }} \
40-
-Dgpg.skip=false \
41-
-Dgpg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} \
42-
-DskipTests
29+
- name: Publish to Central Repository
30+
run: mvn --file release-pom.xml --batch-mode -Dgpg.skip=false -DskipTests clean deploy
4331
env:
4432
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
4533
MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
34+
MAVEN_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
4635
- name: Remove release pom file
4736
run: rm -rf release-pom.xml

.github/workflows/release_droid_upload_github_release_assets.yml

Lines changed: 5 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.project-keeper.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,4 @@ linkReplacements:
1111
- "http://nexus.sonatype.org/oss-repository-hosting.html/scalatest-maven-plugin|https://www.scalatest.org/user_guide/using_the_scalatest_maven_plugin"
1212
excludes:
1313
- "E-PK-CORE-18: Outdated content: '.github/workflows/ci-build.yml'"
14-
- "E-PK-CORE-18: Outdated content: '.github/workflows/ci-build-next-java.yml'"
15-
- "E-PK-CORE-18: Outdated content: '.github/workflows/release_droid_prepare_original_checksum.yml'"
16-
- "E-PK-CORE-18: Outdated content: '.github/workflows/release_droid_print_quick_checksum.yml'"
17-
- "E-PK-CORE-18: Outdated content: '.github/workflows/release_droid_upload_github_release_assets.yml'"
1814
- "E-PK-CORE-18: Outdated content: '.github/workflows/release_droid_release_on_maven_central.yml'"
19-
- regex: "(?s)E-PK-CORE-62: The project's README.md does not contain a valid badges block. Please add or replace the following badges:.*"

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
# Import Export UDF Common Scala
22

33
[![Build Status](https://github.com/exasol/import-export-udf-common-scala/actions/workflows/ci-build.yml/badge.svg)](https://github.com/exasol/import-export-udf-common-scala/actions/workflows/ci-build.yml)
4-
5-
Scala 2.13: [![Maven Central](https://img.shields.io/maven-central/v/com.exasol/import-export-udf-common-scala_2.13)](https://search.maven.org/artifact/com.exasol/import-export-udf-common-scala_2.13)
6-
Scala 2.12: [![Maven Central](https://img.shields.io/maven-central/v/com.exasol/import-export-udf-common-scala_2.12)](https://search.maven.org/artifact/com.exasol/import-export-udf-common-scala_2.12)
4+
[![Maven Central – Import Export UDF Common Scala](https://img.shields.io/maven-central/v/com.exasol/import-export-udf-common-scala)](https://search.maven.org/artifact/com.exasol/import-export-udf-common-scala)
75

86
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=com.exasol%3Aimport-export-udf-common-scala&metric=alert_status)](https://sonarcloud.io/dashboard?id=com.exasol%3Aimport-export-udf-common-scala)
97

0 commit comments

Comments
 (0)