Skip to content

Commit

Permalink
Merge pull request #2723 from eclipse/cd_issue2721
Browse files Browse the repository at this point in the history 
[#2721] use maven gson instead of orbit gson
  • Loading branch information
@cdietrich
cdietrich authored Jun 30, 2023
2 parents 5f36672 + ea99ad1 commit 8c3ee71
Show file tree
Hide file tree
Showing 16 changed files with 16 additions and 16 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.v20230109-0753"/>
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.inject" version="7.0.0"/>
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
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.v20230109-0753"/>
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.inject" version="7.0.0"/>
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
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.v20230109-0753"/>
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.inject" version="7.0.0"/>
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
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.v20230109-0753"/>
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.inject" version="7.0.0"/>
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
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.v20230109-0753"/>
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.inject" version="7.0.0"/>
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
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.v20230109-0753"/>
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.inject" version="7.0.0"/>
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
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.v20230109-0753"/>
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.inject" version="7.0.0"/>
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
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.v20230109-0753"/>
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.inject" version="7.0.0"/>
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
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.v20230109-0753\"/>");
_builder.append("<unit id=\"com.google.gson\" version=\"2.10.1\"/>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("<unit id=\"com.google.inject\" version=\"7.0.0\"/>");
Expand Down
2 changes: 1 addition & 1 deletion xtext-latest.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<repository location="https://download.eclipse.org/oomph/simrel-orbit/2023-09"/>
<unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>
<unit id="org.kohsuke.args4j" version="0.0.0"/>
<unit id="com.google.gson" version="2.10.1.v20230109-0753"/>
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.guava" version="32.0.1.jre"/>
<unit id="com.google.guava.failureaccess" version="1.0.1"/>
<unit id="com.google.inject" version="7.0.0"/>
Expand Down
2 changes: 1 addition & 1 deletion xtext-r202203.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<repository location="https://download.eclipse.org/oomph/simrel-orbit/2023-09"/>
<unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>
<unit id="org.kohsuke.args4j" version="0.0.0"/>
<unit id="com.google.gson" version="2.10.1.v20230109-0753"/>
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.guava" version="32.0.1.jre"/>
<unit id="com.google.guava.failureaccess" version="1.0.1"/>
<unit id="com.google.inject" version="7.0.0"/>
Expand Down
2 changes: 1 addition & 1 deletion xtext-r202206.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<repository location="https://download.eclipse.org/oomph/simrel-orbit/2023-09"/>
<unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>
<unit id="org.kohsuke.args4j" version="0.0.0"/>
<unit id="com.google.gson" version="2.10.1.v20230109-0753"/>
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.guava" version="32.0.1.jre"/>
<unit id="com.google.guava.failureaccess" version="1.0.1"/>
<unit id="com.google.inject" version="7.0.0"/>
Expand Down
2 changes: 1 addition & 1 deletion xtext-r202209.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<repository location="https://download.eclipse.org/oomph/simrel-orbit/2023-09"/>
<unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>
<unit id="org.kohsuke.args4j" version="0.0.0"/>
<unit id="com.google.gson" version="2.10.1.v20230109-0753"/>
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.guava" version="32.0.1.jre"/>
<unit id="com.google.guava.failureaccess" version="1.0.1"/>
<unit id="com.google.inject" version="7.0.0"/>
Expand Down
2 changes: 1 addition & 1 deletion xtext-r202212.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<repository location="https://download.eclipse.org/oomph/simrel-orbit/2023-09"/>
<unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>
<unit id="org.kohsuke.args4j" version="0.0.0"/>
<unit id="com.google.gson" version="2.10.1.v20230109-0753"/>
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.guava" version="32.0.1.jre"/>
<unit id="com.google.guava.failureaccess" version="1.0.1"/>
<unit id="com.google.inject" version="7.0.0"/>
Expand Down
2 changes: 1 addition & 1 deletion xtext-r202303.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<repository location="https://download.eclipse.org/oomph/simrel-orbit/2023-09"/>
<unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>
<unit id="org.kohsuke.args4j" version="0.0.0"/>
<unit id="com.google.gson" version="2.10.1.v20230109-0753"/>
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.guava" version="32.0.1.jre"/>
<unit id="com.google.guava.failureaccess" version="1.0.1"/>
<unit id="com.google.inject" version="7.0.0"/>
Expand Down
2 changes: 1 addition & 1 deletion xtext-r202306.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<repository location="https://download.eclipse.org/oomph/simrel-orbit/2023-09"/>
<unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>
<unit id="org.kohsuke.args4j" version="0.0.0"/>
<unit id="com.google.gson" version="2.10.1.v20230109-0753"/>
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.guava" version="32.0.1.jre"/>
<unit id="com.google.guava.failureaccess" version="1.0.1"/>
<unit id="com.google.inject" version="7.0.0"/>
Expand Down

0 comments on commit 8c3ee71

Please sign in to comment.