From 2299a8e12ebb4063d4e1649f106c48655b2bc6a9 Mon Sep 17 00:00:00 2001 From: Christoph Pirkl Date: Mon, 29 Jul 2024 14:16:46 +0200 Subject: [PATCH 1/2] #166: Upgrade dependencies --- dependencies.md | 2 +- doc/changes/changelog.md | 1 + doc/changes/changes_8.1.2.md | 21 +++++++++++++++++++++ pk_generated_parent.pom | 2 +- pom.xml | 9 +++++---- 5 files changed, 29 insertions(+), 6 deletions(-) create mode 100644 doc/changes/changes_8.1.2.md diff --git a/dependencies.md b/dependencies.md index 3463993..d89116d 100644 --- a/dependencies.md +++ b/dependencies.md @@ -54,7 +54,7 @@ | [error-code-crawler-maven-plugin][47] | [MIT License][48] | | [Reproducible Build Maven Plugin][49] | [Apache 2.0][34] | | [Project Keeper Maven plugin][50] | [The MIT License][51] | -| [Apache Maven JAR Plugin][52] | [Apache License, Version 2.0][7] | +| [Apache Maven JAR Plugin][52] | [Apache-2.0][7] | [0]: https://github.com/exasol/virtual-schema-common-document/ [1]: https://github.com/exasol/virtual-schema-common-document/blob/main/LICENSE diff --git a/doc/changes/changelog.md b/doc/changes/changelog.md index 728cb04..938eb51 100644 --- a/doc/changes/changelog.md +++ b/doc/changes/changelog.md @@ -1,5 +1,6 @@ # Changes +* [8.1.2](changes_8.1.2.md) * [8.1.1](changes_8.1.1.md) * [8.1.0](changes_8.1.0.md) * [8.0.4](changes_8.0.4.md) diff --git a/doc/changes/changes_8.1.2.md b/doc/changes/changes_8.1.2.md new file mode 100644 index 0000000..bf98023 --- /dev/null +++ b/doc/changes/changes_8.1.2.md @@ -0,0 +1,21 @@ +# Virtual Schema for Document Data in Files 8.1.2, released 2024-07-29 + +Code name: Fix CVE-2024-25638 in `dnsjava:dnsjava:jar:3.4.0:compile` + +## Summary + +This release fixes vulnerability CVE-2024-25638 in `dnsjava:dnsjava:jar:3.4.0:compile`. + +## Security + +* #166: Fixed vulnerability CVE-2024-25638 in `dnsjava:dnsjava:jar:3.4.0:compile` + +## Dependency Updates + +### Compile Dependency Updates + +* Updated `com.exasol:parquet-io-java:2.0.9` to `2.0.10` + +### Plugin Dependency Updates + +* Updated `org.apache.maven.plugins:maven-jar-plugin:3.3.0` to `3.4.2` diff --git a/pk_generated_parent.pom b/pk_generated_parent.pom index 1bfa0c0..075ac8b 100644 --- a/pk_generated_parent.pom +++ b/pk_generated_parent.pom @@ -3,7 +3,7 @@ 4.0.0 com.exasol virtual-schema-common-document-files-generated-parent - 8.1.1 + 8.1.2 pom UTF-8 diff --git a/pom.xml b/pom.xml index 0e5cd07..835ffe1 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 virtual-schema-common-document-files - 8.1.1 + 8.1.2 Virtual Schema for document data in files Adapter for document data access from files. https://github.com/exasol/virtual-schema-common-document-files/ @@ -18,7 +18,7 @@ com.exasol parquet-io-java - 2.0.9 + 2.0.10 @@ -112,6 +112,7 @@ org.basepom.maven duplicate-finder-maven-plugin + 2.0.1 false @@ -134,7 +135,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.3.0 + 3.4.2 @@ -162,7 +163,7 @@ virtual-schema-common-document-files-generated-parent com.exasol - 8.1.1 + 8.1.2 pk_generated_parent.pom From 16ad4a77c5e11c038a267a8ed0020461e44edfb5 Mon Sep 17 00:00:00 2001 From: Christoph Pirkl Date: Mon, 29 Jul 2024 14:25:23 +0200 Subject: [PATCH 2/2] Fix deprecation warning --- .../parquet/ParquetTestWriterBuilder.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/test/java/com/exasol/adapter/document/documentfetcher/files/parquet/ParquetTestWriterBuilder.java b/src/test/java/com/exasol/adapter/document/documentfetcher/files/parquet/ParquetTestWriterBuilder.java index 47dd5f4..30d7602 100644 --- a/src/test/java/com/exasol/adapter/document/documentfetcher/files/parquet/ParquetTestWriterBuilder.java +++ b/src/test/java/com/exasol/adapter/document/documentfetcher/files/parquet/ParquetTestWriterBuilder.java @@ -4,10 +4,12 @@ import java.util.Collections; import org.apache.hadoop.conf.Configuration; +import org.apache.parquet.conf.ParquetConfiguration; import org.apache.parquet.example.data.Group; import org.apache.parquet.example.data.GroupWriter; import org.apache.parquet.hadoop.ParquetWriter; import org.apache.parquet.hadoop.api.WriteSupport; +import org.apache.parquet.hadoop.util.ConfigurationUtil; import org.apache.parquet.io.api.RecordConsumer; import org.apache.parquet.schema.MessageType; @@ -24,11 +26,19 @@ protected ParquetTestWriterBuilder self() { return this; } + // ParquetWriter.Builder#getWriteSupport(Configuration) is deprecated and replaced with + // getWriteSupport(ParquetConfiguration). + @SuppressWarnings("deprecation") @Override protected WriteSupport getWriteSupport(final Configuration conf) { return new MyGroupWriteSupport(this.schema); } + @Override + protected WriteSupport getWriteSupport(final ParquetConfiguration conf) { + return getWriteSupport(ConfigurationUtil.createHadoopConfiguration(conf)); + } + private static class MyGroupWriteSupport extends WriteSupport { private final MessageType schema; private GroupWriter writer; @@ -37,11 +47,19 @@ private MyGroupWriteSupport(final MessageType schema) { this.schema = schema; } + // WriteSupport#init(Configuration) is deprecated and replaced with + // init(ParquetConfiguration). + @SuppressWarnings("deprecation") @Override public WriteContext init(final Configuration configuration) { return new WriteContext(this.schema, Collections.emptyMap()); } + @Override + public WriteContext init(final ParquetConfiguration configuration) { + return init(ConfigurationUtil.createHadoopConfiguration(configuration)); + } + @Override public void prepareForWrite(final RecordConsumer recordConsumer) { this.writer = new GroupWriter(recordConsumer, this.schema);