Skip to content

Commit

Permalink
#166: Upgrade dependencies (#168)
Browse files Browse the repository at this point in the history
* #166: Upgrade dependencies

* Fix deprecation warning
  • Loading branch information
kaklakariada authored Jul 29, 2024
1 parent 856c3b5 commit 4431def
Show file tree
Hide file tree
Showing 6 changed files with 47 additions and 6 deletions.
2 changes: 1 addition & 1 deletion dependencies.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions doc/changes/changelog.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions doc/changes/changes_8.1.2.md
Original file line number Diff line number Diff line change
@@ -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`
2 changes: 1 addition & 1 deletion pk_generated_parent.pom

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>virtual-schema-common-document-files</artifactId>
<version>8.1.1</version>
<version>8.1.2</version>
<name>Virtual Schema for document data in files</name>
<description>Adapter for document data access from files.</description>
<url>https://github.com/exasol/virtual-schema-common-document-files/</url>
Expand All @@ -18,7 +18,7 @@
<dependency>
<groupId>com.exasol</groupId>
<artifactId>parquet-io-java</artifactId>
<version>2.0.9</version>
<version>2.0.10</version>
</dependency>
<dependency>
<!-- https://mvnrepository.com/artifact/de.siegmar/fastcsv -->
Expand Down Expand Up @@ -112,6 +112,7 @@
<plugin>
<groupId>org.basepom.maven</groupId>
<artifactId>duplicate-finder-maven-plugin</artifactId>
<version>2.0.1</version>
<configuration>
<!-- org.apache.parquet:parquet-column and org.apache.parquet:parquet-hadoop both contain classes shaded.parquet.it.unimi.dsi.fastutil.** -->
<failBuildInCaseOfEqualContentConflict>false</failBuildInCaseOfEqualContentConflict>
Expand All @@ -134,7 +135,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.3.0</version>
<version>3.4.2</version>
<executions>
<execution>
<goals>
Expand Down Expand Up @@ -162,7 +163,7 @@
<parent>
<artifactId>virtual-schema-common-document-files-generated-parent</artifactId>
<groupId>com.exasol</groupId>
<version>8.1.1</version>
<version>8.1.2</version>
<relativePath>pk_generated_parent.pom</relativePath>
</parent>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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<Group> getWriteSupport(final Configuration conf) {
return new MyGroupWriteSupport(this.schema);
}

@Override
protected WriteSupport<Group> getWriteSupport(final ParquetConfiguration conf) {
return getWriteSupport(ConfigurationUtil.createHadoopConfiguration(conf));
}

private static class MyGroupWriteSupport extends WriteSupport<Group> {
private final MessageType schema;
private GroupWriter writer;
Expand All @@ -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);
Expand Down

0 comments on commit 4431def

Please sign in to comment.