Skip to content

Commit

Permalink
Merge pull request #3055 from eclipse/cd-gson2110
Browse files Browse the repository at this point in the history 
Update GSON to 2.11.0
  • Loading branch information
@cdietrich
cdietrich authored May 21, 2024
2 parents 9047a4c + ef3d7e1 commit 781b73b
Show file tree
Hide file tree
Showing 21 changed files with 31 additions and 31 deletions.
2 changes: 1 addition & 1 deletion ....xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.gson" version="2.11.0"/>
<unit id="com.google.inject" version="7.0.0"/>
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
<unit id="org.antlr.runtime" version="3.2.0.v20230929-1400"/>
Expand Down
2 changes: 1 addition & 1 deletion ...MavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.gson" version="2.11.0"/>
<unit id="com.google.inject" version="7.0.0"/>
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
<unit id="org.antlr.runtime" version="3.2.0.v20230929-1400"/>
Expand Down
2 changes: 1 addition & 1 deletion ...tjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.gson" version="2.11.0"/>
<unit id="com.google.inject" version="7.0.0"/>
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
<unit id="org.antlr.runtime" version="3.2.0.v20230929-1400"/>
Expand Down
2 changes: 1 addition & 1 deletion ...zard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.gson" version="2.11.0"/>
<unit id="com.google.inject" version="7.0.0"/>
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
<unit id="org.antlr.runtime" version="3.2.0.v20230929-1400"/>
Expand Down
2 changes: 1 addition & 1 deletion ...tions/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.gson" version="2.11.0"/>
<unit id="com.google.inject" version="7.0.0"/>
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
<unit id="org.antlr.runtime" version="3.2.0.v20230929-1400"/>
Expand Down
2 changes: 1 addition & 1 deletion ...ectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.gson" version="2.11.0"/>
<unit id="com.google.inject" version="7.0.0"/>
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
<unit id="org.antlr.runtime" version="3.2.0.v20230929-1400"/>
Expand Down
2 changes: 1 addition & 1 deletion ...venTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.gson" version="2.11.0"/>
<unit id="com.google.inject" version="7.0.0"/>
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
<unit id="org.antlr.runtime" version="3.2.0.v20230929-1400"/>
Expand Down
2 changes: 1 addition & 1 deletion ...venTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.target/mavenTychoP2J21.target.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.gson" version="2.11.0"/>
<unit id="com.google.inject" version="7.0.0"/>
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
<unit id="org.antlr.runtime" version="3.2.0.v20230929-1400"/>
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.web.servlet/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.10.1</version>
<version>2.11.0</version>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
Expand Down
2 changes: 1 addition & 1 deletion ...eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ class TargetPlatformProject extends ProjectDescriptor {
«ENDIF»
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.gson" version="2.11.0"/>
<unit id="com.google.inject" version="7.0.0"/>
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
<unit id="org.antlr.runtime" version="3.2.0.v20230929-1400"/>
Expand Down
2 changes: 1 addition & 1 deletion ...se.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ public CharSequence target() {
_builder.append("<location includeAllPlatforms=\"false\" includeConfigurePhase=\"false\" includeMode=\"planner\" includeSource=\"true\" type=\"InstallableUnit\">");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("<unit id=\"com.google.gson\" version=\"2.10.1\"/>");
_builder.append("<unit id=\"com.google.gson\" version=\"2.11.0\"/>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("<unit id=\"com.google.inject\" version=\"7.0.0\"/>");
Expand Down
4 changes: 2 additions & 2 deletions xtext-latest.target
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="xtext-latest" sequenceNumber="29">
<target name="xtext-latest" sequenceNumber="30">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/nightly/latest" />
Expand Down Expand Up @@ -45,7 +45,7 @@
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-06"/>
<unit id="org.apache.log4j" version="1.2.25"/>
<unit id="org.kohsuke.args4j" version="0.0.0"/>
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.gson" version="2.11.0"/>
<unit id="com.google.guava" version="33.2.0.jre"/>
<unit id="com.google.guava.failureaccess" version="1.0.2"/>
<unit id="com.google.inject" version="7.0.0"/>
Expand Down
4 changes: 2 additions & 2 deletions xtext-r202203.target
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="xtext-r202203" sequenceNumber="29">
<target name="xtext-r202203" sequenceNumber="30">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.29"/>
Expand Down Expand Up @@ -48,7 +48,7 @@
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-06"/>
<unit id="org.apache.log4j" version="1.2.25"/>
<unit id="org.kohsuke.args4j" version="0.0.0"/>
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.gson" version="2.11.0"/>
<unit id="com.google.guava" version="33.2.0.jre"/>
<unit id="com.google.guava.failureaccess" version="1.0.2"/>
<unit id="com.google.inject" version="7.0.0"/>
Expand Down
4 changes: 2 additions & 2 deletions xtext-r202206.target
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="xtext-r202206" sequenceNumber="29">
<target name="xtext-r202206" sequenceNumber="30">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.30"/>
Expand Down Expand Up @@ -47,7 +47,7 @@
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-06"/>
<unit id="org.apache.log4j" version="1.2.25"/>
<unit id="org.kohsuke.args4j" version="0.0.0"/>
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.gson" version="2.11.0"/>
<unit id="com.google.guava" version="33.2.0.jre"/>
<unit id="com.google.guava.failureaccess" version="1.0.2"/>
<unit id="com.google.inject" version="7.0.0"/>
Expand Down
4 changes: 2 additions & 2 deletions xtext-r202209.target
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="xtext-r202209" sequenceNumber="29">
<target name="xtext-r202209" sequenceNumber="30">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.31"/>
Expand Down Expand Up @@ -47,7 +47,7 @@
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-06"/>
<unit id="org.apache.log4j" version="1.2.25"/>
<unit id="org.kohsuke.args4j" version="0.0.0"/>
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.gson" version="2.11.0"/>
<unit id="com.google.guava" version="33.2.0.jre"/>
<unit id="com.google.guava.failureaccess" version="1.0.2"/>
<unit id="com.google.inject" version="7.0.0"/>
Expand Down
4 changes: 2 additions & 2 deletions xtext-r202212.target
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="xtext-r202212" sequenceNumber="29">
<target name="xtext-r202212" sequenceNumber="30">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.32"/>
Expand Down Expand Up @@ -47,7 +47,7 @@
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-06"/>
<unit id="org.apache.log4j" version="1.2.25"/>
<unit id="org.kohsuke.args4j" version="0.0.0"/>
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.gson" version="2.11.0"/>
<unit id="com.google.guava" version="33.2.0.jre"/>
<unit id="com.google.guava.failureaccess" version="1.0.2"/>
<unit id="com.google.inject" version="7.0.0"/>
Expand Down
4 changes: 2 additions & 2 deletions xtext-r202303.target
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="xtext-r202303" sequenceNumber="29">
<target name="xtext-r202303" sequenceNumber="30">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.33.0"/>
Expand Down Expand Up @@ -47,7 +47,7 @@
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-06"/>
<unit id="org.apache.log4j" version="1.2.25"/>
<unit id="org.kohsuke.args4j" version="0.0.0"/>
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.gson" version="2.11.0"/>
<unit id="com.google.guava" version="33.2.0.jre"/>
<unit id="com.google.guava.failureaccess" version="1.0.2"/>
<unit id="com.google.inject" version="7.0.0"/>
Expand Down
4 changes: 2 additions & 2 deletions xtext-r202306.target
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="xtext-r202306" sequenceNumber="29">
<target name="xtext-r202306" sequenceNumber="30">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.34.0"/>
Expand Down Expand Up @@ -47,7 +47,7 @@
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-06"/>
<unit id="org.apache.log4j" version="1.2.25"/>
<unit id="org.kohsuke.args4j" version="0.0.0"/>
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.gson" version="2.11.0"/>
<unit id="com.google.guava" version="33.2.0.jre"/>
<unit id="com.google.guava.failureaccess" version="1.0.2"/>
<unit id="com.google.inject" version="7.0.0"/>
Expand Down
4 changes: 2 additions & 2 deletions xtext-r202309.target
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="xtext-r202309" sequenceNumber="29">
<target name="xtext-r202309" sequenceNumber="30">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.35.0"/>
Expand Down Expand Up @@ -47,7 +47,7 @@
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-06"/>
<unit id="org.apache.log4j" version="1.2.25"/>
<unit id="org.kohsuke.args4j" version="0.0.0"/>
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.gson" version="2.11.0"/>
<unit id="com.google.guava" version="33.2.0.jre"/>
<unit id="com.google.guava.failureaccess" version="1.0.2"/>
<unit id="com.google.inject" version="7.0.0"/>
Expand Down
4 changes: 2 additions & 2 deletions xtext-r202312.target
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="xtext-r202312" sequenceNumber="29">
<target name="xtext-r202312" sequenceNumber="30">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.36.0"/>
Expand Down Expand Up @@ -47,7 +47,7 @@
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-06"/>
<unit id="org.apache.log4j" version="1.2.25"/>
<unit id="org.kohsuke.args4j" version="0.0.0"/>
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.gson" version="2.11.0"/>
<unit id="com.google.guava" version="33.2.0.jre"/>
<unit id="com.google.guava.failureaccess" version="1.0.2"/>
<unit id="com.google.inject" version="7.0.0"/>
Expand Down
4 changes: 2 additions & 2 deletions xtext-r202403.target
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="xtext-r202403" sequenceNumber="29">
<target name="xtext-r202403" sequenceNumber="30">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.37.0"/>
Expand Down Expand Up @@ -42,7 +42,7 @@
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-06"/>
<unit id="org.apache.log4j" version="1.2.25"/>
<unit id="org.kohsuke.args4j" version="0.0.0"/>
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.gson" version="2.11.0"/>
<unit id="com.google.guava" version="33.2.0.jre"/>
<unit id="com.google.guava.failureaccess" version="1.0.2"/>
<unit id="com.google.inject" version="7.0.0"/>
Expand Down

0 comments on commit 781b73b

Please sign in to comment.