diff --git a/.project-keeper.yml b/.project-keeper.yml index 142dacc..e369610 100644 --- a/.project-keeper.yml +++ b/.project-keeper.yml @@ -7,6 +7,8 @@ sources: excludes: # Environment "aws". Will be fixed in https://github.com/exasol/project-keeper/issues/566 - "E-PK-CORE-18: Outdated content: '.github/workflows/ci-build.yml'" + # Enable logging for Jsch + - "E-PK-CORE-18: Outdated content: 'src/test/resources/logging.properties'" build: workflows: - name: ci-build.yml diff --git a/.vscode/settings.json b/.vscode/settings.json index 2ad7741..d8a771a 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -14,7 +14,8 @@ "java.sources.organizeImports.staticStarThreshold": 3, "java.test.config": { "vmArgs": [ - "-Djava.util.logging.config.file=src/test/resources/logging.properties" + "-Djava.util.logging.config.file=src/test/resources/logging.properties", + "-Dcom.exasol.dockerdb.image=8.26.0" ] }, "sonarlint.connectedMode.project": { diff --git a/dependencies.md b/dependencies.md index e240e3a..94d0133 100644 --- a/dependencies.md +++ b/dependencies.md @@ -11,50 +11,50 @@ | [error-reporting-java][5] | [MIT License][6] | | [AWS Java SDK :: Services :: AWS CloudFormation][7] | [Apache License, Version 2.0][8] | | [AWS Java SDK :: Services :: Amazon EC2][7] | [Apache License, Version 2.0][8] | -| [JSch][9] | [Revised BSD][10] | -| [database-cleaner][11] | [MIT License][12] | -| [Jakarta JSON Processing API][13] | [Eclipse Public License 2.0][14]; [GNU General Public License, version 2 with the GNU Classpath Exception][15] | +| [JSch][9] | [Revised BSD][10]; [Revised BSD][11]; [ISC][12] | +| [database-cleaner][13] | [MIT License][14] | +| [Jakarta JSON Processing API][15] | [Eclipse Public License 2.0][16]; [GNU General Public License, version 2 with the GNU Classpath Exception][17] | ## Test Dependencies | Dependency | License | | ------------------------------------------ | --------------------------------- | -| [JUnit Jupiter Engine][16] | [Eclipse Public License v2.0][17] | -| [JUnit Jupiter Params][16] | [Eclipse Public License v2.0][17] | -| [Hamcrest][18] | [BSD License 3][19] | -| [EqualsVerifier \| release normal jar][20] | [Apache License, Version 2.0][21] | -| [System Lambda][22] | [MIT License][23] | -| [SLF4J JDK14 Provider][24] | [MIT License][25] | +| [JUnit Jupiter Engine][18] | [Eclipse Public License v2.0][19] | +| [JUnit Jupiter Params][18] | [Eclipse Public License v2.0][19] | +| [Hamcrest][20] | [BSD License 3][21] | +| [EqualsVerifier \| release normal jar][22] | [Apache License, Version 2.0][23] | +| [System Lambda][24] | [MIT License][25] | +| [SLF4J JDK14 Provider][26] | [MIT License][27] | ## Runtime Dependencies | Dependency | License | | --------------------- | -------------------------------------------------------------------------------------------------------------- | -| [Eclipse Parsson][26] | [Eclipse Public License 2.0][14]; [GNU General Public License, version 2 with the GNU Classpath Exception][15] | +| [Eclipse Parsson][28] | [Eclipse Public License 2.0][16]; [GNU General Public License, version 2 with the GNU Classpath Exception][17] | ## Plugin Dependencies | Dependency | License | | ------------------------------------------------------- | --------------------------------- | -| [SonarQube Scanner for Maven][27] | [GNU LGPL 3][28] | -| [Apache Maven Toolchains Plugin][29] | [Apache License, Version 2.0][21] | -| [Apache Maven Compiler Plugin][30] | [Apache-2.0][21] | -| [Apache Maven Enforcer Plugin][31] | [Apache-2.0][21] | -| [Maven Flatten Plugin][32] | [Apache Software Licenese][21] | -| [org.sonatype.ossindex.maven:ossindex-maven-plugin][33] | [ASL2][34] | -| [Maven Surefire Plugin][35] | [Apache-2.0][21] | -| [Versions Maven Plugin][36] | [Apache License, Version 2.0][21] | -| [Project Keeper Maven plugin][37] | [The MIT License][38] | -| [duplicate-finder-maven-plugin Maven Mojo][39] | [Apache License 2.0][40] | -| [Apache Maven Deploy Plugin][41] | [Apache-2.0][21] | -| [Apache Maven GPG Plugin][42] | [Apache-2.0][21] | -| [Apache Maven Source Plugin][43] | [Apache License, Version 2.0][21] | -| [Apache Maven Javadoc Plugin][44] | [Apache-2.0][21] | -| [Nexus Staging Maven Plugin][45] | [Eclipse Public License][46] | -| [Maven Failsafe Plugin][47] | [Apache-2.0][21] | -| [JaCoCo :: Maven Plugin][48] | [EPL-2.0][49] | -| [error-code-crawler-maven-plugin][50] | [MIT License][51] | -| [Reproducible Build Maven Plugin][52] | [Apache 2.0][34] | +| [SonarQube Scanner for Maven][29] | [GNU LGPL 3][30] | +| [Apache Maven Toolchains Plugin][31] | [Apache License, Version 2.0][23] | +| [Apache Maven Compiler Plugin][32] | [Apache-2.0][23] | +| [Apache Maven Enforcer Plugin][33] | [Apache-2.0][23] | +| [Maven Flatten Plugin][34] | [Apache Software Licenese][23] | +| [org.sonatype.ossindex.maven:ossindex-maven-plugin][35] | [ASL2][36] | +| [Maven Surefire Plugin][37] | [Apache-2.0][23] | +| [Versions Maven Plugin][38] | [Apache License, Version 2.0][23] | +| [Project Keeper Maven plugin][39] | [The MIT License][40] | +| [duplicate-finder-maven-plugin Maven Mojo][41] | [Apache License 2.0][42] | +| [Apache Maven Deploy Plugin][43] | [Apache-2.0][23] | +| [Apache Maven GPG Plugin][44] | [Apache-2.0][23] | +| [Apache Maven Source Plugin][45] | [Apache License, Version 2.0][23] | +| [Apache Maven Javadoc Plugin][46] | [Apache-2.0][23] | +| [Nexus Staging Maven Plugin][47] | [Eclipse Public License][48] | +| [Maven Failsafe Plugin][49] | [Apache-2.0][23] | +| [JaCoCo :: Maven Plugin][50] | [EPL-2.0][51] | +| [error-code-crawler-maven-plugin][52] | [MIT License][53] | +| [Reproducible Build Maven Plugin][54] | [Apache 2.0][36] | [0]: https://github.com/exasol/bucketfs-java/ [1]: https://github.com/exasol/bucketfs-java/blob/main/LICENSE @@ -65,47 +65,49 @@ [6]: https://github.com/exasol/error-reporting-java/blob/main/LICENSE [7]: https://aws.amazon.com/sdkforjava [8]: https://aws.amazon.com/apache2.0 -[9]: http://www.jcraft.com/jsch/ -[10]: http://www.jcraft.com/jsch/LICENSE.txt -[11]: https://github.com/exasol/database-cleaner/ -[12]: https://github.com/exasol/database-cleaner/blob/main/LICENSE -[13]: https://github.com/eclipse-ee4j/jsonp -[14]: https://projects.eclipse.org/license/epl-2.0 -[15]: https://projects.eclipse.org/license/secondary-gpl-2.0-cp -[16]: https://junit.org/junit5/ -[17]: https://www.eclipse.org/legal/epl-v20.html -[18]: http://hamcrest.org/JavaHamcrest/ -[19]: http://opensource.org/licenses/BSD-3-Clause -[20]: https://www.jqno.nl/equalsverifier -[21]: https://www.apache.org/licenses/LICENSE-2.0.txt -[22]: https://github.com/stefanbirkner/system-lambda/ -[23]: http://opensource.org/licenses/MIT -[24]: http://www.slf4j.org -[25]: http://www.opensource.org/licenses/mit-license.php -[26]: https://github.com/eclipse-ee4j/parsson -[27]: http://sonarsource.github.io/sonar-scanner-maven/ -[28]: http://www.gnu.org/licenses/lgpl.txt -[29]: https://maven.apache.org/plugins/maven-toolchains-plugin/ -[30]: https://maven.apache.org/plugins/maven-compiler-plugin/ -[31]: https://maven.apache.org/enforcer/maven-enforcer-plugin/ -[32]: https://www.mojohaus.org/flatten-maven-plugin/ -[33]: https://sonatype.github.io/ossindex-maven/maven-plugin/ -[34]: http://www.apache.org/licenses/LICENSE-2.0.txt -[35]: https://maven.apache.org/surefire/maven-surefire-plugin/ -[36]: https://www.mojohaus.org/versions/versions-maven-plugin/ -[37]: https://github.com/exasol/project-keeper/ -[38]: https://github.com/exasol/project-keeper/blob/main/LICENSE -[39]: https://basepom.github.io/duplicate-finder-maven-plugin -[40]: http://www.apache.org/licenses/LICENSE-2.0.html -[41]: https://maven.apache.org/plugins/maven-deploy-plugin/ -[42]: https://maven.apache.org/plugins/maven-gpg-plugin/ -[43]: https://maven.apache.org/plugins/maven-source-plugin/ -[44]: https://maven.apache.org/plugins/maven-javadoc-plugin/ -[45]: http://www.sonatype.com/public-parent/nexus-maven-plugins/nexus-staging/nexus-staging-maven-plugin/ -[46]: http://www.eclipse.org/legal/epl-v10.html -[47]: https://maven.apache.org/surefire/maven-failsafe-plugin/ -[48]: https://www.jacoco.org/jacoco/trunk/doc/maven.html -[49]: https://www.eclipse.org/legal/epl-2.0/ -[50]: https://github.com/exasol/error-code-crawler-maven-plugin/ -[51]: https://github.com/exasol/error-code-crawler-maven-plugin/blob/main/LICENSE -[52]: http://zlika.github.io/reproducible-build-maven-plugin +[9]: https://github.com/mwiede/jsch +[10]: https://github.com/mwiede/jsch/blob/master/LICENSE.txt +[11]: https://github.com/mwiede/jsch/blob/master/LICENSE.JZlib.txt +[12]: https://github.com/mwiede/jsch/blob/master/LICENSE.jBCrypt.txt +[13]: https://github.com/exasol/database-cleaner/ +[14]: https://github.com/exasol/database-cleaner/blob/main/LICENSE +[15]: https://github.com/eclipse-ee4j/jsonp +[16]: https://projects.eclipse.org/license/epl-2.0 +[17]: https://projects.eclipse.org/license/secondary-gpl-2.0-cp +[18]: https://junit.org/junit5/ +[19]: https://www.eclipse.org/legal/epl-v20.html +[20]: http://hamcrest.org/JavaHamcrest/ +[21]: http://opensource.org/licenses/BSD-3-Clause +[22]: https://www.jqno.nl/equalsverifier +[23]: https://www.apache.org/licenses/LICENSE-2.0.txt +[24]: https://github.com/stefanbirkner/system-lambda/ +[25]: http://opensource.org/licenses/MIT +[26]: http://www.slf4j.org +[27]: http://www.opensource.org/licenses/mit-license.php +[28]: https://github.com/eclipse-ee4j/parsson +[29]: http://sonarsource.github.io/sonar-scanner-maven/ +[30]: http://www.gnu.org/licenses/lgpl.txt +[31]: https://maven.apache.org/plugins/maven-toolchains-plugin/ +[32]: https://maven.apache.org/plugins/maven-compiler-plugin/ +[33]: https://maven.apache.org/enforcer/maven-enforcer-plugin/ +[34]: https://www.mojohaus.org/flatten-maven-plugin/ +[35]: https://sonatype.github.io/ossindex-maven/maven-plugin/ +[36]: http://www.apache.org/licenses/LICENSE-2.0.txt +[37]: https://maven.apache.org/surefire/maven-surefire-plugin/ +[38]: https://www.mojohaus.org/versions/versions-maven-plugin/ +[39]: https://github.com/exasol/project-keeper/ +[40]: https://github.com/exasol/project-keeper/blob/main/LICENSE +[41]: https://basepom.github.io/duplicate-finder-maven-plugin +[42]: http://www.apache.org/licenses/LICENSE-2.0.html +[43]: https://maven.apache.org/plugins/maven-deploy-plugin/ +[44]: https://maven.apache.org/plugins/maven-gpg-plugin/ +[45]: https://maven.apache.org/plugins/maven-source-plugin/ +[46]: https://maven.apache.org/plugins/maven-javadoc-plugin/ +[47]: http://www.sonatype.com/public-parent/nexus-maven-plugins/nexus-staging/nexus-staging-maven-plugin/ +[48]: http://www.eclipse.org/legal/epl-v10.html +[49]: https://maven.apache.org/surefire/maven-failsafe-plugin/ +[50]: https://www.jacoco.org/jacoco/trunk/doc/maven.html +[51]: https://www.eclipse.org/legal/epl-2.0/ +[52]: https://github.com/exasol/error-code-crawler-maven-plugin/ +[53]: https://github.com/exasol/error-code-crawler-maven-plugin/blob/main/LICENSE +[54]: http://zlika.github.io/reproducible-build-maven-plugin diff --git a/doc/changes/changes_2.1.3.md b/doc/changes/changes_2.1.3.md index 926e885..90bd35f 100644 --- a/doc/changes/changes_2.1.3.md +++ b/doc/changes/changes_2.1.3.md @@ -12,5 +12,11 @@ Code name: ### Compile Dependency Updates -* Updated `software.amazon.awssdk:cloudformation:2.25.26` to `2.25.29` -* Updated `software.amazon.awssdk:ec2:2.25.26` to `2.25.29` +* Added `com.github.mwiede:jsch:0.2.17` +* Removed `com.jcraft:jsch:0.1.55` +* Updated `software.amazon.awssdk:cloudformation:2.25.26` to `2.25.31` +* Updated `software.amazon.awssdk:ec2:2.25.26` to `2.25.31` + +### Test Dependency Updates + +* Updated `org.slf4j:slf4j-jdk14:2.0.12` to `2.0.13` diff --git a/pom.xml b/pom.xml index bb33d7c..8f604bc 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ https://github.com/exasol/exasol-test-setup-abstraction-java/ 5.10.2 - 2.25.29 + 2.25.31 @@ -54,9 +54,9 @@ ${awssdk.version} - com.jcraft + com.github.mwiede jsch - 0.1.55 + 0.2.17 com.exasol @@ -109,7 +109,7 @@ org.slf4j slf4j-jdk14 - 2.0.12 + 2.0.13 test diff --git a/src/test/resources/logging.properties b/src/test/resources/logging.properties index 8c97abe..02ad2f5 100644 --- a/src/test/resources/logging.properties +++ b/src/test/resources/logging.properties @@ -4,3 +4,4 @@ java.util.logging.ConsoleHandler.level=ALL java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter java.util.logging.SimpleFormatter.format=%1$tF %1$tT.%1$tL [%4$-7s] %5$s %n com.exasol.level=ALL +com.jcraft.jsch.level=ALL