Skip to content

Commit a73489f

Browse files
authored
#60: Upgrade dependencies (#62)
* #60: Upgrade dependencies * Adapt to new base class * Upgrade azurite container * Downgrade exasol 7.1
1 parent 30a219a commit a73489f

10 files changed

Lines changed: 47 additions & 16 deletions

File tree

.github/workflows/ci-build.yml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.project-keeper.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ build:
1111
runnerOs: ubuntu-20.04
1212
freeDiskSpace: false
1313
exasolDbVersions:
14-
- "8.24.0"
15-
- "7.1.26"
14+
- "8.27.0" # 8.29.1 not yet supported by exasol-testcontainers, see https://github.com/exasol/exasol-testcontainers/issues/258
15+
- "7.1.26" # Upgrade to 7.1.29 once https://github.com/exasol/virtual-schema-common-document-files/issues/169 is fixed
1616
workflows:
1717
- name: ci-build.yml
1818
stepCustomizations:

doc/changes/changelog.md

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

doc/changes/changes_2.1.1.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# Virtual Schema for Document Data in Files on Azure Blob Storage 2.1.1, released 2024-07-30
2+
3+
Code name: Fix CVE-2024-25638 in `dnsjava:dnsjava:jar:3.4.0:compile`
4+
5+
## Summary
6+
7+
This release fixes vulnerability CVE-2024-25638 in `dnsjava:dnsjava:jar:3.4.0:compile`.
8+
9+
## Security
10+
11+
* #60: Fixed vulnerability CVE-2024-25638 in `dnsjava:dnsjava:jar:3.4.0:compile`
12+
13+
## Dependency Updates
14+
15+
### Compile Dependency Updates
16+
17+
* Updated `com.azure:azure-storage-blob:12.26.1` to `12.27.0`
18+
* Updated `com.exasol:virtual-schema-common-document-files:8.1.0` to `8.1.2`
19+
20+
### Test Dependency Updates
21+
22+
* Updated `com.exasol:virtual-schema-common-document-files:8.1.0` to `8.1.2`
23+
* Updated `org.junit.jupiter:junit-jupiter-params:5.10.2` to `5.10.3`
24+
* Updated `org.testcontainers:junit-jupiter:1.19.8` to `1.20.0`

doc/user_guide/user_guide.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Next create the Adapter Script:
1717
```sql
1818
CREATE OR REPLACE JAVA ADAPTER SCRIPT ADAPTER.AZURE_BLOB_STORAGE_FILES_ADAPTER AS
1919
%scriptclass com.exasol.adapter.RequestDispatcher;
20-
%jar /buckets/bfsdefault/default/document-files-virtual-schema-dist-8.1.0-azure-blob-storage-2.1.0.jar;
20+
%jar /buckets/bfsdefault/default/document-files-virtual-schema-dist-8.1.2-azure-blob-storage-2.1.1.jar;
2121
/
2222
```
2323

