Skip to content

Commit a95006f

Browse files
authored
Use/allow latest versions of dependencies for guava and jakarta.websocket (#785)
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.
1 parent 59fa58f commit a95006f

File tree

3 files changed

+14
-10
lines changed

3 files changed

+14
-10
lines changed

gradle/versions.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ version = '0.21.2-SNAPSHOT'
1414

1515
ext.versions = [
1616
'xtend_lib': '2.28.0',
17-
'guava': '[30.1,33)',
17+
'guava': '[30.1,34)',
1818
'gson': '[2.9.1,2.11)',
1919
'websocket_jakarta': '2.0.0',
2020
'websocket': '1.0',

releng/p2/category.xml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@
55
</feature>
66
<bundle id="com.google.gson" version="2.10.1.qualifier"/>
77
<bundle id="com.google.gson.source" version="2.10.1.qualifier"/>
8-
<bundle id="com.google.guava" version="32.1.2.qualifier"/>
9-
<bundle id="com.google.guava.source" version="32.1.2.qualifier"/>
10-
<bundle id="jakarta.websocket" version="0.0.0"/>
11-
<bundle id="jakarta.websocket.source" version="0.0.0"/>
8+
<bundle id="com.google.guava" version="32.0.0.qualifier"/>
9+
<bundle id="com.google.guava.source" version="33.0.0.qualifier"/>
10+
<bundle id="jakarta.websocket-api" version="0.0.0"/>
11+
<bundle id="jakarta.websocket-api.source" version="0.0.0"/>
12+
<bundle id="jakarta.websocket-client-api" version="0.0.0"/>
13+
<bundle id="jakarta.websocket-client-api.source" version="0.0.0"/>
1214
<bundle id="javax.websocket" version="0.0.0"/>
1315
<bundle id="javax.websocket.source" version="0.0.0"/>
1416
<category-def name="lsp4j" label="Lsp4j"/>

releng/releng-target/lsp4j.target.target

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@
33
<target name="org.eclipse.xtext.helios.target" sequenceNumber="0">
44
<locations>
55
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
6-
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-09"/>
6+
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-03"/>
77
<unit id="com.google.gson" version="2.10.1"/>
88
<unit id="com.google.gson.source" version="2.10.1"/>
9-
<unit id="com.google.guava" version="32.1.2.jre"/>
10-
<unit id="com.google.guava.source" version="32.1.2.jre"/>
11-
<unit id="jakarta.websocket" version="0.0.0"/>
12-
<unit id="jakarta.websocket.source" version="0.0.0"/>
9+
<unit id="com.google.guava" version="33.0.0.jre"/>
10+
<unit id="com.google.guava.source" version="33.0.0.jre"/>
11+
<unit id="jakarta.websocket-api" version="0.0.0"/>
12+
<unit id="jakarta.websocket-api.source" version="0.0.0"/>
13+
<unit id="jakarta.websocket-client-api" version="0.0.0"/>
14+
<unit id="jakarta.websocket-client-api.source" version="0.0.0"/>
1315
</location>
1416
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
1517
<repository location="https://download.eclipse.org/tools/orbit/downloads/2022-03"/>

0 commit comments

Comments
 (0)