Skip to content

Commit

Permalink
Use/allow latest versions of dependencies for guava and jakarta.webso…
Browse files Browse the repository at this point in the history
…cket

A new version of Guava has been released (33) that LSP4J works with and
websocket is now published in a "better" way (direct from maven) so we
republish that version now.

Consumers shouldn't need to change their dependencies as the lower bounds
are unchanged.
  • Loading branch information
jonahgraham committed Jan 10, 2024
1 parent 59fa58f commit 915e439
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 10 deletions.
2 changes: 1 addition & 1 deletion gradle/versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ version = '0.21.2-SNAPSHOT'

ext.versions = [
'xtend_lib': '2.28.0',
'guava': '[30.1,33)',
'guava': '[30.1,34)',
'gson': '[2.9.1,2.11)',
'websocket_jakarta': '2.0.0',
'websocket': '1.0',
Expand Down
10 changes: 6 additions & 4 deletions releng/p2/category.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@
</feature>
<bundle id="com.google.gson" version="2.10.1.qualifier"/>
<bundle id="com.google.gson.source" version="2.10.1.qualifier"/>
<bundle id="com.google.guava" version="32.1.2.qualifier"/>
<bundle id="com.google.guava.source" version="32.1.2.qualifier"/>
<bundle id="jakarta.websocket" version="0.0.0"/>
<bundle id="jakarta.websocket.source" version="0.0.0"/>
<bundle id="com.google.guava" version="32.0.0.qualifier"/>
<bundle id="com.google.guava.source" version="33.0.0.qualifier"/>
<bundle id="jakarta.websocket-api" version="0.0.0"/>
<bundle id="jakarta.websocket-api.source" version="0.0.0"/>
<bundle id="jakarta.websocket-client-api" version="0.0.0"/>
<bundle id="jakarta.websocket-client-api.source" version="0.0.0"/>
<bundle id="javax.websocket" version="0.0.0"/>
<bundle id="javax.websocket.source" version="0.0.0"/>
<category-def name="lsp4j" label="Lsp4j"/>
Expand Down
12 changes: 7 additions & 5 deletions releng/releng-target/lsp4j.target.target
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@
<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/simrel/orbit-aggregation/2023-09"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-03"/>
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.gson.source" version="2.10.1"/>
<unit id="com.google.guava" version="32.1.2.jre"/>
<unit id="com.google.guava.source" version="32.1.2.jre"/>
<unit id="jakarta.websocket" version="0.0.0"/>
<unit id="jakarta.websocket.source" version="0.0.0"/>
<unit id="com.google.guava" version="33.0.0.jre"/>
<unit id="com.google.guava.source" version="33.0.0.jre"/>
<unit id="jakarta.websocket-api" version="0.0.0"/>
<unit id="jakarta.websocket-api.source" version="0.0.0"/>
<unit id="jakarta.websocket-client-api" version="0.0.0"/>
<unit id="jakarta.websocket-client-api.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"/>
Expand Down

0 comments on commit 915e439

Please sign in to comment.