@@ -30,7 +30,7 @@ CREATE OR REPLACE JAVA SET SCRIPT ADAPTER.IMPORT_FROM_AZURE_BLOB_STORAGE_DOCUMEN
3030
CONNECTION_NAME VARCHAR(500))
3131
EMITS(...) AS
3232
%scriptclass com.exasol.adapter.document.UdfEntryPoint;
33-
%jar /buckets/bfsdefault/default/document-files-virtual-schema-dist-8.1.0-azure-blob-storage-2.1.0.jar;
33+
%jar /buckets/bfsdefault/default/document-files-virtual-schema-dist-8.1.2-azure-blob-storage-2.1.1.jar;
3434
/
3535
```
3636

pk_generated_parent.pom

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
<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">
33
<modelVersion>4.0.0</modelVersion>
44
<artifactId>azure-blob-storage-document-files-virtual-schema</artifactId>
5-
<version>2.1.0</version>
5+
<version>2.1.1</version>
66
<name>Virtual Schema for document data in files on Azure Blob Storage</name>
77
<description>Adapter for document data access from files from Azure Blob Storage.</description>
88
<url>https://github.com/exasol/azure-blob-storage-document-files-virtual-schema/</url>
99
<properties>
10-
<vs-common-document-files.version>8.1.0</vs-common-document-files.version>
10+
<vs-common-document-files.version>8.1.2</vs-common-document-files.version>
1111
</properties>
1212
<profiles>
1313
<profile>
@@ -40,7 +40,7 @@
4040
<dependency>
4141
<groupId>com.azure</groupId>
4242
<artifactId>azure-storage-blob</artifactId>
43-
<version>12.26.1</version>
43+
<version>12.27.0</version>
4444
</dependency>
4545
<!-- Test dependencies -->
4646
<dependency>
@@ -59,7 +59,7 @@
5959
<dependency>
6060
<groupId>org.junit.jupiter</groupId>
6161
<artifactId>junit-jupiter-params</artifactId>
62-
<version>5.10.2</version>
62+
<version>5.10.3</version>
6363
<scope>test</scope>
6464
</dependency>
6565
<dependency>
@@ -71,7 +71,7 @@
7171
<dependency>
7272
<groupId>org.testcontainers</groupId>
7373
<artifactId>junit-jupiter</artifactId>
74-
<version>1.19.8</version>
74+
<version>1.20.0</version>
7575
<scope>test</scope>
7676
</dependency>
7777
<dependency>
@@ -181,7 +181,7 @@
181181
<parent>
182182
<artifactId>azure-blob-storage-document-files-virtual-schema-generated-parent</artifactId>
183183
<groupId>com.exasol</groupId>
184-
<version>2.1.0</version>
184+
<version>2.1.1</version>
185185
<relativePath>pk_generated_parent.pom</relativePath>
186186
</parent>
187187
</project>

src/test/java/com/exasol/adapter/document/files/AbsDocumentFilesAdapterIT.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import org.testcontainers.junit.jupiter.Testcontainers;
1818

1919
import com.exasol.adapter.document.files.abstestsetup.*;
20+
import com.exasol.bucketfs.Bucket;
2021
import com.exasol.bucketfs.BucketAccessException;
2122
import com.exasol.dbbuilder.dialects.DatabaseObjectException;
2223
import com.exasol.dbbuilder.dialects.exasol.ConnectionDefinition;
@@ -51,7 +52,7 @@ private static AbsTestSetup getAbsTestSetup(final ExasolTestSetup exasolTestSetu
5152
}
5253

5354
@AfterAll
54-
static void afterAll() throws Exception {
55+
static void afterAll() {
5556
if (setup != null) {
5657
setup.close();
5758
}
@@ -69,6 +70,11 @@ void after() {
6970
setup.dropCreatedObjects();
7071
}
7172

73+
@Override
74+
protected Bucket getBucketFSDefaultBucket() {
75+
return setup.getBucket();
76+
}
77+
7278
@Override
7379
protected Statement getStatement() {
7480
return setup.getExasolStatement();

src/test/java/com/exasol/adapter/document/files/IntegrationTestSetup.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import jakarta.json.*;
2727

2828
public class IntegrationTestSetup implements AutoCloseable {
29-
private static final String ADAPTER_JAR = "document-files-virtual-schema-dist-8.1.0-azure-blob-storage-2.1.0.jar";
29+
private static final String ADAPTER_JAR = "document-files-virtual-schema-dist-8.1.2-azure-blob-storage-2.1.1.jar";
3030
private final ExasolTestSetup exasolTestSetup;
3131
private final Connection exasolConnection;
3232
private final Statement exasolStatement;

src/test/java/com/exasol/adapter/document/files/abstestsetup/LocalAbsTestSetup.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class LocalAbsTestSetup implements AbsTestSetup {
2121

2222
public LocalAbsTestSetup() {
2323
// https://mcr.microsoft.com/en-us/product/azure-storage/azurite/tags
24-
this.azuriteContainer = new GenericContainer<>("mcr.microsoft.com/azure-storage/azurite:3.30.0");
24+
this.azuriteContainer = new GenericContainer<>("mcr.microsoft.com/azure-storage/azurite:3.31.0");
2525
this.azuriteContainer.addExposedPort(PORT_IN_CONTAINER);
2626
this.azuriteContainer.start();
2727
createAzuriteBlobServiceClient();

0 commit comments

Comments
 (0)