Skip to content

Commit 00e7e6e

Browse files
authored
Fix changes file (#35)
* Fix changes file * Simplify build scripts
1 parent ea5f0d2 commit 00e7e6e

File tree

7 files changed

+38
-57
lines changed

7 files changed

+38
-57
lines changed

.github/workflows/ci-build.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
include:
17-
- { scala-version: 'scala2.12', project-keeper-skip: true }
18-
- { scala-version: 'scala2.13', project-keeper-skip: false }
17+
- { scala-version: 'scala2.12' }
18+
- { scala-version: 'scala2.13' }
1919
concurrency:
2020
group: ${{ github.workflow }}-${{ github.ref }}
2121
cancel-in-progress: true
@@ -47,8 +47,7 @@ jobs:
4747
mvn --batch-mode verify \
4848
-P${{ matrix.scala-version }} \
4949
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
50-
-DtrimStackTrace=false \
51-
-Dproject-keeper.skip=${{ matrix.project-keeper-skip }}
50+
-DtrimStackTrace=false
5251
- name: Publish Test Report
5352
uses: scacap/action-surefire-report@v1
5453
if: ${{ always() && github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]' && startsWith(matrix.scala-version, 'scala2.13') }}

.github/workflows/release_droid_prepare_original_checksum.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ jobs:
1111
fail-fast: false
1212
matrix:
1313
include:
14-
- { scala-version: 'scala2.12', project-keeper-skip: true }
15-
- { scala-version: 'scala2.13', project-keeper-skip: false }
14+
- { scala-version: 'scala2.12' }
15+
- { scala-version: 'scala2.13' }
1616
steps:
1717
- name: Checkout the repository
1818
uses: actions/checkout@v3
@@ -27,8 +27,7 @@ jobs:
2727
- name: Run tests and build with Maven for ${{ matrix.scala-version }}
2828
run: |
2929
mvn --batch-mode clean verify --file pom.xml \
30-
-P${{ matrix.scala-version }} \
31-
-Dproject-keeper.skip=${{ matrix.project-keeper-skip }}
30+
-P${{ matrix.scala-version }}
3231
- name: Prepare checksum
3332
run: find target -maxdepth 1 -name *.jar -exec sha256sum "{}" + > original_checksum
3433
- name: Upload checksum to the artifactory

.github/workflows/release_droid_print_quick_checksum.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ jobs:
1111
fail-fast: false
1212
matrix:
1313
include:
14-
- { scala-version: 'scala2.12', project-keeper-skip: true }
15-
- { scala-version: 'scala2.13', project-keeper-skip: false }
14+
- { scala-version: 'scala2.12' }
15+
- { scala-version: 'scala2.13' }
1616
steps:
1717
- name: Checkout the repository
1818
uses: actions/checkout@v3
@@ -28,7 +28,6 @@ jobs:
2828
run: |
2929
mvn --batch-mode clean verify \
3030
-P${{ matrix.scala-version }} \
31-
-DskipTests \
32-
-Dproject-keeper.skip=${{ matrix.project-keeper-skip }}
31+
-DskipTests
3332
- name: Print checksum
3433
run: echo 'checksum_start==';find target -maxdepth 1 -name *.jar -exec sha256sum "{}" + | xargs;echo '==checksum_end'

.github/workflows/release_droid_release_on_maven_central.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ jobs:
1111
fail-fast: false
1212
matrix:
1313
include:
14-
- { scala-version: 'scala2.12', project-keeper-skip: true }
15-
- { scala-version: 'scala2.13', project-keeper-skip: false }
14+
- { scala-version: 'scala2.12' }
15+
- { scala-version: 'scala2.13' }
1616
steps:
1717
- name: Checkout the repository
1818
uses: actions/checkout@v3
@@ -35,8 +35,7 @@ jobs:
3535
-P${{ matrix.scala-version }} \
3636
-Dgpg.skip=false \
3737
-Dgpg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} \
38-
-DskipTests \
39-
-Dproject-keeper.skip=${{ matrix.project-keeper-skip }}
38+
-DskipTests
4039
env:
4140
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
4241
MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}

