Skip to content

Commit

Permalink
Bump the maven group with 8 updates (#2784)
Browse files Browse the repository at this point in the history
* 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]>
  • Loading branch information
dependabot[bot] and Marcono1234 authored Jan 2, 2025
1 parent 84e5f16 commit e5dce84
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 22 deletions.
8 changes: 4 additions & 4 deletions gson/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,13 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava-testlib</artifactId>
<version>33.3.1-jre</version>
<version>33.4.0-jre</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.3.1-jre</version>
<version>33.4.0-jre</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -236,12 +236,12 @@
<dependency>
<groupId>com.guardsquare</groupId>
<artifactId>proguard-base</artifactId>
<version>7.6.0</version>
<version>7.6.1</version>
</dependency>
<dependency>
<groupId>com.guardsquare</groupId>
<artifactId>proguard-core</artifactId>
<version>9.1.6</version>
<version>9.1.7</version>
</dependency>
</dependencies>
<configuration>
Expand Down
10 changes: 6 additions & 4 deletions gson/src/test/java/com/google/gson/JsonArrayAsListSuiteTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,14 @@ public Iterable<JsonElement> order(List<JsonElement> insertionOrder) {
@Override
public List<JsonElement> create(Object... elements) {
JsonArray array = new JsonArray();
// This is not completely accurate: Because there is no way to directly construct JsonArray or
// its List view with existing elements, this has to add the elements individually with
// `List#add`
var list = array.asList();
for (Object element : elements) {
array.add((JsonElement) element);
list.add((JsonElement) element);
}
return array.asList();
return list;
}
}

Expand All @@ -54,8 +58,6 @@ public static Test suite() {
return ListTestSuiteBuilder.using(new ListGenerator())
.withFeatures(
CollectionSize.ANY,
// Note: There is current a Guava bug which causes 'null additions' to not be tested if
// 'null queries' is enabled, see https://github.com/google/guava/issues/7401
CollectionFeature.ALLOWS_NULL_QUERIES,
CollectionFeature.RESTRICTS_ELEMENTS, // List only allows JsonElement
CollectionFeature.SUPPORTS_ADD,
Expand Down
10 changes: 6 additions & 4 deletions gson/src/test/java/com/google/gson/JsonObjectAsMapSuiteTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,15 @@ public SampleElements<Entry<String, JsonElement>> samples() {
@Override
public Map<String, JsonElement> create(Object... elements) {
JsonObject object = new JsonObject();
// This is not completely accurate: Because there is no way to directly construct JsonObject
// or its Map view with existing entries, this has to add the entries individually with
// `Map#put`
var map = object.asMap();
for (Object element : elements) {
var entry = (Entry<?, ?>) element;
object.add((String) entry.getKey(), (JsonElement) entry.getValue());
map.put((String) entry.getKey(), (JsonElement) entry.getValue());
}
return object.asMap();
return map;
}

@SuppressWarnings("unchecked")
Expand Down Expand Up @@ -70,8 +74,6 @@ public static Test suite() {
return MapTestSuiteBuilder.using(new MapGenerator())
.withFeatures(
CollectionSize.ANY,
// Note: There is current a Guava bug which causes 'null additions' to not be tested if
// 'null queries' is enabled, see https://github.com/google/guava/issues/7401
MapFeature.ALLOWS_ANY_NULL_QUERIES,
MapFeature.RESTRICTS_KEYS, // Map only allows String keys
MapFeature.RESTRICTS_VALUES, // Map only allows JsonElement values
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ public MapGenerator(boolean allowNullValues) {

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

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

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.11.1</version>
<version>3.11.2</version>
<configuration>
<skip>${gson.isTestModule}</skip>

Expand Down
4 changes: 2 additions & 2 deletions proto/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<!-- This is duplicated here because that is recommended by `artifact:check-buildplan` -->
<project.build.outputTimestamp>2024-05-19T18:54:10Z</project.build.outputTimestamp>

<protobufVersion>4.29.0</protobufVersion>
<protobufVersion>4.29.2</protobufVersion>

<!-- Overwrite property from parent; this module is currently not deployed -->
<gson.isInternalModule>true</gson.isInternalModule>
Expand Down Expand Up @@ -60,7 +60,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.3.1-jre</version>
<version>33.4.0-jre</version>
</dependency>

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions test-graal-native-image/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.11.3</version>
<version>5.11.4</version>
<scope>test</scope>
</dependency>

Expand Down Expand Up @@ -118,7 +118,7 @@
<plugin>
<groupId>org.graalvm.buildtools</groupId>
<artifactId>native-maven-plugin</artifactId>
<version>0.10.3</version>
<version>0.10.4</version>
<extensions>true</extensions>
<executions>
<execution>
Expand Down
4 changes: 2 additions & 2 deletions test-shrinker/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,12 @@
<dependency>
<groupId>com.guardsquare</groupId>
<artifactId>proguard-base</artifactId>
<version>7.6.0</version>
<version>7.6.1</version>
</dependency>
<dependency>
<groupId>com.guardsquare</groupId>
<artifactId>proguard-core</artifactId>
<version>9.1.6</version>
<version>9.1.7</version>
</dependency>
</dependencies>
<configuration>
Expand Down

0 comments on commit e5dce84

Please sign in to comment.