Skip to content

Commit e5dce84

Browse files
dependabot[bot]Marcono1234
dependabot[bot]
and
Marcono1234
authored
Bump the maven group with 8 updates (#2784)
* Bump the maven group with 8 updates Bumps the maven group with 8 updates: | Package | From | To | | --- | --- | --- | | [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) | `3.11.1` | `3.11.2` | | [com.google.guava:guava-testlib](https://github.com/google/guava) | `33.3.1-jre` | `33.4.0-jre` | | [com.google.guava:guava](https://github.com/google/guava) | `33.3.1-jre` | `33.4.0-jre` | | [com.guardsquare:proguard-base](https://github.com/Guardsquare/proguard) | `7.6.0` | `7.6.1` | | [com.guardsquare:proguard-core](https://github.com/Guardsquare/proguard-core) | `9.1.6` | `9.1.7` | | [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit5) | `5.11.3` | `5.11.4` | | [org.graalvm.buildtools:native-maven-plugin](https://github.com/graalvm/native-build-tools) | `0.10.3` | `0.10.4` | | [com.google.protobuf:protobuf-java](https://github.com/protocolbuffers/protobuf) | `4.29.0` | `4.29.2` | Updates `org.apache.maven.plugins:maven-javadoc-plugin` from 3.11.1 to 3.11.2 - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](apache/maven-javadoc-plugin@maven-javadoc-plugin-3.11.1...maven-javadoc-plugin-3.11.2) Updates `com.google.guava:guava-testlib` from 33.3.1-jre to 33.4.0-jre - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) Updates `com.google.guava:guava` from 33.3.1-jre to 33.4.0-jre - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) Updates `com.guardsquare:proguard-base` from 7.6.0 to 7.6.1 - [Release notes](https://github.com/Guardsquare/proguard/releases) - [Commits](Guardsquare/proguard@v7.6...v7.6.1) Updates `com.guardsquare:proguard-core` from 9.1.6 to 9.1.7 - [Release notes](https://github.com/Guardsquare/proguard-core/releases) - [Commits](Guardsquare/proguard-core@v9.1.6...v9.1.7) Updates `org.junit.jupiter:junit-jupiter` from 5.11.3 to 5.11.4 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](junit-team/junit5@r5.11.3...r5.11.4) Updates `org.graalvm.buildtools:native-maven-plugin` from 0.10.3 to 0.10.4 - [Release notes](https://github.com/graalvm/native-build-tools/releases) - [Commits](graalvm/native-build-tools@0.10.3...0.10.4) Updates `com.google.protobuf:protobuf-java` from 4.29.0 to 4.29.2 - [Release notes](https://github.com/protocolbuffers/protobuf/releases) - [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/protobuf_release.bzl) - [Commits](https://github.com/protocolbuffers/protobuf/commits) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-patch dependency-group: maven - dependency-name: com.google.guava:guava-testlib dependency-type: direct:development update-type: version-update:semver-minor dependency-group: maven - dependency-name: com.google.guava:guava dependency-type: direct:development update-type: version-update:semver-minor dependency-group: maven - dependency-name: com.guardsquare:proguard-base dependency-type: direct:production update-type: version-update:semver-patch dependency-group: maven - dependency-name: com.guardsquare:proguard-core dependency-type: direct:production update-type: version-update:semver-patch dependency-group: maven - dependency-name: org.junit.jupiter:junit-jupiter dependency-type: direct:development update-type: version-update:semver-patch dependency-group: maven - dependency-name: org.graalvm.buildtools:native-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch dependency-group: maven - dependency-name: com.google.protobuf:protobuf-java dependency-type: direct:production update-type: version-update:semver-patch dependency-group: maven ... Signed-off-by: dependabot[bot] <[email protected]> * Fix collection tests for latest guava-testlib update (#2786) With the fix in the latest guava-testlib version null support is now properly checked. But it expects that if a collection does not permit null, then creating it with null should fail as well, see guava-testlib's: - MapCreationTester.testCreateWithNullValueUnsupported() - CollectionCreationTester.testCreateWithNull_unsupported() However, the previous implementation for the JsonArray and JsonObject test was using methods which implicitly converted null to JsonNull. --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Marcono1234 <[email protected]>
1 parent 84e5f16 commit e5dce84

File tree

8 files changed

+27
-22
lines changed

8 files changed

+27
-22
lines changed

‎gson/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,13 @@
6666
<dependency>
6767
<groupId>com.google.guava</groupId>
6868
<artifactId>guava-testlib</artifactId>
69-
<version>33.3.1-jre</version>
69+
<version>33.4.0-jre</version>
7070
<scope>test</scope>
7171
</dependency>
7272
<dependency>
7373
<groupId>com.google.guava</groupId>
7474
<artifactId>guava</artifactId>
75-
<version>33.3.1-jre</version>
75+
<version>33.4.0-jre</version>
7676
<scope>test</scope>
7777
</dependency>
7878
</dependencies>
@@ -236,12 +236,12 @@
236236
<dependency>
237237
<groupId>com.guardsquare</groupId>
238238
<artifactId>proguard-base</artifactId>
239-
<version>7.6.0</version>
239+
<version>7.6.1</version>
240240
</dependency>
241241
<dependency>
242242
<groupId>com.guardsquare</groupId>
243243
<artifactId>proguard-core</artifactId>
244-
<version>9.1.6</version>
244+
<version>9.1.7</version>
245245
</dependency>
246246
</dependencies>
247247
<configuration>

‎gson/src/test/java/com/google/gson/JsonArrayAsListSuiteTest.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,14 @@ public Iterable<JsonElement> order(List<JsonElement> insertionOrder) {
4242
@Override
4343
public List<JsonElement> create(Object... elements) {
4444
JsonArray array = new JsonArray();
45+
// This is not completely accurate: Because there is no way to directly construct JsonArray or
46+
// its List view with existing elements, this has to add the elements individually with
47+
// `List#add`
48+
var list = array.asList();
4549
for (Object element : elements) {
46-
array.add((JsonElement) element);
50+
list.add((JsonElement) element);
4751
}
48-
return array.asList();
52+
return list;
4953
}
5054
}
5155

@@ -54,8 +58,6 @@ public static Test suite() {
5458
return ListTestSuiteBuilder.using(new ListGenerator())
5559
.withFeatures(
5660
CollectionSize.ANY,
57-
// Note: There is current a Guava bug which causes 'null additions' to not be tested if
58-
// 'null queries' is enabled, see https://github.com/google/guava/issues/7401
5961
CollectionFeature.ALLOWS_NULL_QUERIES,
6062
CollectionFeature.RESTRICTS_ELEMENTS, // List only allows JsonElement
6163
CollectionFeature.SUPPORTS_ADD,

‎gson/src/test/java/com/google/gson/JsonObjectAsMapSuiteTest.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,15 @@ public SampleElements<Entry<String, JsonElement>> samples() {
3434
@Override
3535
public Map<String, JsonElement> create(Object... elements) {
3636
JsonObject object = new JsonObject();
37+
// This is not completely accurate: Because there is no way to directly construct JsonObject
38+
// or its Map view with existing entries, this has to add the entries individually with
39+
// `Map#put`
40+
var map = object.asMap();
3741
for (Object element : elements) {
3842
var entry = (Entry<?, ?>) element;
39-
object.add((String) entry.getKey(), (JsonElement) entry.getValue());
43+
map.put((String) entry.getKey(), (JsonElement) entry.getValue());
4044
}
41-
return object.asMap();
45+
return map;
4246
}
4347

4448
@SuppressWarnings("unchecked")
@@ -70,8 +74,6 @@ public static Test suite() {
7074
return MapTestSuiteBuilder.using(new MapGenerator())
7175
.withFeatures(
7276
CollectionSize.ANY,
73-
// Note: There is current a Guava bug which causes 'null additions' to not be tested if
74-
// 'null queries' is enabled, see https://github.com/google/guava/issues/7401
7577
MapFeature.ALLOWS_ANY_NULL_QUERIES,
7678
MapFeature.RESTRICTS_KEYS, // Map only allows String keys
7779
MapFeature.RESTRICTS_VALUES, // Map only allows JsonElement values

‎gson/src/test/java/com/google/gson/internal/LinkedTreeMapSuiteTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ public MapGenerator(boolean allowNullValues) {
3131

3232
@Override
3333
protected Map<String, String> create(Entry<String, String>[] entries) {
34+
// This is not completely accurate: Because LinkedTreeMap has no constructor which accepts
35+
// existing entries, this has to add the entries individually with `Map#put`
3436
var map = new LinkedTreeMap<String, String>(allowNullValues);
3537
for (var entry : entries) {
3638
map.put(entry.getKey(), entry.getValue());
@@ -47,8 +49,6 @@ private static Feature<?>[] createFeatures(Feature<?>... additionalFeatures) {
4749
new ArrayList<Feature<?>>(
4850
List.of(
4951
CollectionSize.ANY,
50-
// Note: There is current a Guava bug which causes 'null additions' to not be tested
51-
// if 'null queries' is enabled, see https://github.com/google/guava/issues/7401
5252
MapFeature.ALLOWS_ANY_NULL_QUERIES,
5353
MapFeature.RESTRICTS_KEYS, // Map only allows comparable keys
5454
MapFeature.SUPPORTS_PUT,
@@ -74,7 +74,8 @@ public static Test suite() {
7474
.named("nullValues=false")
7575
.createTestSuite();
7676

77-
TestSuite testSuite = new TestSuite("LinkedTreeMap");
77+
// Use qualified class name to make it easier to find this test class in the IDE
78+
TestSuite testSuite = new TestSuite(LinkedTreeMapSuiteTest.class.getName());
7879
testSuite.addTest(nullValuesSuite);
7980
testSuite.addTest(nonNullValuesSuite);
8081

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@
308308
<plugin>
309309
<groupId>org.apache.maven.plugins</groupId>
310310
<artifactId>maven-javadoc-plugin</artifactId>
311-
<version>3.11.1</version>
311+
<version>3.11.2</version>
312312
<configuration>
313313
<skip>${gson.isTestModule}</skip>
314314

‎proto/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<!-- This is duplicated here because that is recommended by `artifact:check-buildplan` -->
3232
<project.build.outputTimestamp>2024-05-19T18:54:10Z</project.build.outputTimestamp>
3333

34-
<protobufVersion>4.29.0</protobufVersion>
34+
<protobufVersion>4.29.2</protobufVersion>
3535

3636
<!-- Overwrite property from parent; this module is currently not deployed -->
3737
<gson.isInternalModule>true</gson.isInternalModule>
@@ -60,7 +60,7 @@
6060
<dependency>
6161
<groupId>com.google.guava</groupId>
6262
<artifactId>guava</artifactId>
63-
<version>33.3.1-jre</version>
63+
<version>33.4.0-jre</version>
6464
</dependency>
6565

6666
<dependency>

‎test-graal-native-image/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<dependency>
4949
<groupId>org.junit.jupiter</groupId>
5050
<artifactId>junit-jupiter</artifactId>
51-
<version>5.11.3</version>
51+
<version>5.11.4</version>
5252
<scope>test</scope>
5353
</dependency>
5454

@@ -118,7 +118,7 @@
118118
<plugin>
119119
<groupId>org.graalvm.buildtools</groupId>
120120
<artifactId>native-maven-plugin</artifactId>
121-
<version>0.10.3</version>
121+
<version>0.10.4</version>
122122
<extensions>true</extensions>
123123
<executions>
124124
<execution>

‎test-shrinker/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,12 @@
7979
<dependency>
8080
<groupId>com.guardsquare</groupId>
8181
<artifactId>proguard-base</artifactId>
82-
<version>7.6.0</version>
82+
<version>7.6.1</version>
8383
</dependency>
8484
<dependency>
8585
<groupId>com.guardsquare</groupId>
8686
<artifactId>proguard-core</artifactId>
87-
<version>9.1.6</version>
87+
<version>9.1.7</version>
8888
</dependency>
8989
</dependencies>
9090
<configuration>

0 commit comments

Comments
 (0)