From 9f660cb7c71fae0b9c2b58be25accd57dde84c34 Mon Sep 17 00:00:00 2001 From: morazow Date: Wed, 5 Apr 2023 16:53:59 +0200 Subject: [PATCH 1/4] Removed references to outdated `maven.exasol.com` repository Fixes #165 --- .github/workflows/broken_links_checker.yml | 7 ++-- .github/workflows/ci-build-next-java.yml | 2 +- ...ase_droid_upload_github_release_assets.yml | 6 ++-- .vscode/settings.json | 17 ++++++++++ README.md | 4 +-- dependencies.md | 26 +++++++-------- doc/changes/changelog.md | 1 + doc/changes/changes_4.5.3.md | 31 ++++++++++++++++++ pk_generated_parent.pom | 32 +++++++++++++------ pom.xml | 30 ++++------------- 10 files changed, 103 insertions(+), 53 deletions(-) create mode 100644 .vscode/settings.json create mode 100644 doc/changes/changes_4.5.3.md diff --git a/.github/workflows/broken_links_checker.yml b/.github/workflows/broken_links_checker.yml index 29071dfb..c4ff3be8 100644 --- a/.github/workflows/broken_links_checker.yml +++ b/.github/workflows/broken_links_checker.yml @@ -19,9 +19,12 @@ jobs: - name: Configure broken links checker run: | mkdir -p ./target - echo '{ "aliveStatusCodes": [429, 200], "ignorePatterns": [{"pattern": "^https?://(www.)?opensource.org"}] }' > ./target/broken_links_checker.json + echo '{"aliveStatusCodes": [429, 200], "ignorePatterns": [' \ + '{"pattern": "^https?://(www|dev).mysql.com/"},' \ + '{"pattern": "^https?://(www.)?opensource.org"}' \ + ']}' > ./target/broken_links_checker.json - uses: gaurav-nelson/github-action-markdown-link-check@v1 with: use-quiet-mode: 'yes' use-verbose-mode: 'yes' - config-file: ./target/broken_links_checker.json \ No newline at end of file + config-file: ./target/broken_links_checker.json diff --git a/.github/workflows/ci-build-next-java.yml b/.github/workflows/ci-build-next-java.yml index 6a1006c1..e0c15cfb 100644 --- a/.github/workflows/ci-build-next-java.yml +++ b/.github/workflows/ci-build-next-java.yml @@ -25,7 +25,7 @@ jobs: cache: 'maven' - name: Run tests and build with Maven run: | - mvn --batch-mode --update-snapshots clean package -DtrimStackTrace=false \ + mvn --batch-mode --update-snapshots clean package -DtrimStackTrace=false \ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - name: Publish Test Report uses: scacap/action-surefire-report@v1 diff --git a/.github/workflows/release_droid_upload_github_release_assets.yml b/.github/workflows/release_droid_upload_github_release_assets.yml index 1fd0b60d..7350fafd 100644 --- a/.github/workflows/release_droid_upload_github_release_assets.yml +++ b/.github/workflows/release_droid_upload_github_release_assets.yml @@ -24,7 +24,9 @@ jobs: - name: Build with Maven skipping tests run: mvn --batch-mode clean verify -DskipTests - name: Generate sha256sum files - run: find target -maxdepth 1 -name *.jar -exec bash -c 'sha256sum {} > {}.sha256' \; + run: | + cd target + find . -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: @@ -39,4 +41,4 @@ jobs: 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/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..f938933d --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,17 @@ +{ + "editor.formatOnSave": true, + "editor.codeActionsOnSave": { + "source.organizeImports": true, + "source.generate.finalModifiers": true, + "source.fixAll": true + }, + "java.codeGeneration.useBlocks": true, + "java.saveActions.organizeImports": true, + "java.sources.organizeImports.starThreshold": 3, + "java.sources.organizeImports.staticStarThreshold": 3, + "java.test.config": { + "vmArgs": [ + "-Djava.util.logging.config.file=src/test/resources/logging.properties" + ] + } +} diff --git a/README.md b/README.md index ea808788..ad3f9d39 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # SQL Statement Builder [![Build Status](https://github.com/exasol/sql-statement-builder/actions/workflows/ci-build.yml/badge.svg)](https://github.com/exasol/sql-statement-builder/actions/workflows/ci-build.yml) -[![Maven Central – Exasol SQL Statement Builder](https://img.shields.io/maven-central/v/com.exasol/sql-statement-builder)](https://search.maven.org/artifact/com.exasol/sql-statement-builder) +[![Maven Central – Exasol SQL Statement Builder](https://img.shields.io/maven-central/v/com.exasol/sql-statement-builder)](https://search.maven.org/artifact/com.exasol/sql-statement-builder) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=com.exasol%3Asql-statement-builder&metric=alert_status)](https://sonarcloud.io/dashboard?id=com.exasol%3Asql-statement-builder) @@ -55,4 +55,4 @@ String sql = renderer.render(); ### Information for Developers * [System Requirement Specification](doc/system_requirements.md) -* [Design](doc/design.md) \ No newline at end of file +* [Design](doc/design.md) diff --git a/dependencies.md b/dependencies.md index 697dd98f..2f96d41a 100644 --- a/dependencies.md +++ b/dependencies.md @@ -17,26 +17,26 @@ | ------------------------------------------------------- | ---------------------------------------------- | | [SonarQube Scanner for Maven][8] | [GNU LGPL 3][9] | | [Apache Maven Compiler Plugin][10] | [Apache License, Version 2.0][7] | -| [Apache Maven Enforcer Plugin][11] | [Apache License, Version 2.0][7] | -| [Maven Flatten Plugin][12] | [Apache Software Licenese][13] | -| [org.sonatype.ossindex.maven:ossindex-maven-plugin][14] | [ASL2][13] | +| [Apache Maven Enforcer Plugin][11] | [Apache-2.0][7] | +| [Maven Flatten Plugin][12] | [Apache Software Licenese][7] | +| [org.sonatype.ossindex.maven:ossindex-maven-plugin][13] | [ASL2][14] | | [Maven Surefire Plugin][15] | [Apache License, Version 2.0][7] | | [Versions Maven Plugin][16] | [Apache License, Version 2.0][7] | -| [Apache Maven Deploy Plugin][17] | [Apache License, Version 2.0][7] | +| [Apache Maven Deploy Plugin][17] | [Apache-2.0][7] | | [Apache Maven GPG Plugin][18] | [Apache License, Version 2.0][7] | | [Apache Maven Source Plugin][19] | [Apache License, Version 2.0][7] | | [Apache Maven Javadoc Plugin][20] | [Apache License, Version 2.0][7] | | [Nexus Staging Maven Plugin][21] | [Eclipse Public License][22] | | [JaCoCo :: Maven Plugin][23] | [Eclipse Public License 2.0][24] | | [error-code-crawler-maven-plugin][25] | [MIT License][26] | -| [Reproducible Build Maven Plugin][27] | [Apache 2.0][13] | +| [Reproducible Build Maven Plugin][27] | [Apache 2.0][14] | | [OpenFastTrace Maven Plugin][28] | [GNU General Public License v3.0][29] | | [Project keeper maven plugin][30] | [The MIT License][31] | -| [Maven Clean Plugin][32] | [The Apache Software License, Version 2.0][13] | -| [Maven Resources Plugin][33] | [The Apache Software License, Version 2.0][13] | -| [Maven JAR Plugin][34] | [The Apache Software License, Version 2.0][13] | -| [Maven Install Plugin][35] | [The Apache Software License, Version 2.0][13] | -| [Maven Site Plugin 3][36] | [The Apache Software License, Version 2.0][13] | +| [Maven Clean Plugin][32] | [The Apache Software License, Version 2.0][14] | +| [Maven Resources Plugin][33] | [The Apache Software License, Version 2.0][14] | +| [Maven JAR Plugin][34] | [The Apache Software License, Version 2.0][14] | +| [Maven Install Plugin][35] | [The Apache Software License, Version 2.0][14] | +| [Maven Site Plugin 3][36] | [The Apache Software License, Version 2.0][14] | [0]: https://junit.org/junit5/ [1]: https://www.eclipse.org/legal/epl-v20.html @@ -51,10 +51,10 @@ [10]: https://maven.apache.org/plugins/maven-compiler-plugin/ [11]: https://maven.apache.org/enforcer/maven-enforcer-plugin/ [12]: https://www.mojohaus.org/flatten-maven-plugin/ -[13]: http://www.apache.org/licenses/LICENSE-2.0.txt -[14]: https://sonatype.github.io/ossindex-maven/maven-plugin/ +[13]: https://sonatype.github.io/ossindex-maven/maven-plugin/ +[14]: http://www.apache.org/licenses/LICENSE-2.0.txt [15]: https://maven.apache.org/surefire/maven-surefire-plugin/ -[16]: http://www.mojohaus.org/versions-maven-plugin/ +[16]: https://www.mojohaus.org/versions/versions-maven-plugin/ [17]: https://maven.apache.org/plugins/maven-deploy-plugin/ [18]: https://maven.apache.org/plugins/maven-gpg-plugin/ [19]: https://maven.apache.org/plugins/maven-source-plugin/ diff --git a/doc/changes/changelog.md b/doc/changes/changelog.md index 960784ac..79c03f56 100644 --- a/doc/changes/changelog.md +++ b/doc/changes/changelog.md @@ -1,5 +1,6 @@ # Changes +* [4.5.3](changes_4.5.3.md) * [4.5.2](changes_4.5.2.md) * [4.5.1](changes_4.5.1.md) * [4.5.0](changes_4.5.0.md) diff --git a/doc/changes/changes_4.5.3.md b/doc/changes/changes_4.5.3.md new file mode 100644 index 00000000..07d653f4 --- /dev/null +++ b/doc/changes/changes_4.5.3.md @@ -0,0 +1,31 @@ +# Exasol SQL Statement Builder 4.5.3, released 2023-??-?? + +Code name: + +## Summary + +## Refactoring + +* #165: Removed references to outdated `maven.exasol.com` artifactory repository + +## Dependency Updates + +### Test Dependency Updates + +* Updated `nl.jqno.equalsverifier:equalsverifier:3.10.1` to `3.14.1` +* Updated `org.junit.jupiter:junit-jupiter:5.9.0` to `5.9.2` +* Updated `org.mockito:mockito-core:4.7.0` to `5.2.0` +* Updated `org.mockito:mockito-junit-jupiter:4.7.0` to `5.2.0` + +### Plugin Dependency Updates + +* Updated `com.exasol:error-code-crawler-maven-plugin:1.1.2` to `1.2.2` +* Updated `com.exasol:project-keeper-maven-plugin:2.6.2` to `2.9.6` +* Updated `io.github.zlika:reproducible-build-maven-plugin:0.15` to `0.16` +* Updated `org.apache.maven.plugins:maven-deploy-plugin:3.0.0-M1` to `3.1.0` +* Updated `org.apache.maven.plugins:maven-enforcer-plugin:3.1.0` to `3.2.1` +* Updated `org.apache.maven.plugins:maven-javadoc-plugin:3.4.0` to `3.4.1` +* Updated `org.apache.maven.plugins:maven-surefire-plugin:3.0.0-M5` to `3.0.0-M8` +* Updated `org.codehaus.mojo:flatten-maven-plugin:1.2.7` to `1.3.0` +* Updated `org.codehaus.mojo:versions-maven-plugin:2.10.0` to `2.14.2` +* Updated `org.itsallcode:openfasttrace-maven-plugin:1.6.0` to `1.6.1` diff --git a/pk_generated_parent.pom b/pk_generated_parent.pom index 064286b6..e816bc91 100644 --- a/pk_generated_parent.pom +++ b/pk_generated_parent.pom @@ -3,7 +3,7 @@ 4.0.0 com.exasol sql-statement-builder-generated-parent - 4.5.2 + 4.5.3 pom UTF-8 @@ -12,6 +12,16 @@ true + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + MIT License @@ -52,7 +62,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.1.0 + 3.2.1 enforce-maven @@ -62,7 +72,7 @@ - 3.6.3 + [3.8.7,3.9.0) @@ -72,7 +82,7 @@ org.codehaus.mojo flatten-maven-plugin - 1.2.7 + 1.3.0 true oss @@ -111,7 +121,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M5 + 3.0.0-M8 @@ -122,7 +132,7 @@ org.codehaus.mojo versions-maven-plugin - 2.10.0 + 2.14.2 display-updates @@ -140,7 +150,7 @@ org.apache.maven.plugins maven-deploy-plugin - 3.0.0-M1 + 3.1.0 true @@ -181,7 +191,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.4.0 + 3.4.1 attach-javadocs @@ -206,6 +216,8 @@ true ossrh https://oss.sonatype.org/ + 15 + 30 @@ -261,7 +273,7 @@ com.exasol error-code-crawler-maven-plugin - 1.1.2 + 1.2.2 verify @@ -274,7 +286,7 @@ io.github.zlika reproducible-build-maven-plugin - 0.15 + 0.16 strip-jar diff --git a/pom.xml b/pom.xml index fca9d1ee..372e9826 100644 --- a/pom.xml +++ b/pom.xml @@ -3,14 +3,14 @@ 4.0.0 com.exasol sql-statement-builder - 4.5.2 + 4.5.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. https://github.com/exasol/sql-statement-builder/ 2018 - 4.7.0 + 5.2.0 @@ -22,27 +22,11 @@ https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - maven.exasol.com - https://maven.exasol.com/artifactory/exasol-releases - - false - - - - maven.exasol.com-snapshots - https://maven.exasol.com/artifactory/exasol-snapshots - - true - - - org.junit.jupiter junit-jupiter - 5.9.0 + 5.9.2 test @@ -66,7 +50,7 @@ nl.jqno.equalsverifier equalsverifier - 3.10.1 + 3.14.1 test @@ -83,7 +67,7 @@ org.itsallcode openfasttrace-maven-plugin - 1.6.0 + 1.6.1 trace-requirements @@ -96,7 +80,7 @@ com.exasol project-keeper-maven-plugin - 2.6.2 + 2.9.6 @@ -110,7 +94,7 @@ sql-statement-builder-generated-parent com.exasol - 4.5.2 + 4.5.3 pk_generated_parent.pom From b3ae52fab6feb88eee18a5cf1c8147f4edc0bc08 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 5 Apr 2023 16:55:47 +0200 Subject: [PATCH 2/4] Bump actions/checkout from 2.3.1 to 3.5.0 (#164) Bumps [actions/checkout](https://github.com/actions/checkout) from 2.3.1 to 3.5.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2.3.1...v3) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/deploy_javadocs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy_javadocs.yml b/.github/workflows/deploy_javadocs.yml index 2cbffbbc..8c2553bc 100644 --- a/.github/workflows/deploy_javadocs.yml +++ b/.github/workflows/deploy_javadocs.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout ️the repository - uses: actions/checkout@v2.3.1 + uses: actions/checkout@v3 - name: Build Javadocs run: mvn javadoc:javadoc - name: Deploy From 698eb75a1fe017095f55bc2672fc353a3a3060a8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 5 Apr 2023 16:56:11 +0200 Subject: [PATCH 3/4] Bump JamesIves/github-pages-deploy-action from 4.1.5 to 4.4.1 (#161) Bumps [JamesIves/github-pages-deploy-action](https://github.com/JamesIves/github-pages-deploy-action) from 4.1.5 to 4.4.1. - [Release notes](https://github.com/JamesIves/github-pages-deploy-action/releases) - [Commits](https://github.com/JamesIves/github-pages-deploy-action/compare/4.1.5...v4.4.1) --- updated-dependencies: - dependency-name: JamesIves/github-pages-deploy-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/deploy_javadocs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy_javadocs.yml b/.github/workflows/deploy_javadocs.yml index 8c2553bc..fa9125fa 100644 --- a/.github/workflows/deploy_javadocs.yml +++ b/.github/workflows/deploy_javadocs.yml @@ -14,7 +14,7 @@ jobs: - name: Build Javadocs run: mvn javadoc:javadoc - name: Deploy - uses: JamesIves/github-pages-deploy-action@4.1.5 + uses: JamesIves/github-pages-deploy-action@v4.4.1 with: branch: gh-pages folder: target/site/apidocs/ \ No newline at end of file From 72daeecc02a585b25ac06df060b36d954711839d Mon Sep 17 00:00:00 2001 From: morazow Date: Wed, 5 Apr 2023 17:12:26 +0200 Subject: [PATCH 4/4] Prepared for release --- doc/changes/changes_4.5.3.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/changes/changes_4.5.3.md b/doc/changes/changes_4.5.3.md index 07d653f4..43fba473 100644 --- a/doc/changes/changes_4.5.3.md +++ b/doc/changes/changes_4.5.3.md @@ -1,9 +1,11 @@ -# Exasol SQL Statement Builder 4.5.3, released 2023-??-?? +# Exasol SQL Statement Builder 4.5.3, released 2023-04-06 -Code name: +Code name: Removed outdated `maven.exasol.com` references ## Summary +In this release, we removed references to the discontinued Exasol `maven.exasol.com` artifactory. + ## Refactoring * #165: Removed references to outdated `maven.exasol.com` artifactory repository