.github/workflows/release_droid_upload_github_release_assets.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ jobs:
1515
fail-fast: false
1616
matrix:
1717
include:
18-
- { scala-version: 'scala2.12', project-keeper-skip: true }
19-
- { scala-version: 'scala2.13', project-keeper-skip: false }
18+
- { scala-version: 'scala2.12' }
19+
- { scala-version: 'scala2.13' }
2020
steps:
2121
- name: Checkout the repository
2222
uses: actions/checkout@v3
@@ -32,8 +32,7 @@ jobs:
3232
run: |
3333
mvn --batch-mode clean verify \
3434
-P${{ matrix.scala-version }} \
35-
-DskipTests \
36-
-Dproject-keeper.skip=${{ matrix.project-keeper-skip }}
35+
-DskipTests
3736
- name: Generate sha256sum files
3837
run: find target -maxdepth 1 -name *.jar -exec bash -c 'sha256sum {} > {}.sha256' \;
3938
- name: Upload assets to the GitHub release draft

doc/changes/changes_0.4.1.md

Lines changed: 21 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -18,49 +18,33 @@ This release fixes vulnerabilities in the following dependencies:
1818

1919
### Compile Dependency Updates
2020

21-
* Added `com.exasol:error-reporting-java:0.4.1`
22-
* Added `com.exasol:exasol-script-api:6.1.7`
23-
* Added `com.fasterxml.jackson.core:jackson-databind:2.12.7`
24-
* Added `com.fasterxml.jackson.module:jackson-module-scala_2.13:2.12.7`
25-
* Added `com.typesafe.scala-logging:scala-logging_2.13:3.9.5`
26-
* Added `org.apache.avro:avro:1.11.1`
27-
* Added `org.scala-lang:scala-library:2.13.8`
28-
* Added `org.slf4j:slf4j-simple:1.7.36`
21+
* Updated `com.fasterxml.jackson.core:jackson-databind:2.12.5` to `2.12.7`
22+
* Updated `com.fasterxml.jackson.module:jackson-module-scala_2.13:2.12.5` to `2.12.7`
23+
* Updated `com.typesafe.scala-logging:scala-logging_2.13:3.9.4` to `3.9.5`
24+
* Updated `org.apache.avro:avro:1.11.0` to `1.11.1`
2925

3026
### Test Dependency Updates
3127

32-
* Added `org.mockito:mockito-core:4.6.1`
33-
* Added `org.scalatestplus:scalatestplus-mockito_2.13:1.0.0-M2`
34-
* Added `org.scalatest:scalatest_2.13:3.2.13`
28+
* Updated `org.mockito:mockito-core:4.3.1` to `4.6.1`
29+
* Updated `org.scalatest:scalatest_2.13:3.2.10` to `3.2.13`
3530

3631
### Plugin Dependency Updates
3732

