Skip to content

Commit a33df4f

Browse files
Bump postgresql from 42.3.2 to 42.3.3 (#92)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sebastian Bär <[email protected]>
1 parent 795759a commit a33df4f

File tree

8 files changed

+112
-61
lines changed

8 files changed

+112
-61
lines changed

dependencies.md

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
| [JUnit Jupiter Engine][20] | [Eclipse Public License v2.0][21] |
2424
| [JUnit Jupiter Params][20] | [Eclipse Public License v2.0][21] |
2525
| [mockito-junit-jupiter][24] | [The MIT License][25] |
26-
| [EqualsVerifier][26] | [Apache License, Version 2.0][27] |
26+
| [EqualsVerifier | release normal jar][26] | [Apache License, Version 2.0][27] |
2727

2828
## Runtime Dependencies
2929

@@ -37,35 +37,34 @@
3737

3838
| Dependency | License |
3939
| ------------------------------------------------------- | ---------------------------------------------- |
40-
| [Maven Surefire Plugin][33] | [Apache License, Version 2.0][34] |
40+
| [Maven Surefire Plugin][33] | [Apache License, Version 2.0][27] |
4141
| [JaCoCo :: Maven Plugin][35] | [Eclipse Public License 2.0][36] |
42-
| [Apache Maven Compiler Plugin][37] | [Apache License, Version 2.0][34] |
43-
| [Maven Failsafe Plugin][39] | [Apache License, Version 2.0][34] |
44-
| [Apache Maven Source Plugin][41] | [Apache License, Version 2.0][34] |
45-
| [Apache Maven Javadoc Plugin][43] | [Apache License, Version 2.0][34] |
46-
| [Apache Maven GPG Plugin][45] | [Apache License, Version 2.0][46] |
42+
| [Apache Maven Compiler Plugin][37] | [Apache License, Version 2.0][27] |
43+
| [Maven Failsafe Plugin][39] | [Apache License, Version 2.0][27] |
44+
| [Apache Maven Source Plugin][41] | [Apache License, Version 2.0][27] |
45+
| [Apache Maven Javadoc Plugin][43] | [Apache License, Version 2.0][27] |
46+
| [Apache Maven GPG Plugin][45] | [Apache License, Version 2.0][27] |
4747
| [OpenFastTrace Maven Plugin][47] | [GNU General Public License v3.0][48] |
48-
| [org.sonatype.ossindex.maven:ossindex-maven-plugin][49] | [ASL2][46] |
49-
| [Versions Maven Plugin][51] | [Apache License, Version 2.0][34] |
50-
| [Apache Maven Enforcer Plugin][53] | [Apache License, Version 2.0][34] |
48+
| [org.sonatype.ossindex.maven:ossindex-maven-plugin][49] | [ASL2][50] |
49+
| [Versions Maven Plugin][51] | [Apache License, Version 2.0][27] |
50+
| [Apache Maven Enforcer Plugin][53] | [Apache License, Version 2.0][27] |
5151
| [Project keeper maven plugin][55] | [MIT][3] |
52-
| [Maven Deploy Plugin][57] | [The Apache Software License, Version 2.0][46] |
52+
| [Maven Deploy Plugin][57] | [The Apache Software License, Version 2.0][50] |
5353
| [Nexus Staging Maven Plugin][59] | [Eclipse Public License][60] |
5454
| [error-code-crawler-maven-plugin][61] | [MIT][3] |
55-
| [Reproducible Build Maven Plugin][63] | [Apache 2.0][46] |
56-
| [Maven Clean Plugin][65] | [The Apache Software License, Version 2.0][46] |
57-
| [Maven Resources Plugin][67] | [The Apache Software License, Version 2.0][46] |
58-
| [Maven JAR Plugin][69] | [The Apache Software License, Version 2.0][46] |
59-
| [Maven Install Plugin][71] | [The Apache Software License, Version 2.0][46] |
60-
| [Maven Site Plugin 3][73] | [The Apache Software License, Version 2.0][46] |
55+
| [Reproducible Build Maven Plugin][63] | [Apache 2.0][50] |
56+
| [Maven Clean Plugin][65] | [The Apache Software License, Version 2.0][50] |
57+
| [Maven Resources Plugin][67] | [The Apache Software License, Version 2.0][50] |
58+
| [Maven JAR Plugin][69] | [The Apache Software License, Version 2.0][50] |
59+
| [Maven Install Plugin][71] | [The Apache Software License, Version 2.0][50] |
60+
| [Maven Site Plugin 3][73] | [The Apache Software License, Version 2.0][50] |
6161

62-
[35]: https://www.eclemma.org/jacoco/index.html
6362
[55]: https://github.com/exasol/project-keeper-maven-plugin
6463
[0]: https://www.oracle.com/database/technologies/maven-central-guide.html
6564
[4]: https://github.com/exasol/error-reporting-java
6665
[2]: https://github.com/exasol/db-fundamentals-java
6766
[31]: https://jdbc.postgresql.org
68-
[46]: http://www.apache.org/licenses/LICENSE-2.0.txt
67+
[50]: http://www.apache.org/licenses/LICENSE-2.0.txt
6968
[33]: https://maven.apache.org/surefire/maven-surefire-plugin/
7069
[59]: http://www.sonatype.com/public-parent/nexus-maven-plugins/nexus-staging/nexus-staging-maven-plugin/
7170
[29]: https://www.exasol.com/support/secure/attachment/155343/EXASOL_SDK-7.0.11.tar.gz
@@ -79,27 +78,27 @@
7978
[19]: http://opensource.org/licenses/BSD-3-Clause
8079
[37]: https://maven.apache.org/plugins/maven-compiler-plugin/
8180
[9]: http://opensource.org/licenses/MIT
82-
[45]: http://maven.apache.org/plugins/maven-gpg-plugin/
83-
[27]: https:///www.apache.org/licenses/LICENSE-2.0.txt
8481
[47]: https://github.com/itsallcode/openfasttrace-maven-plugin
8582
[36]: https://www.eclipse.org/legal/epl-2.0/
8683
[60]: http://www.eclipse.org/legal/epl-v10.html
8784
[6]: https://github.com/exasol/exasol-testcontainers
85+
[35]: https://www.jacoco.org/jacoco/trunk/doc/maven.html
8886
[25]: https://github.com/mockito/mockito/blob/main/LICENSE
8987
[16]: https://github.com/exasol/hamcrest-resultset-matcher
9088
[63]: http://zlika.github.io/reproducible-build-maven-plugin
9189
[48]: https://www.gnu.org/licenses/gpl-3.0.html
9290
[69]: http://maven.apache.org/plugins/maven-jar-plugin/
93-
[34]: https://www.apache.org/licenses/LICENSE-2.0.txt
91+
[27]: https://www.apache.org/licenses/LICENSE-2.0.txt
92+
[26]: https://www.jqno.nl/equalsverifier
9493
[53]: https://maven.apache.org/enforcer/maven-enforcer-plugin/
9594
[30]: http://dev.mysql.com/doc/connector-j/en/
9695
[28]: http://www.exasol.com
9796
[21]: https://www.eclipse.org/legal/epl-v20.html
9897
[71]: http://maven.apache.org/plugins/maven-install-plugin/
9998
[20]: https://junit.org/junit5/
10099
[49]: https://sonatype.github.io/ossindex-maven/maven-plugin/
100+
[45]: https://maven.apache.org/plugins/maven-gpg-plugin/
101101
[8]: https://testcontainers.org
102-
[26]: https:///www.jqno.nl/equalsverifier
103102
[41]: https://maven.apache.org/plugins/maven-source-plugin/
104103
[18]: http://hamcrest.org/JavaHamcrest/
105104
[57]: http://maven.apache.org/plugins/maven-deploy-plugin/

doc/changes/changelog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Changes
22

3+
* [3.3.1](changes_3.3.1.md)
34
* [3.3.0](changes_3.3.0.md)
45
* [3.2.2](changes_3.2.2.md)
56
* [3.2.1](changes_3.2.1.md)

doc/changes/changes_3.3.1.md

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# Test Database Builder for Java 3.3.1, released 2022-02-18
2+
3+
Code name: Added Oracle support
4+
5+
## Summary
6+
7+
This release fixes [CVE-2022-21724](https://nvd.nist.gov/vuln/detail/CVE-2022-21724) in the PostgreSQL dependency. This CVE only affected users who used TDDB for PostgreSQL databases.
8+
9+
## Bugfixes
10+
11+
* #92: Fixed Dependabot finding by upgrading to PostgreSQL 42.3.3
12+
13+
## Dependency Updates
14+
15+
### Compile Dependency Updates
16+
17+
* Updated `com.oracle.database.jdbc:ojdbc11:21.4.0.0.1` to `21.5.0.0`
18+
19+
### Runtime Dependency Updates
20+
21+
* Updated `org.postgresql:postgresql:42.3.2` to `42.3.3`
22+
23+
### Test Dependency Updates
24+
25+
* Updated `nl.jqno.equalsverifier:equalsverifier:3.8.2` to `3.9`
26+
* Updated `org.mockito:mockito-junit-jupiter:4.2.0` to `4.3.1`
27+
* Updated `org.testcontainers:junit-jupiter:1.16.2` to `1.16.3`
28+
* Updated `org.testcontainers:mysql:1.16.2` to `1.16.3`
29+
* Updated `org.testcontainers:postgresql:1.16.2` to `1.16.3`
30+
31+
### Plugin Dependency Updates
32+
33+
* Updated `io.github.zlika:reproducible-build-maven-plugin:0.13` to `0.14`
34+
* Updated `org.apache.maven.plugins:maven-enforcer-plugin:3.0.0-M3` to `3.0.0`
35+
* Updated `org.apache.maven.plugins:maven-gpg-plugin:1.6` to `3.0.1`
36+
* Updated `org.itsallcode:openfasttrace-maven-plugin:1.0.0` to `1.2.0`
37+
* Updated `org.jacoco:jacoco-maven-plugin:0.8.6` to `0.8.7`

pom.xml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>com.exasol</groupId>
66
<artifactId>test-db-builder-java</artifactId>
7-
<version>3.3.0</version>
7+
<version>3.3.1</version>
88
<name>Test Database Builder for Java</name>
99
<description>pom.xml</description>
1010
<url>https://github.com/exasol/test-db-builder-java</url>
@@ -13,7 +13,7 @@
1313
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1414
<java.version>11</java.version>
1515
<junit.version>5.8.2</junit.version>
16-
<test.containers.version>1.16.2</test.containers.version>
16+
<test.containers.version>1.16.3</test.containers.version>
1717
<surefire.and.failsafe.plugin.version>3.0.0-M4</surefire.and.failsafe.plugin.version>
1818
<sonar.coverage.jacoco.xmlReportPaths>target/site/jacoco/jacoco.xml,target/site/jacoco-it/jacoco.xml
1919
</sonar.coverage.jacoco.xmlReportPaths>
@@ -81,13 +81,13 @@
8181
<dependency>
8282
<groupId>org.postgresql</groupId>
8383
<artifactId>postgresql</artifactId>
84-
<version>42.3.2</version>
84+
<version>42.3.3</version>
8585
<scope>runtime</scope>
8686
</dependency>
8787
<dependency>
8888
<groupId>com.oracle.database.jdbc</groupId>
8989
<artifactId>ojdbc11</artifactId>
90-
<version>21.4.0.0.1</version>
90+
<version>21.5.0.0</version>
9191
</dependency>
9292
<dependency>
9393
<groupId>com.exasol</groupId>
@@ -151,13 +151,13 @@
151151
<dependency>
152152
<groupId>org.mockito</groupId>
153153
<artifactId>mockito-junit-jupiter</artifactId>
154-
<version>4.2.0</version>
154+
<version>4.3.1</version>
155155
<scope>test</scope>
156156
</dependency>
157157
<dependency>
158158
<groupId>nl.jqno.equalsverifier</groupId>
159159
<artifactId>equalsverifier</artifactId>
160-
<version>3.8.2</version>
160+
<version>3.9</version>
161161
<scope>test</scope>
162162
</dependency>
163163
<dependency>
@@ -181,7 +181,7 @@
181181
<plugin>
182182
<groupId>org.jacoco</groupId>
183183
<artifactId>jacoco-maven-plugin</artifactId>
184-
<version>0.8.6</version>
184+
<version>0.8.7</version>
185185
<executions>
186186
<execution>
187187
<id>prepare-agent</id>
@@ -288,7 +288,7 @@
288288
<plugin>
289289
<groupId>org.apache.maven.plugins</groupId>
290290
<artifactId>maven-gpg-plugin</artifactId>
291-
<version>1.6</version>
291+
<version>3.0.1</version>
292292
<executions>
293293
<execution>
294294
<id>sign-artifacts</id>
@@ -308,7 +308,7 @@
308308
<plugin>
309309
<groupId>org.itsallcode</groupId>
310310
<artifactId>openfasttrace-maven-plugin</artifactId>
311-
<version>1.0.0</version>
311+
<version>1.2.0</version>
312312
<executions>
313313
<execution>
314314
<id>trace-requirements</id>
@@ -354,7 +354,7 @@
354354
<plugin>
355355
<groupId>org.apache.maven.plugins</groupId>
356356
<artifactId>maven-enforcer-plugin</artifactId>
357-
<version>3.0.0-M3</version>
357+
<version>3.0.0</version>
358358
<executions>
359359
<execution>
360360
<id>enforce-maven</id>
@@ -435,7 +435,7 @@
435435
<plugin>
436436
<groupId>io.github.zlika</groupId>
437437
<artifactId>reproducible-build-maven-plugin</artifactId>
438-
<version>0.13</version>
438+
<version>0.14</version>
439439
<executions>
440440
<execution>
441441
<id>strip-jar</id>

src/test/java/com/exasol/dbbuilder/dialects/TableTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ void testInsert() {
7979
.build() //
8080
.insert("Claudia", "2001-01-01") //
8181
.insert("Steven", "2002-02-02");
82+
@SuppressWarnings("unchecked")
8283
final ArgumentCaptor<Stream<List<Object>>> streamCapture = ArgumentCaptor.forClass(Stream.class);
8384
verify(this.writerMock, times(2)).write(eq(table), streamCapture.capture());
8485
assertThat(streamCapture.getAllValues().stream().flatMap(each -> each).collect(Collectors.toList()),
@@ -93,6 +94,7 @@ void testBulkInsert() {
9394
.column("BIRTHDAY", "DATE") //
9495
.build() //
9596
.bulkInsert(rows);
97+
@SuppressWarnings("unchecked")
9698
final ArgumentCaptor<Stream<List<Object>>> streamCapture = ArgumentCaptor.forClass(Stream.class);
9799
verify(this.writerMock, times(1)).write(eq(table), streamCapture.capture());
98100
assertThat(streamCapture.getAllValues().stream().flatMap(each -> each).collect(Collectors.toList()),
@@ -105,6 +107,7 @@ void testInsertThrowsExceptionOnValueCountMismatch() {
105107
.column("FOO", "DATE") //
106108
.build();
107109
table.insert("1", "2");
110+
@SuppressWarnings("unchecked")
108111
final ArgumentCaptor<Stream<List<Object>>> streamCapture = ArgumentCaptor.forClass(Stream.class);
109112
verify(this.writerMock).write(eq(table), streamCapture.capture());
110113
final Stream<List<Object>> stream = streamCapture.getValue();

src/test/java/com/exasol/dbbuilder/dialects/mysql/MySQLDatabaseObjectCreationAndDeletionIT.java

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,10 @@ private void assertStatementRendersToYes(final String columnName, final String s
6464
resultSet.next();
6565
assertThat(resultSet.getString(1), equalTo("Y"));
6666
} catch (final SQLException exception) {
67-
throw new AssertionError(ExaError.messageBuilder("E-TDBJ-23").message("Unable to determine existence of object: {{columnName}}", columnName).toString(), exception);
67+
throw new AssertionError(
68+
ExaError.messageBuilder("E-TDBJ-23")
69+
.message("Unable to determine existence of object: {{columnName}}", columnName).toString(),
70+
exception);
6871
}
6972
}
7073

@@ -101,8 +104,10 @@ private void assertUserHasTablePrivilege(final String username, final String obj
101104
assertAll(() -> assertThat(result.next(), equalTo(true)),
102105
() -> assertThat(result.getString(1), containsString(expectedPrivilege)));
103106
} catch (final SQLException exception) {
104-
throw new AssertionError(ExaError.messageBuilder("E-TDBJ-24").message("Unable to determine if user {{username}} has global privilege {{privilege}}.", username, expectedPrivilege).toString(),
105-
exception);
107+
throw new AssertionError(ExaError.messageBuilder("E-TDBJ-24")
108+
.message("Unable to determine if user {{username}} has global privilege {{privilege}}.", username,
109+
expectedPrivilege)
110+
.toString(), exception);
106111
}
107112
}
108113

@@ -116,7 +121,9 @@ void testInsertIntoTable() {
116121
.executeQuery("SELECT ID, NAME FROM " + table.getFullyQualifiedName() + "ORDER BY ID ASC");
117122
assertThat(result, table().row(1, "FOO").row(2, "BAR").matches());
118123
} catch (final SQLException exception) {
119-
throw new AssertionError(ExaError.messageBuilder("E-TDBJ-25").message("Unable to validate contents of table {{table}}", table.getFullyQualifiedName()).toString(), exception);
124+
throw new AssertionError(ExaError.messageBuilder("E-TDBJ-25")
125+
.message("Unable to validate contents of table {{table}}", table.getFullyQualifiedName())
126+
.toString(), exception);
120127
}
121128
}
122129

@@ -126,6 +133,7 @@ private ExistsInDatabaseMatcher(final Connection connection) {
126133
super(connection);
127134
}
128135

136+
@Override
129137
protected String getCheckCommand(final DatabaseObject object) {
130138
if (object instanceof User) {
131139
return "SELECT 1 FROM mysql.user WHERE user = ?";
@@ -134,7 +142,8 @@ protected String getCheckCommand(final DatabaseObject object) {
134142
} else if (object instanceof Schema) {
135143
return "SELECT 1 FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = ?";
136144
} else {
137-
throw new AssertionError(ExaError.messageBuilder("E-TDBJ-26").message("Assertion for {{object}} is not yet implemented.", object.getType()).toString());
145+
throw new AssertionError(ExaError.messageBuilder("E-TDBJ-26")
146+
.message("Assertion for {{object}} is not yet implemented.", object.getType()).toString());
138147
}
139148
}
140149
}

0 commit comments

Comments
 (0)