diff --git a/.gitattributes b/.gitattributes index 122d58f0..1a1837b6 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,3 +2,9 @@ # Auto detect text files and perform LF normalization * text=auto + +.github/workflows/broken_links_checker.yml linguist-generated=true +.github/workflows/dependencies_check.yml linguist-generated=true +dependencies.md linguist-generated=true +pk_generated_parent.pom linguist-generated=true +doc/changes/changelog.md linguist-generated=true diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 3ec6c523..bab826b3 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -13,7 +13,7 @@ jobs: strategy: fail-fast: false matrix: - exasol-docker-version: [ 7.1.10 ] + exasol-docker-version: [ 7.1.14 ] mvn: [ { diff --git a/.project-keeper.yml b/.project-keeper.yml index 134f71a9..da3f21ae 100644 --- a/.project-keeper.yml +++ b/.project-keeper.yml @@ -13,7 +13,6 @@ excludes: - "E-PK-CORE-18: Outdated content: '.github/workflows/release_droid_upload_github_release_assets.yml'" - "E-PK-CORE-18: Outdated content: '.github/workflows/release_droid_release_on_maven_central.yml'" linkReplacements: - - LICENSE-exasol-jdbc.txt|https://docs.exasol.com/connect_exasol/drivers/jdbc.htm - https://netty.io/netty-all/|https://netty.io/index.html - http://nexus.sonatype.org/oss-repository-hosting.html/scalatest-maven-plugin|https://www.scalatest.org/user_guide/using_the_scalatest_maven_plugin - jquery.org/license|https://github.com/jquery/jquery/blob/main/LICENSE.txt diff --git a/dependencies.md b/dependencies.md index 8d3a1182..3e005bdf 100644 --- a/dependencies.md +++ b/dependencies.md @@ -31,21 +31,19 @@ | [Apache Log4j 1.x Compatibility API][33] | [Apache License, Version 2.0][27] | | [Apache Log4j Core][34] | [Apache License, Version 2.0][27] | | [Test Database Builder for Java][35] | [MIT License][36] | -| [Matcher for SQL Result Sets][37] | [MIT][5] | -| [Test containers for Exasol on Docker][38] | [MIT][5] | +| [Matcher for SQL Result Sets][37] | [MIT License][38] | +| [Test containers for Exasol on Docker][39] | [MIT License][40] | ## Plugin Dependencies | Dependency | License | | ------------------------------------------------------- | ---------------------------------------------- | -| [SonarQube Scanner for Maven][39] | [GNU LGPL 3][40] | -| [scala-maven-plugin][41] | [Public domain (Unlicense)][42] | -| [Apache Maven Compiler Plugin][43] | [Apache License, Version 2.0][27] | -| [ScalaTest Maven Plugin][44] | [the Apache License, ASL Version 2.0][29] | -| [Apache Maven Enforcer Plugin][45] | [Apache License, Version 2.0][27] | -| [Maven Flatten Plugin][46] | [Apache Software Licenese][10] | -| [org.sonatype.ossindex.maven:ossindex-maven-plugin][47] | [ASL2][10] | -| [Reproducible Build Maven Plugin][48] | [Apache 2.0][10] | +| [SonarQube Scanner for Maven][41] | [GNU LGPL 3][42] | +| [scala-maven-plugin][43] | [Public domain (Unlicense)][44] | +| [Apache Maven Compiler Plugin][45] | [Apache License, Version 2.0][27] | +| [Apache Maven Enforcer Plugin][46] | [Apache License, Version 2.0][27] | +| [Maven Flatten Plugin][47] | [Apache Software Licenese][10] | +| [org.sonatype.ossindex.maven:ossindex-maven-plugin][48] | [ASL2][10] | | [Maven Surefire Plugin][49] | [Apache License, Version 2.0][27] | | [Versions Maven Plugin][50] | [Apache License, Version 2.0][27] | | [Apache Maven Deploy Plugin][51] | [Apache License, Version 2.0][27] | @@ -53,21 +51,23 @@ | [Apache Maven Source Plugin][53] | [Apache License, Version 2.0][27] | | [Apache Maven Javadoc Plugin][54] | [Apache License, Version 2.0][27] | | [Nexus Staging Maven Plugin][55] | [Eclipse Public License][56] | -| [Apache Maven JAR Plugin][57] | [Apache License, Version 2.0][27] | -| [Apache Maven Shade Plugin][58] | [Apache License, Version 2.0][27] | -| [Maven Failsafe Plugin][59] | [Apache License, Version 2.0][27] | -| [Project keeper maven plugin][60] | [The MIT License][61] | -| [JaCoCo :: Maven Plugin][62] | [Eclipse Public License 2.0][63] | -| [error-code-crawler-maven-plugin][64] | [MIT][5] | -| [Artifact reference checker and unifier][65] | [MIT][5] | -| [OpenFastTrace Maven Plugin][66] | [GNU General Public License v3.0][67] | -| [Scalastyle Maven Plugin][68] | [Apache 2.0][8] | -| [spotless-maven-plugin][69] | [The Apache Software License, Version 2.0][27] | -| [scalafix-maven-plugin][70] | [BSD-3-Clause][71] | -| [Apache Maven Clean Plugin][72] | [Apache License, Version 2.0][27] | -| [Apache Maven Resources Plugin][73] | [Apache License, Version 2.0][27] | -| [Apache Maven Install Plugin][74] | [Apache License, Version 2.0][10] | -| [Apache Maven Site Plugin][75] | [Apache License, Version 2.0][27] | +| [ScalaTest Maven Plugin][57] | [the Apache License, ASL Version 2.0][29] | +| [Apache Maven JAR Plugin][58] | [Apache License, Version 2.0][27] | +| [Apache Maven Shade Plugin][59] | [Apache License, Version 2.0][27] | +| [Maven Failsafe Plugin][60] | [Apache License, Version 2.0][27] | +| [Project keeper maven plugin][61] | [The MIT License][62] | +| [JaCoCo :: Maven Plugin][63] | [Eclipse Public License 2.0][64] | +| [error-code-crawler-maven-plugin][65] | [MIT License][66] | +| [Reproducible Build Maven Plugin][67] | [Apache 2.0][10] | +| [Artifact reference checker and unifier][68] | [MIT][5] | +| [OpenFastTrace Maven Plugin][69] | [GNU General Public License v3.0][70] | +| [Scalastyle Maven Plugin][71] | [Apache 2.0][8] | +| [spotless-maven-plugin][72] | [The Apache Software License, Version 2.0][27] | +| [scalafix-maven-plugin][73] | [BSD-3-Clause][74] | +| [Maven Clean Plugin][75] | [The Apache Software License, Version 2.0][10] | +| [Maven Resources Plugin][76] | [The Apache Software License, Version 2.0][10] | +| [Maven Install Plugin][77] | [The Apache Software License, Version 2.0][10] | +| [Maven Site Plugin 3][78] | [The Apache Software License, Version 2.0][10] | [0]: https://www.scala-lang.org/ [1]: https://www.apache.org/licenses/LICENSE-2.0 @@ -106,18 +106,18 @@ [34]: https://logging.apache.org/log4j/2.x/log4j-core/ [35]: https://github.com/exasol/test-db-builder-java/ [36]: https://github.com/exasol/test-db-builder-java/blob/main/LICENSE -[37]: https://github.com/exasol/hamcrest-resultset-matcher -[38]: https://github.com/exasol/exasol-testcontainers -[39]: http://sonarsource.github.io/sonar-scanner-maven/ -[40]: http://www.gnu.org/licenses/lgpl.txt -[41]: http://github.com/davidB/scala-maven-plugin -[42]: http://unlicense.org/ -[43]: https://maven.apache.org/plugins/maven-compiler-plugin/ -[44]: https://www.scalatest.org/user_guide/using_the_scalatest_maven_plugin -[45]: https://maven.apache.org/enforcer/maven-enforcer-plugin/ -[46]: https://www.mojohaus.org/flatten-maven-plugin/ -[47]: https://sonatype.github.io/ossindex-maven/maven-plugin/ -[48]: http://zlika.github.io/reproducible-build-maven-plugin +[37]: https://github.com/exasol/hamcrest-resultset-matcher/ +[38]: https://github.com/exasol/hamcrest-resultset-matcher/blob/main/LICENSE +[39]: https://github.com/exasol/exasol-testcontainers/ +[40]: https://github.com/exasol/exasol-testcontainers/blob/main/LICENSE +[41]: http://sonarsource.github.io/sonar-scanner-maven/ +[42]: http://www.gnu.org/licenses/lgpl.txt +[43]: http://github.com/davidB/scala-maven-plugin +[44]: http://unlicense.org/ +[45]: https://maven.apache.org/plugins/maven-compiler-plugin/ +[46]: https://maven.apache.org/enforcer/maven-enforcer-plugin/ +[47]: https://www.mojohaus.org/flatten-maven-plugin/ +[48]: https://sonatype.github.io/ossindex-maven/maven-plugin/ [49]: https://maven.apache.org/surefire/maven-surefire-plugin/ [50]: http://www.mojohaus.org/versions-maven-plugin/ [51]: https://maven.apache.org/plugins/maven-deploy-plugin/ @@ -126,22 +126,25 @@ [54]: https://maven.apache.org/plugins/maven-javadoc-plugin/ [55]: http://www.sonatype.com/public-parent/nexus-maven-plugins/nexus-staging/nexus-staging-maven-plugin/ [56]: http://www.eclipse.org/legal/epl-v10.html -[57]: https://maven.apache.org/plugins/maven-jar-plugin/ -[58]: https://maven.apache.org/plugins/maven-shade-plugin/ -[59]: https://maven.apache.org/surefire/maven-failsafe-plugin/ -[60]: https://github.com/exasol/project-keeper/ -[61]: https://github.com/exasol/project-keeper/blob/main/LICENSE -[62]: https://www.jacoco.org/jacoco/trunk/doc/maven.html -[63]: https://www.eclipse.org/legal/epl-2.0/ -[64]: https://github.com/exasol/error-code-crawler-maven-plugin -[65]: https://github.com/exasol/artifact-reference-checker-maven-plugin -[66]: https://github.com/itsallcode/openfasttrace-maven-plugin -[67]: https://www.gnu.org/licenses/gpl-3.0.html -[68]: http://www.scalastyle.org -[69]: https://github.com/diffplug/spotless -[70]: https://github.com/evis/scalafix-maven-plugin -[71]: https://opensource.org/licenses/BSD-3-Clause -[72]: https://maven.apache.org/plugins/maven-clean-plugin/ -[73]: https://maven.apache.org/plugins/maven-resources-plugin/ -[74]: http://maven.apache.org/plugins/maven-install-plugin/ -[75]: https://maven.apache.org/plugins/maven-site-plugin/ +[57]: https://www.scalatest.org/user_guide/using_the_scalatest_maven_plugin +[58]: https://maven.apache.org/plugins/maven-jar-plugin/ +[59]: https://maven.apache.org/plugins/maven-shade-plugin/ +[60]: https://maven.apache.org/surefire/maven-failsafe-plugin/ +[61]: https://github.com/exasol/project-keeper/ +[62]: https://github.com/exasol/project-keeper/blob/main/LICENSE +[63]: https://www.jacoco.org/jacoco/trunk/doc/maven.html +[64]: https://www.eclipse.org/legal/epl-2.0/ +[65]: https://github.com/exasol/error-code-crawler-maven-plugin/ +[66]: https://github.com/exasol/error-code-crawler-maven-plugin/blob/main/LICENSE +[67]: http://zlika.github.io/reproducible-build-maven-plugin +[68]: https://github.com/exasol/artifact-reference-checker-maven-plugin +[69]: https://github.com/itsallcode/openfasttrace-maven-plugin +[70]: https://www.gnu.org/licenses/gpl-3.0.html +[71]: http://www.scalastyle.org +[72]: https://github.com/diffplug/spotless +[73]: https://github.com/evis/scalafix-maven-plugin +[74]: https://opensource.org/licenses/BSD-3-Clause +[75]: http://maven.apache.org/plugins/maven-clean-plugin/ +[76]: http://maven.apache.org/plugins/maven-resources-plugin/ +[77]: http://maven.apache.org/plugins/maven-install-plugin/ +[78]: http://maven.apache.org/plugins/maven-site-plugin/ diff --git a/doc/changes/changelog.md b/doc/changes/changelog.md index 37ddad94..528a707c 100644 --- a/doc/changes/changelog.md +++ b/doc/changes/changelog.md @@ -1,5 +1,6 @@ # Changes +* [1.2.2](changes_1.2.2.md) * [1.2.1](changes_1.2.1.md) * [1.2.0](changes_1.2.0.md) * [1.1.0](changes_1.1.0.md) diff --git a/doc/changes/changes_1.2.2.md b/doc/changes/changes_1.2.2.md new file mode 100644 index 00000000..26b92bed --- /dev/null +++ b/doc/changes/changes_1.2.2.md @@ -0,0 +1,35 @@ +# The Spark Exasol Connector 1.2.2, released 2022-09-27 + +Code name: Fix vulnerabilities in dependencies + +## Summary + +This release fixes [sonatype-2022-5401](https://ossindex.sonatype.org/vulnerability/sonatype-2022-5401) in reload4j. + +## Features + +* #121: Fixed vulnerabilities in dependencies + +## Dependency Updates + +### Test Dependency Updates + +* Updated `com.exasol:exasol-testcontainers:6.1.2` to `6.2.0` +* Updated `com.exasol:hamcrest-resultset-matcher:1.5.1` to `1.5.2` +* Updated `com.exasol:test-db-builder-java:3.3.3` to `3.3.4` +* Updated `org.apache.logging.log4j:log4j-1.2-api:2.18.0` to `2.19.0` +* Updated `org.apache.logging.log4j:log4j-core:2.18.0` to `2.19.0` +* Updated `org.mockito:mockito-core:4.6.1` to `4.8.0` + +### Plugin Dependency Updates + +* Updated `com.diffplug.spotless:spotless-maven-plugin:2.22.4` to `2.22.8` +* Updated `com.exasol:error-code-crawler-maven-plugin:1.1.1` to `1.1.2` +* Updated `com.exasol:project-keeper-maven-plugin:2.5.0` to `2.8.0` +* Updated `net.alchim31.maven:scala-maven-plugin:4.6.1` to `4.6.3` +* Updated `org.apache.maven.plugins:maven-clean-plugin:3.2.0` to `2.5` +* Updated `org.apache.maven.plugins:maven-enforcer-plugin:3.0.0` to `3.1.0` +* Updated `org.apache.maven.plugins:maven-install-plugin:2.5.2` to `2.4` +* Updated `org.apache.maven.plugins:maven-jar-plugin:3.2.2` to `3.3.0` +* Updated `org.apache.maven.plugins:maven-resources-plugin:3.2.0` to `2.6` +* Updated `org.apache.maven.plugins:maven-site-plugin:3.12.0` to `3.3` diff --git a/pk_generated_parent.pom b/pk_generated_parent.pom index 7bff4ee3..9fb5b61f 100644 --- a/pk_generated_parent.pom +++ b/pk_generated_parent.pom @@ -3,7 +3,7 @@ 4.0.0 com.exasol spark-connector-generated-parent - 1.2.1 + 1.2.2 pom UTF-8 @@ -52,7 +52,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.0.0 + 3.1.0 enforce-maven @@ -108,20 +108,6 @@ - - io.github.zlika - reproducible-build-maven-plugin - 0.15 - - - strip-jar - package - - strip-jar - - - - org.apache.maven.plugins maven-surefire-plugin @@ -296,7 +282,7 @@ com.exasol error-code-crawler-maven-plugin - 1.1.1 + 1.1.2 verify @@ -306,6 +292,20 @@ + + io.github.zlika + reproducible-build-maven-plugin + 0.15 + + + strip-jar + package + + strip-jar + + + + diff --git a/pom.xml b/pom.xml index b65d8926..1a245bd1 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.exasol spark-connector - 1.2.1 + 1.2.2 The Spark Exasol Connector A connector for Apache Spark to access Exasol https://github.com/exasol/spark-connector/ @@ -185,7 +185,7 @@ io.netty netty-all - 4.1.79.Final + 4.1.82.Final provided @@ -232,7 +232,7 @@ org.apache.hadoop hadoop-client - 3.3.3 + 3.3.4 provided @@ -291,37 +291,37 @@ org.mockito mockito-core - 4.6.1 + 4.8.0 test org.apache.logging.log4j log4j-1.2-api - 2.18.0 + 2.19.0 test org.apache.logging.log4j log4j-core - 2.18.0 + 2.19.0 test com.exasol test-db-builder-java - 3.3.3 + 3.3.4 test com.exasol hamcrest-resultset-matcher - 1.5.1 + 1.5.2 test com.exasol exasol-testcontainers - 6.1.2 + 6.2.0 test @@ -330,7 +330,7 @@ net.alchim31.maven scala-maven-plugin - 4.6.1 + 4.6.3 scala-compile-first @@ -447,110 +447,10 @@ - - org.apache.maven.plugins - maven-enforcer-plugin - 3.0.0 - - - enforce-maven - - enforce - - - - - 3.6.3 - - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - 3.0.0-M1 - - true - - - - org.apache.maven.plugins - maven-gpg-plugin - 3.0.1 - - - sign-artifacts - verify - - sign - - - - --pinentry-mode - loopback - - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.13 - - true - ossrh - https://oss.sonatype.org/ - - - - default-deploy - deploy - - deploy - - - - - - org.apache.maven.plugins - maven-source-plugin - 3.2.1 - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.4.0 - - - attach-javadocs - - jar - - - - - UTF-8 - - true - true - true - ${project.basedir}/src/main/java - - org.apache.maven.plugins maven-jar-plugin + 3.3.0 default-jar @@ -601,35 +501,9 @@ false - - org.codehaus.mojo - versions-maven-plugin - 2.10.0 - - - package - - display-plugin-updates - display-dependency-updates - - - - - file:///${project.basedir}/versionsMavenPluginRules.xml - - org.sonatype.ossindex.maven ossindex-maven-plugin - 3.2.0 - - - package - - audit - - - @@ -650,6 +524,7 @@ sonatype-2021-4682 sonatype-2022-1694 + CVE-2022-25168 @@ -664,24 +539,10 @@ - - io.github.zlika - reproducible-build-maven-plugin - 0.15 - - - strip-jar - package - - strip-jar - - - - com.exasol project-keeper-maven-plugin - 2.5.0 + 2.8.0 @@ -737,18 +598,6 @@ - - com.exasol - error-code-crawler-maven-plugin - 1.1.1 - - - - verify - - - - com.exasol artifact-reference-checker-maven-plugin @@ -805,7 +654,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.22.4 + 2.22.8 @@ -834,7 +683,7 @@ com.github.vovapolu scaluzzi_${scala.compat.version} - 0.1.21 + 0.1.23 @@ -842,30 +691,6 @@ - - - - maven-clean-plugin - 3.2.0 - - - maven-install-plugin - 2.5.2 - - - maven-jar-plugin - 3.2.2 - - - maven-resources-plugin - 3.2.0 - - - maven-site-plugin - 3.12.0 - - - @@ -917,7 +742,7 @@ spark-connector-generated-parent com.exasol - 1.2.1 + 1.2.2 pk_generated_parent.pom diff --git a/release_config.yml b/release_config.yml index fd703f92..473c2193 100644 --- a/release_config.yml +++ b/release_config.yml @@ -1,4 +1,4 @@ release-platforms: - GitHub - Maven - - Jira +language: Java diff --git a/src/test/scala/com/exasol/spark/SparkSessionSetup.scala b/src/test/scala/com/exasol/spark/SparkSessionSetup.scala index ff8941f9..40394564 100644 --- a/src/test/scala/com/exasol/spark/SparkSessionSetup.scala +++ b/src/test/scala/com/exasol/spark/SparkSessionSetup.scala @@ -10,7 +10,7 @@ import org.scalatest.BeforeAndAfterAll import org.scalatest.Suite /** - * A trait that provides Spark session setup accross tests. + * A trait that provides Spark session setup across tests. */ trait SparkSessionSetup extends BeforeAndAfterAll { self: Suite => @transient lazy val spark: SparkSession = SparkSessionProvider.getSparkSession() diff --git a/src/test/scala/com/exasol/spark/it/BaseIntegrationTest.scala b/src/test/scala/com/exasol/spark/it/BaseIntegrationTest.scala index 24fd4361..fcbddf73 100644 --- a/src/test/scala/com/exasol/spark/it/BaseIntegrationTest.scala +++ b/src/test/scala/com/exasol/spark/it/BaseIntegrationTest.scala @@ -12,7 +12,7 @@ import org.scalatest.funsuite.AnyFunSuite */ trait BaseIntegrationTest extends AnyFunSuite with BeforeAndAfterAll { - private[this] val DEFAULT_EXASOL_DOCKER_IMAGE = "7.1.10" + private[this] val DEFAULT_EXASOL_DOCKER_IMAGE = "7.1.14" val network = DockerNamedNetwork("spark-it-network", true) val container = {