38-
* Added `com.diffplug.spotless:spotless-maven-plugin:2.22.8`
39-
* Added `com.exasol:error-code-crawler-maven-plugin:1.1.1`
40-
* Added `com.exasol:project-keeper-maven-plugin:2.5.0`
41-
* Added `io.github.evis:scalafix-maven-plugin_2.13:0.1.6_0.10.0`
42-
* Added `io.github.zlika:reproducible-build-maven-plugin:0.15`
43-
* Added `net.alchim31.maven:scala-maven-plugin:4.6.3`
44-
* Added `org.apache.maven.plugins:maven-assembly-plugin:3.3.0`
45-
* Added `org.apache.maven.plugins:maven-clean-plugin:2.5`
46-
* Added `org.apache.maven.plugins:maven-compiler-plugin:3.10.1`
47-
* Added `org.apache.maven.plugins:maven-deploy-plugin:3.0.0-M1`
48-
* Added `org.apache.maven.plugins:maven-enforcer-plugin:3.0.0`
49-
* Added `org.apache.maven.plugins:maven-gpg-plugin:3.0.1`
50-
* Added `org.apache.maven.plugins:maven-install-plugin:2.4`
51-
* Added `org.apache.maven.plugins:maven-jar-plugin:2.4`
52-
* Added `org.apache.maven.plugins:maven-javadoc-plugin:3.4.0`
53-
* Added `org.apache.maven.plugins:maven-resources-plugin:2.6`
54-
* Added `org.apache.maven.plugins:maven-site-plugin:3.3`
55-
* Added `org.apache.maven.plugins:maven-source-plugin:3.2.1`
56-
* Added `org.apache.maven.plugins:maven-surefire-plugin:3.0.0-M5`
33+
* Updated `com.diffplug.spotless:spotless-maven-plugin:2.20.2` to `2.22.8`
34+
* Updated `com.exasol:error-code-crawler-maven-plugin:1.0.0` to `1.1.1`
35+
* Updated `com.exasol:project-keeper-maven-plugin:1.3.4` to `2.5.0`
36+
* Updated `io.github.evis:scalafix-maven-plugin_2.13:0.1.4_0.9.33` to `0.1.6_0.10.0`
37+
* Updated `net.alchim31.maven:scala-maven-plugin:4.5.6` to `4.6.3`
38+
* Updated `org.apache.maven.plugins:maven-clean-plugin:3.1.0` to `2.5`
39+
* Updated `org.apache.maven.plugins:maven-compiler-plugin:3.10.0` to `3.10.1`
40+
* Updated `org.apache.maven.plugins:maven-install-plugin:2.5.2` to `2.4`
41+
* Updated `org.apache.maven.plugins:maven-jar-plugin:3.2.2` to `2.4`
42+
* Updated `org.apache.maven.plugins:maven-javadoc-plugin:3.3.2` to `3.4.0`
43+
* Updated `org.apache.maven.plugins:maven-resources-plugin:3.2.0` to `2.6`
44+
* Updated `org.apache.maven.plugins:maven-site-plugin:3.11.0` to `3.3`
45+
* Updated `org.apache.maven.plugins:maven-surefire-plugin:3.0.0-M4` to `3.0.0-M5`
5746
* Added `org.codehaus.mojo:flatten-maven-plugin:1.2.7`
58-
* Added `org.codehaus.mojo:versions-maven-plugin:2.10.0`
59-
* Added `org.itsallcode:openfasttrace-maven-plugin:1.4.0`
47+
* Updated `org.codehaus.mojo:versions-maven-plugin:2.9.0` to `2.10.0`
6048
* Added `org.jacoco:jacoco-maven-plugin:0.8.8`
61-
* Added `org.scalastyle:scalastyle-maven-plugin:1.0.0`
62-
* Added `org.scalatest:scalatest-maven-plugin:2.0.2`
63-
* Added `org.scoverage:scoverage-maven-plugin:1.4.11`
6449
* Added `org.sonarsource.scanner.maven:sonar-maven-plugin:3.9.1.2184`
65-
* Added `org.sonatype.ossindex.maven:ossindex-maven-plugin:3.2.0`
66-
* Added `org.sonatype.plugins:nexus-staging-maven-plugin:1.6.13`
50+
* Updated `org.sonatype.plugins:nexus-staging-maven-plugin:1.6.8` to `1.6.13`

pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -383,13 +383,15 @@
383383
<properties>
384384
<scala.version>2.13.8</scala.version>
385385
<scala.compat.version>2.13</scala.compat.version>
386+
<project-keeper.skip>false</project-keeper.skip>
386387
</properties>
387388
</profile>
388389
<profile>
389390
<id>scala2.12</id>
390391
<properties>
391392
<scala.version>2.12.15</scala.version>
392393
<scala.compat.version>2.12</scala.compat.version>
394+
<project-keeper.skip>true</project-keeper.skip>
393395
</properties>
394396
</profile>
395397
</profiles>

0 commit comments

Comments
 (0)