Skip to content

Commit 101274d

Browse files
committed
Revert "[TP] Revert to gson 2.9.1"
This reverts commit 175a89f.
1 parent ec19e82 commit 101274d

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

org.eclipse.m2e.core/META-INF/MANIFEST.MF

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %Bundle-Name
44
Bundle-SymbolicName: org.eclipse.m2e.core;singleton:=true
5-
Bundle-Version: 2.0.7.qualifier
5+
Bundle-Version: 2.0.8.qualifier
66
Bundle-Activator: org.eclipse.m2e.core.internal.MavenPluginActivator
77
Bundle-Vendor: %Bundle-Vendor
88
Bundle-Localization: plugin
@@ -51,7 +51,7 @@ MavenArtifact-GroupId: org.eclipse.m2e
5151
MavenArtifact-ArtifactId: org.eclipse.m2e.core
5252
Import-Package: com.google.common.base;version="30.1.0",
5353
com.google.common.cache,
54-
com.google.gson;version="[2.9.0,3.0.0)",
54+
com.google.gson;version="[2.10.0,3.0.0)",
5555
javax.inject;version="1.0.0",
5656
org.apache.commons.cli;version="1.4.0",
5757
org.apache.commons.codec.digest;version="[1.14.0,2.0.0)",

org.eclipse.m2e.core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</parent>
2020

2121
<artifactId>org.eclipse.m2e.core</artifactId>
22-
<version>2.0.7-SNAPSHOT</version>
22+
<version>2.0.8-SNAPSHOT</version>
2323
<packaging>eclipse-plugin</packaging>
2424

2525
<name>Maven Integration for Eclipse Core Plug-in</name>

org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/MavenArtifactIdentifier.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import java.util.Set;
3636
import java.util.concurrent.ConcurrentHashMap;
3737
import java.util.stream.Collectors;
38-
import java.util.stream.StreamSupport;
3938

4039
import org.osgi.framework.Bundle;
4140
import org.osgi.framework.BundleEvent;
@@ -115,7 +114,7 @@ private static Set<ArtifactKey> lookUpFileHashOnMavenCentral(String sha1, Path f
115114
HttpResponse<String> response = client.send(request, BodyHandlers.ofString());
116115
JsonObject container = new Gson().fromJson(response.body(), JsonObject.class);
117116
JsonArray docs = container.get("response").getAsJsonObject().get("docs").getAsJsonArray();
118-
return StreamSupport.stream(docs.spliterator(), false).map(JsonElement::getAsJsonObject).map(obj -> {
117+
return docs.asList().stream().map(JsonElement::getAsJsonObject).map(obj -> {
119118
String g = obj.get("g").getAsString();
120119
String a = obj.get("a").getAsString();
121120
String v = obj.get("v").getAsString();

target-platform/target-platform.target

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
<dependency>
8383
<groupId>com.google.code.gson</groupId>
8484
<artifactId>gson</artifactId>
85-
<version>2.9.1</version>
85+
<version>2.10.1</version>
8686
<type>jar</type>
8787
</dependency>
8888
<dependency>

0 commit comments

Comments
 (0)