Skip to content

Commit

Permalink
switch to orbit 2022-09 and widen version range for gson. See #611
Browse files Browse the repository at this point in the history
Signed-off-by: Christian Dietrich <[email protected]>
  • Loading branch information
cdietrich committed Jul 19, 2022
1 parent 6e20087 commit fd123f1
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 9 deletions.
2 changes: 1 addition & 1 deletion NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ The project maintains the following source code repositories:

This project leverages the following third party content.

Google Gson (2.8.9)
Google Gson (2.9.0)

* License: Apache License, 2.0
* Project: https://github.com/google/gson
Expand Down
4 changes: 2 additions & 2 deletions gradle/versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ ext.versions = [
'xtend_lib': '2.24.0',
'guava': '[14.0,31)',
'guava_orbit': '30.1.0.v20210127-2300',
'gson': '[2.8.9,2.9)',
'gson_orbit': '2.8.9.v20220111-1409',
'gson': '[2.8.9,2.10)',
'gson_orbit': '2.9.0.v20220704-0629',
'websocket_jakarta': '2.0.0',
'websocket': '1.0',
'junit': '4.12'
Expand Down
2 changes: 1 addition & 1 deletion releng/lsp4j-feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</license>

<requires>
<import plugin="com.google.gson" version="2.8.9" match="equivalent"/>
<import plugin="com.google.gson" version="2.8.9" match="compatible"/>
<import plugin="org.eclipse.xtend.lib" version="2.10.0" match="compatible"/>
</requires>

Expand Down
4 changes: 2 additions & 2 deletions releng/p2/category.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<feature id="org.eclipse.lsp4j.sdk" version="0.15.0.qualifier">
<category name="lsp4j"/>
</feature>
<bundle id="com.google.gson" version="2.8.9.qualifier"/>
<bundle id="com.google.gson.source" version="2.8.9.qualifier"/>
<bundle id="com.google.gson" version="2.9.0.qualifier"/>
<bundle id="com.google.gson.source" version="2.9.0.qualifier"/>
<bundle id="com.google.guava" version="30.1.0.qualifier"/>
<bundle id="com.google.guava.source" version="30.1.0.qualifier"/>
<bundle id="jakarta.websocket" version="0.0.0"/>
Expand Down
12 changes: 9 additions & 3 deletions releng/releng-target/lsp4j.target.target
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,19 @@
<target name="org.eclipse.xtext.helios.target" sequenceNumber="0">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/orbit/downloads/2022-03"/>
<unit id="com.google.gson" version="2.8.9.v20220111-1409"/>
<unit id="com.google.gson.source" version="2.8.9.v20220111-1409"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20220718151716/repository/"/>
<!--
<repository location="https://download.eclipse.org/tools/orbit/downloads/2022-09"/>
-->
<unit id="com.google.gson" version="2.9.0.v20220704-0629"/>
<unit id="com.google.gson.source" version="2.9.0.v20220704-0629"/>
<unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
<unit id="com.google.guava.source" version="30.1.0.v20210127-2300"/>
<unit id="jakarta.websocket" version="0.0.0"/>
<unit id="jakarta.websocket.source" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/orbit/downloads/2022-03"/>
<unit id="javax.websocket" version="0.0.0"/>
<unit id="javax.websocket.source" version="0.0.0"/>
</location>
Expand Down

0 comments on commit fd123f1

Please sign in to comment.