From 5b4af25d8ab6d24084dd1db304cdbc54fb755c55 Mon Sep 17 00:00:00 2001 From: Christoph Pirkl Date: Wed, 22 Sep 2021 16:24:28 +0200 Subject: [PATCH 01/12] Delete and ignore Eclipse config files --- .classpath | 35 ---------------------- .gitignore | 5 ++++ .project | 18 ----------- .settings/org.eclipse.core.resources.prefs | 1 + 4 files changed, 6 insertions(+), 53 deletions(-) delete mode 100644 .classpath delete mode 100644 .project diff --git a/.classpath b/.classpath deleted file mode 100644 index dee4996e..00000000 --- a/.classpath +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.gitignore b/.gitignore index b0b71bbd..7ed13465 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,10 @@ /bin/ /target/ +/.classpath +/.project +/.settings/org.eclipse.jdt.apt.core.prefs +/.settings/org.eclipse.m2e.core.prefs + **/*.md.html **/*.bak **/*.swp diff --git a/.project b/.project deleted file mode 100644 index 547c8446..00000000 --- a/.project +++ /dev/null @@ -1,18 +0,0 @@ - - - sql-statement-builder - This module provides a Builder for SQL statements that helps creating the correct structure and validates variable parts of the statements. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. - - - - org.eclipse.jdt.core.javabuilder - - - org.eclipse.m2e.core.maven2Builder - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - \ No newline at end of file diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs index f9fe3459..cdfe4f1b 100644 --- a/.settings/org.eclipse.core.resources.prefs +++ b/.settings/org.eclipse.core.resources.prefs @@ -1,4 +1,5 @@ eclipse.preferences.version=1 encoding//src/main/java=UTF-8 encoding//src/test/java=UTF-8 +encoding//src/test/resources=UTF-8 encoding/=UTF-8 From 131553e253135d0eb87cacb5b96e53bd4137337d Mon Sep 17 00:00:00 2001 From: Christoph Pirkl Date: Wed, 22 Sep 2021 16:33:00 +0200 Subject: [PATCH 02/12] Upgrade dependencies --- ...ase_droid_upload_github_release_assets.yml | 7 ++++++ dependencies.md | 6 ++--- doc/changes/changelog.md | 1 + doc/changes/changes_4.4.3.md | 25 +++++++++++++++++++ pom.xml | 18 ++++++------- 5 files changed, 45 insertions(+), 12 deletions(-) create mode 100644 doc/changes/changes_4.4.3.md diff --git a/.github/workflows/release_droid_upload_github_release_assets.yml b/.github/workflows/release_droid_upload_github_release_assets.yml index aeb21215..97f99141 100644 --- a/.github/workflows/release_droid_upload_github_release_assets.yml +++ b/.github/workflows/release_droid_upload_github_release_assets.yml @@ -28,11 +28,18 @@ jobs: ${{ runner.os }}-maven- - name: Build with Maven skipping tests run: mvn clean verify -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 uses: shogo82148/actions-upload-release-asset@v1 with: upload_url: ${{ github.event.inputs.upload_url }} asset_path: target/*.jar + - name: Upload sha256sum files + uses: shogo82148/actions-upload-release-asset@v1 + with: + upload_url: ${{ github.event.inputs.upload_url }} + asset_path: target/*.sha256 - name: Upload error-code-report uses: shogo82148/actions-upload-release-asset@v1 with: diff --git a/dependencies.md b/dependencies.md index be4662a2..02b4d3f2 100644 --- a/dependencies.md +++ b/dependencies.md @@ -20,7 +20,7 @@ | [Maven Surefire Plugin][14] | [Apache License, Version 2.0][11] | | [Apache Maven Source Plugin][16] | [Apache License, Version 2.0][11] | | [Apache Maven Javadoc Plugin][18] | [Apache License, Version 2.0][11] | -| [Apache Maven GPG Plugin][20] | [Apache License, Version 2.0][9] | +| [Apache Maven GPG Plugin][20] | [Apache License, Version 2.0][11] | | [OpenFastTrace Maven Plugin][22] | [GNU General Public License v3.0][23] | | [org.sonatype.ossindex.maven:ossindex-maven-plugin][24] | [ASL2][9] | | [Versions Maven Plugin][26] | [Apache License, Version 2.0][11] | @@ -37,7 +37,6 @@ | [Apache Maven Install Plugin][48] | [Apache License, Version 2.0][9] | | [Apache Maven Site Plugin][50] | [Apache License, Version 2.0][11] | -[12]: https://www.eclemma.org/jacoco/index.html [32]: https://github.com/exasol/project-keeper-maven-plugin [2]: https://github.com/hamcrest/JavaHamcrest [9]: http://www.apache.org/licenses/LICENSE-2.0.txt @@ -48,12 +47,12 @@ [34]: https://maven.apache.org/surefire/maven-failsafe-plugin/ [26]: http://www.mojohaus.org/versions-maven-plugin/ [10]: https://maven.apache.org/plugins/maven-compiler-plugin/ -[20]: http://maven.apache.org/plugins/maven-gpg-plugin/ [44]: https://maven.apache.org/plugins/maven-resources-plugin/ [22]: https://github.com/itsallcode/openfasttrace-maven-plugin [42]: https://maven.apache.org/plugins/maven-clean-plugin/ [13]: https://www.eclipse.org/legal/epl-2.0/ [31]: http://www.eclipse.org/legal/epl-v10.html +[12]: https://www.jacoco.org/jacoco/trunk/doc/maven.html [5]: https://github.com/mockito/mockito/blob/main/LICENSE [40]: http://zlika.github.io/reproducible-build-maven-plugin [50]: https://maven.apache.org/plugins/maven-site-plugin/ @@ -65,6 +64,7 @@ [48]: http://maven.apache.org/plugins/maven-install-plugin/ [0]: https://junit.org/junit5/ [24]: https://sonatype.github.io/ossindex-maven/maven-plugin/ +[20]: https://maven.apache.org/plugins/maven-gpg-plugin/ [8]: http://www.jqno.nl/equalsverifier [16]: https://maven.apache.org/plugins/maven-source-plugin/ [36]: http://maven.apache.org/plugins/maven-deploy-plugin/ diff --git a/doc/changes/changelog.md b/doc/changes/changelog.md index f8d1c8ad..3d7f896a 100644 --- a/doc/changes/changelog.md +++ b/doc/changes/changelog.md @@ -1,5 +1,6 @@ # Changes +* [4.4.3](changes_4.4.3.md) * [4.4.2](changes_4.4.2.md) * [4.4.1](changes_4.4.1.md) * [4.4.0](changes_4.4.0.md) diff --git a/doc/changes/changes_4.4.3.md b/doc/changes/changes_4.4.3.md new file mode 100644 index 00000000..bc667624 --- /dev/null +++ b/doc/changes/changes_4.4.3.md @@ -0,0 +1,25 @@ +# Exasol SQL Statement Builder 4.4.3, released 2021-09-?? + +Code name: Internal refactorings + +## Refactoring + +* [#117](https://github.com/exasol/sql-statement-builder/issues/117): Fix sonar findings + +## Dependency Updates + +### Test Dependency Updates + +* Updated `nl.jqno.equalsverifier:equalsverifier:3.6.1` to `3.7.1` +* Updated `org.junit.jupiter:junit-jupiter:5.7.2` to `5.8.0` +* Updated `org.mockito:mockito-core:3.10.0` to `3.12.4` +* Updated `org.mockito:mockito-junit-jupiter:3.10.0` to `3.12.4` + +### Plugin Dependency Updates + +* Updated `com.exasol:error-code-crawler-maven-plugin:0.4.0` to `0.6.0` +* Updated `com.exasol:project-keeper-maven-plugin:0.7.1` to `1.0.0` +* Updated `org.apache.maven.plugins:maven-enforcer-plugin:3.0.0-M3` to `3.0.0` +* Updated `org.apache.maven.plugins:maven-gpg-plugin:1.6` to `3.0.1` +* Updated `org.apache.maven.plugins:maven-javadoc-plugin:3.2.0` to `3.3.1` +* Updated `org.jacoco:jacoco-maven-plugin:0.8.6` to `0.8.7` diff --git a/pom.xml b/pom.xml index 151de9c0..b7dd8f5a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.exasol sql-statement-builder - 4.4.2 + 4.4.3 Exasol SQL Statement Builder This module provides a Builder for SQL statements that helps creating the correct structure and validates variable parts of the statements. @@ -16,7 +16,7 @@ UTF-8 11 true - 3.12.0 + 3.12.4 @@ -68,7 +68,7 @@ org.junit.jupiter junit-jupiter - 5.7.2 + 5.8.0 test @@ -110,7 +110,7 @@ org.jacoco jacoco-maven-plugin - 0.8.6 + 0.8.7 prepare-agent @@ -183,7 +183,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.3.1 attach-javadocs @@ -203,7 +203,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.6 + 3.0.1 sign-artifacts @@ -267,7 +267,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.0.0-M3 + 3.0.0 enforce-maven @@ -306,7 +306,7 @@ com.exasol project-keeper-maven-plugin - 0.10.0 + 1.0.0 @@ -358,7 +358,7 @@ com.exasol error-code-crawler-maven-plugin - 0.5.1 + 0.6.0 From a66b59b01946dca70b1f4717a94176da410f026d Mon Sep 17 00:00:00 2001 From: Christoph Pirkl Date: Wed, 22 Sep 2021 16:40:57 +0200 Subject: [PATCH 03/12] Configure sonarlint binding --- .settings/org.sonarlint.eclipse.core.prefs | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .settings/org.sonarlint.eclipse.core.prefs diff --git a/.settings/org.sonarlint.eclipse.core.prefs b/.settings/org.sonarlint.eclipse.core.prefs new file mode 100644 index 00000000..8e19a74b --- /dev/null +++ b/.settings/org.sonarlint.eclipse.core.prefs @@ -0,0 +1,6 @@ +autoEnabled=true +eclipse.preferences.version=1 +idePrefixKey= +projectKey=com.exasol\:sql-statement-builder +serverId=SonarCloud/exasol +sqPrefixKey= From 3e51260884993fd8f4d8c64b98c8a9bcbf45b7c2 Mon Sep 17 00:00:00 2001 From: Christoph Pirkl Date: Wed, 22 Sep 2021 16:42:57 +0200 Subject: [PATCH 04/12] Fix sonar issues --- .../java/com/exasol/datatype/value/AbstractInterval.java | 8 ++++---- src/main/java/com/exasol/sql/AbstractFragment.java | 2 +- .../exasol/sql/dml/insert/AbstractInsertValueTable.java | 2 +- .../com/exasol/sql/dml/merge/MergeMethodDefinition.java | 2 +- .../java/com/exasol/sql/expression/ColumnReference.java | 5 +++-- .../expression/rendering/AbstractExpressionRenderer.java | 2 +- .../exasol/sql/rendering/AbstractFragmentRenderer.java | 6 +++--- 7 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/exasol/datatype/value/AbstractInterval.java b/src/main/java/com/exasol/datatype/value/AbstractInterval.java index b9e0f34c..4fce09c2 100644 --- a/src/main/java/com/exasol/datatype/value/AbstractInterval.java +++ b/src/main/java/com/exasol/datatype/value/AbstractInterval.java @@ -3,10 +3,10 @@ import java.util.regex.Matcher; public abstract class AbstractInterval { - protected long value; - protected boolean positive; + protected final long value; + protected final boolean positive; - public AbstractInterval(final long value) { + protected AbstractInterval(final long value) { if (value >= 0) { this.value = value; this.positive = true; @@ -16,7 +16,7 @@ public AbstractInterval(final long value) { } } - public AbstractInterval(final long absoluteValue, final boolean positive) { + protected AbstractInterval(final long absoluteValue, final boolean positive) { this.value = absoluteValue; this.positive = positive; } diff --git a/src/main/java/com/exasol/sql/AbstractFragment.java b/src/main/java/com/exasol/sql/AbstractFragment.java index 4bec9fd9..28d09a8d 100644 --- a/src/main/java/com/exasol/sql/AbstractFragment.java +++ b/src/main/java/com/exasol/sql/AbstractFragment.java @@ -11,7 +11,7 @@ public abstract class AbstractFragment implements Fragment { * * @param root root SQL statement this fragment belongs to. */ - public AbstractFragment(final Fragment root) { + protected AbstractFragment(final Fragment root) { this.root = root; } diff --git a/src/main/java/com/exasol/sql/dml/insert/AbstractInsertValueTable.java b/src/main/java/com/exasol/sql/dml/insert/AbstractInsertValueTable.java index b58917e3..a3f6a204 100644 --- a/src/main/java/com/exasol/sql/dml/insert/AbstractInsertValueTable.java +++ b/src/main/java/com/exasol/sql/dml/insert/AbstractInsertValueTable.java @@ -17,7 +17,7 @@ public abstract class AbstractInsertValueTable Date: Wed, 22 Sep 2021 16:51:42 +0200 Subject: [PATCH 05/12] Add dependabot and matrix build with java 16 --- .github/dependabot.yml | 6 ++++++ .github/workflows/ci-build.yml | 39 ++++++++++++++++++++++++++++------ 2 files changed, 38 insertions(+), 7 deletions(-) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..5ace4600 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,6 @@ +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index a90eca36..d80a0920 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -6,25 +6,50 @@ on: jobs: build: runs-on: ubuntu-latest + strategy: + matrix: + java: [11, 16] + env: + DEFAULT_JAVA: 11 + steps: - name: Checkout the repository uses: actions/checkout@v2 with: fetch-depth: 0 - - name: Set up JDK 11 - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 with: - java-version: 11 + distribution: 'zulu' + java-version: ${{ matrix.java }} + - name: Cache local Maven repository uses: actions/cache@v2 with: path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + key: ${{ runner.os }}-java-${{ matrix.java }}-maven-${{ hashFiles('**/pom.xml') }} restore-keys: | - ${{ runner.os }}-maven- + ${{ runner.os }}-java-${{ matrix.java }}-maven- + + - name: Cache SonarQube packages + uses: actions/cache@v2 + with: + path: ~/.sonar/cache + key: ${{ runner.os }}-java-${{ matrix.java }}-sonar + restore-keys: ${{ runner.os }}-java-${{ matrix.java }}-sonar + - name: Run tests and build with Maven - run: mvn --batch-mode --update-snapshots clean verify sonar:sonar --file pom.xml -DtrimStackTrace=false -Dsonar.organization=exasol -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN + run: mvn --batch-mode --update-snapshots clean verify -DtrimStackTrace=false + + - name: Publish Test Report for Java ${{ matrix.java }} + uses: scacap/action-surefire-report@v1 + if: ${{ always() }} + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + + - name: Sonar analysis + if: ${{ env.DEFAULT_JAVA == matrix.java && env.SONAR_TOKEN != null }} + run: mvn --batch-mode sonar:sonar -DtrimStackTrace=false \ + -Dsonar.organization=exasol -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN env: - GITHUB_OAUTH: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} \ No newline at end of file From da313043d1917e9eeb40b1ab0386a2eea71f06c1 Mon Sep 17 00:00:00 2001 From: Christoph Pirkl Date: Wed, 22 Sep 2021 16:56:59 +0200 Subject: [PATCH 06/12] Building with Java 16 causes many javadoc errors --- .github/workflows/ci-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index d80a0920..8fa1fad6 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [11, 16] + java: [11] env: DEFAULT_JAVA: 11 From bbeb158166091e63c803a7b4c57be389ba1523c7 Mon Sep 17 00:00:00 2001 From: Christoph Pirkl Date: Wed, 22 Sep 2021 17:36:47 +0200 Subject: [PATCH 07/12] Fix yml syntax --- .github/workflows/ci-build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 8fa1fad6..7ac09690 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -48,8 +48,9 @@ jobs: - name: Sonar analysis if: ${{ env.DEFAULT_JAVA == matrix.java && env.SONAR_TOKEN != null }} - run: mvn --batch-mode sonar:sonar -DtrimStackTrace=false \ - -Dsonar.organization=exasol -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN + run: | + mvn --batch-mode sonar:sonar -DtrimStackTrace=false \ + -Dsonar.organization=exasol -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} \ No newline at end of file From 0014f2d4336e16b4607e257438458a1ccfe37038 Mon Sep 17 00:00:00 2001 From: Christoph Pirkl Date: Wed, 22 Sep 2021 17:47:25 +0200 Subject: [PATCH 08/12] Upgrade project-keeper --- doc/changes/changes_4.4.3.md | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/changes/changes_4.4.3.md b/doc/changes/changes_4.4.3.md index bc667624..d764b26c 100644 --- a/doc/changes/changes_4.4.3.md +++ b/doc/changes/changes_4.4.3.md @@ -18,7 +18,7 @@ Code name: Internal refactorings ### Plugin Dependency Updates * Updated `com.exasol:error-code-crawler-maven-plugin:0.4.0` to `0.6.0` -* Updated `com.exasol:project-keeper-maven-plugin:0.7.1` to `1.0.0` +* Updated `com.exasol:project-keeper-maven-plugin:0.7.1` to `1.2.0` * Updated `org.apache.maven.plugins:maven-enforcer-plugin:3.0.0-M3` to `3.0.0` * Updated `org.apache.maven.plugins:maven-gpg-plugin:1.6` to `3.0.1` * Updated `org.apache.maven.plugins:maven-javadoc-plugin:3.2.0` to `3.3.1` diff --git a/pom.xml b/pom.xml index b7dd8f5a..03d28745 100644 --- a/pom.xml +++ b/pom.xml @@ -306,7 +306,7 @@ com.exasol project-keeper-maven-plugin - 1.0.0 + 1.2.0 From 280ba7e51210e10ab758c4611438a2260e2c585a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?ch=CF=80?= Date: Thu, 23 Sep 2021 11:42:58 +0200 Subject: [PATCH 09/12] Apply suggestions from code review Co-authored-by: jakobbraun --- doc/changes/changes_4.4.3.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/changes/changes_4.4.3.md b/doc/changes/changes_4.4.3.md index d764b26c..6dbeaf54 100644 --- a/doc/changes/changes_4.4.3.md +++ b/doc/changes/changes_4.4.3.md @@ -1,10 +1,10 @@ # Exasol SQL Statement Builder 4.4.3, released 2021-09-?? -Code name: Internal refactorings +Code name: Internal refactorings on "More Predicates" ## Refactoring -* [#117](https://github.com/exasol/sql-statement-builder/issues/117): Fix sonar findings +* [#117](https://github.com/exasol/sql-statement-builder/issues/117): Fixed sonar findings ## Dependency Updates From e26ba9817f4283c3623f0045b8e954404120fa50 Mon Sep 17 00:00:00 2001 From: Christoph Pirkl Date: Thu, 23 Sep 2021 11:43:55 +0200 Subject: [PATCH 10/12] Implement review findings: remove matrix build --- .github/workflows/ci-build.yml | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 7ac09690..9ba4c6de 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -6,11 +6,6 @@ on: jobs: build: runs-on: ubuntu-latest - strategy: - matrix: - java: [11] - env: - DEFAULT_JAVA: 11 steps: - name: Checkout the repository @@ -20,34 +15,34 @@ jobs: - uses: actions/setup-java@v2 with: distribution: 'zulu' - java-version: ${{ matrix.java }} + java-version: 11 - name: Cache local Maven repository uses: actions/cache@v2 with: path: ~/.m2/repository - key: ${{ runner.os }}-java-${{ matrix.java }}-maven-${{ hashFiles('**/pom.xml') }} + key: ${{ runner.os }}-java-11-maven-${{ hashFiles('**/pom.xml') }} restore-keys: | - ${{ runner.os }}-java-${{ matrix.java }}-maven- + ${{ runner.os }}-java-11-maven- - name: Cache SonarQube packages uses: actions/cache@v2 with: path: ~/.sonar/cache - key: ${{ runner.os }}-java-${{ matrix.java }}-sonar - restore-keys: ${{ runner.os }}-java-${{ matrix.java }}-sonar + key: ${{ runner.os }}-java-11-sonar + restore-keys: ${{ runner.os }}-java-11-sonar - name: Run tests and build with Maven run: mvn --batch-mode --update-snapshots clean verify -DtrimStackTrace=false - - name: Publish Test Report for Java ${{ matrix.java }} + - name: Publish Test Report for Java 11 uses: scacap/action-surefire-report@v1 if: ${{ always() }} with: github_token: ${{ secrets.GITHUB_TOKEN }} - name: Sonar analysis - if: ${{ env.DEFAULT_JAVA == matrix.java && env.SONAR_TOKEN != null }} + if: ${{ env.SONAR_TOKEN != null }} run: | mvn --batch-mode sonar:sonar -DtrimStackTrace=false \ -Dsonar.organization=exasol -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN From 800839d97cf605d06e2ef2fabac8bf0834e264be Mon Sep 17 00:00:00 2001 From: Christoph Pirkl Date: Thu, 23 Sep 2021 11:46:31 +0200 Subject: [PATCH 11/12] Upgrade junit dependency --- doc/changes/changes_4.4.3.md | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/changes/changes_4.4.3.md b/doc/changes/changes_4.4.3.md index 6dbeaf54..8e904757 100644 --- a/doc/changes/changes_4.4.3.md +++ b/doc/changes/changes_4.4.3.md @@ -11,7 +11,7 @@ Code name: Internal refactorings on "More Predicates" ### Test Dependency Updates * Updated `nl.jqno.equalsverifier:equalsverifier:3.6.1` to `3.7.1` -* Updated `org.junit.jupiter:junit-jupiter:5.7.2` to `5.8.0` +* Updated `org.junit.jupiter:junit-jupiter:5.7.2` to `5.8.1` * Updated `org.mockito:mockito-core:3.10.0` to `3.12.4` * Updated `org.mockito:mockito-junit-jupiter:3.10.0` to `3.12.4` diff --git a/pom.xml b/pom.xml index 03d28745..625742b8 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,7 @@ org.junit.jupiter junit-jupiter - 5.8.0 + 5.8.1 test From 158028e2d070d8d93520e1bedff7914bd9f3c6a0 Mon Sep 17 00:00:00 2001 From: Christoph Pirkl Date: Thu, 23 Sep 2021 13:43:39 +0200 Subject: [PATCH 12/12] Implement review findings --- .github/workflows/ci-build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 9ba4c6de..ccc2676d 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -14,7 +14,7 @@ jobs: fetch-depth: 0 - uses: actions/setup-java@v2 with: - distribution: 'zulu' + distribution: 'temurin' java-version: 11 - name: Cache local Maven repository @@ -42,7 +42,6 @@ jobs: github_token: ${{ secrets.GITHUB_TOKEN }} - name: Sonar analysis - if: ${{ env.SONAR_TOKEN != null }} run: | mvn --batch-mode sonar:sonar -DtrimStackTrace=false \ -Dsonar.organization=exasol -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN