diff --git a/gradle/versions.gradle b/gradle/versions.gradle index 47b9cd2e8..746558eb5 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -15,7 +15,8 @@ version = '0.23.1' ext.versions = [ 'xtend_lib': '2.32.0', 'guava': '[32.1.2,34)', - 'gson': '[2.9.1,2.11)', + 'gson': '[2.9.1,3.0)', + 'websocket_jakarta': '2.0.0', 'websocket': '1.0', 'junit': '4.13.2', diff --git a/org.eclipse.lsp4j.jsonrpc/src/test/java/org/eclipse/lsp4j/jsonrpc/test/IntegrationTest.java b/org.eclipse.lsp4j.jsonrpc/src/test/java/org/eclipse/lsp4j/jsonrpc/test/IntegrationTest.java index b164fef1d..010b77b23 100644 --- a/org.eclipse.lsp4j.jsonrpc/src/test/java/org/eclipse/lsp4j/jsonrpc/test/IntegrationTest.java +++ b/org.eclipse.lsp4j.jsonrpc/src/test/java/org/eclipse/lsp4j/jsonrpc/test/IntegrationTest.java @@ -692,9 +692,9 @@ public void testMalformedJson1() throws Exception { Launcher serverSideLauncher = Launcher.createLauncher(server, MyClient.class, in, out); serverSideLauncher.startListening().get(TIMEOUT, TimeUnit.MILLISECONDS); - Assert.assertEquals("Content-Length: 214" + CRLF + CRLF + Assert.assertEquals("Content-Length: 294" + CRLF + CRLF + "{\"jsonrpc\":\"2.0\",\"id\":\"1\",\"error\":{\"code\":-32700,\"message\":\"Message could not be parsed.\"," - + "\"data\":{\"message\":\"com.google.gson.stream.MalformedJsonException: Expected value at line 4 column 22 path $.params.value\"}}}" + + "\"data\":{\"message\":\"com.google.gson.stream.MalformedJsonException: Expected value at line 4 column 22 path $.params.value\\nSee https://github.com/google/gson/blob/main/Troubleshooting.md#malformed-json\"}}}" + "Content-Length: 51" + CRLF + CRLF + "{\"jsonrpc\":\"2.0\",\"id\":\"2\",\"result\":{\"value\":\"bar\"}}", out.toString()); @@ -726,7 +726,8 @@ public void testMalformedJson2() throws Exception { Launcher serverSideLauncher = Launcher.createLauncher(server, MyClient.class, in, out); serverSideLauncher.startListening().get(TIMEOUT, TimeUnit.MILLISECONDS); - logMessages.await(Level.SEVERE, "com.google.gson.stream.MalformedJsonException: Expected value at line 2 column 22 path $.params.value"); + logMessages.await(Level.SEVERE, "com.google.gson.stream.MalformedJsonException: Expected value at line 2 column 22 path $.params.value\n" + + "See https://github.com/google/gson/blob/main/Troubleshooting.md#malformed-json"); Assert.assertEquals("Content-Length: 51" + CRLF + CRLF + "{\"jsonrpc\":\"2.0\",\"id\":\"2\",\"result\":{\"value\":\"bar\"}}", out.toString()); @@ -756,9 +757,9 @@ public void testMalformedJson3() throws Exception { Launcher serverSideLauncher = Launcher.createLauncher(server, MyClient.class, in, out); serverSideLauncher.startListening().get(TIMEOUT, TimeUnit.MILLISECONDS); - Assert.assertEquals("Content-Length: 165" + CRLF + CRLF + Assert.assertEquals("Content-Length: 245" + CRLF + CRLF + "{\"jsonrpc\":\"2.0\",\"id\":\"1\",\"error\":{\"code\":-32700,\"message\":\"Message could not be parsed.\"," - + "\"data\":{\"message\":\"Unterminated object at line 5 column 2 path $.params\"}}}" + + "\"data\":{\"message\":\"Unterminated object at line 5 column 2 path $.params\\nSee https://github.com/google/gson/blob/main/Troubleshooting.md#malformed-json\"}}}" + "Content-Length: 51" + CRLF + CRLF + "{\"jsonrpc\":\"2.0\",\"id\":\"2\",\"result\":{\"value\":\"bar\"}}", out.toString()); @@ -785,9 +786,9 @@ public void testMalformedJson4() throws Exception { Launcher serverSideLauncher = Launcher.createLauncher(server, MyClient.class, in, out); serverSideLauncher.startListening().get(TIMEOUT, TimeUnit.MILLISECONDS); - Assert.assertEquals("Content-Length: 195" + CRLF + CRLF + Assert.assertEquals("Content-Length: 292" + CRLF + CRLF + "{\"jsonrpc\":\"2.0\",\"id\":\"1\",\"error\":{\"code\":-32700,\"message\":\"Message could not be parsed.\"," - + "\"data\":{\"message\":\"Use JsonReader.setLenient(true) to accept malformed JSON at line 5 column 3 path $\"}}}" + + "\"data\":{\"message\":\"Use JsonReader.setStrictness(Strictness.LENIENT) to accept malformed JSON at line 5 column 3 path $\\nSee https://github.com/google/gson/blob/main/Troubleshooting.md#malformed-json\"}}}" + "Content-Length: 51" + CRLF + CRLF + "{\"jsonrpc\":\"2.0\",\"id\":\"2\",\"result\":{\"value\":\"bar\"}}", out.toString()); diff --git a/releng/p2/category.xml b/releng/p2/category.xml index 647d3089d..4a942bcf3 100644 --- a/releng/p2/category.xml +++ b/releng/p2/category.xml @@ -3,10 +3,10 @@ - - - - + + + + diff --git a/releng/releng-target/lsp4j.target.target b/releng/releng-target/lsp4j.target.target index 3176571cf..fb6bdc35c 100644 --- a/releng/releng-target/lsp4j.target.target +++ b/releng/releng-target/lsp4j.target.target @@ -3,11 +3,11 @@ - - - - - + + + + +