Update server.websocket to Jetty 11

- Update default target platform - Eclipse 21.03-> 22.12 - Jetty 9.x -> Jetty 11.0.12 - LSP4J -> 0.8.0 -> 0.19.0 - ELK 0.7.0 -> 0.8.1 - Add slf4j to enable logging in Jetty 10 - Consume log4j,slf4j and javax.servlet via maven - Jetty websockt requires slf4j 2.0 which is not available via orbit and not compatible with the orbit log4j version. So we instead use the new target platform features and consume it directly from a maven location - Update server.websocket plugin to conform to Jetty API breaks - Update to ELK 0.8.1 and remove workaround (Fixes eclipse-glsp/glsp#265) - Clean up pom files and consistently use properties for all versions - Remove xtext nature from parent project. Otherwise we get false positives in the Eclipse Problem view. - Ensure that both the p2 and m2 build use the same version ranges for their dependencies (if possible) - Provide a second target for 2021-09 to use it as minimal baseline. Part of eclipse-glsp/glsp#764
eclipse-glsp · Jan 20, 2023 · f0ad265 · f0ad265
1 parent 35b09f6
commit f0ad265
Show file tree

Hide file tree

Showing 36 changed files with 529 additions and 525 deletions.
diff --git a/.project b/.project
@@ -5,11 +5,6 @@
 	<projects>
 	</projects>
 	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
@@ -18,6 +13,5 @@
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
 	</natures>
 </projectDescription>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,14 @@
 
 ### Changes
 
-- [graph] Update the Graph model and add Layoutable interface [#175](https://github.com/eclipse-glsp/glsp-server/pull/175) - Contributed on behalf of STMicroelectronics
+- [graph] Updated the Graph model and add Layoutable interface [#175](https://github.com/eclipse-glsp/glsp-server/pull/175) - Contributed on behalf of STMicroelectronics
+
+### Breaking Changes
+- [websocket] Update to Jetty Websocket 11 [#xxx]() - Contributed on behalf of STMicroelectronics
+    - This includes breaking changes due to the namespace change (javax->jakarta) and the following new minimum versions:
+       - Jetty 9.x -> Jetty 11.0.12
+       - LSP4J -> 0.8.0 -> 0.19.0
+       - ELK 0.7.0 -> 0.8.1
 
 ## [v1.0.0 - 30/06/2022](https://github.com/eclipse-glsp/glsp-server/releases/tag/v1.0.0)
 

diff --git a/examples/org.eclipse.glsp.example.workflow/META-INF/MANIFEST.MF b/examples/org.eclipse.glsp.example.workflow/META-INF/MANIFEST.MF
@@ -25,7 +25,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.glsp.layout;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.glsp.server;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.glsp.server.websocket;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.elk.core;bundle-version="0.6.0",
- org.eclipse.elk.alg.layered;bundle-version="0.6.0",
- org.eclipse.elk.graph;bundle-version="0.6.0"
+ org.eclipse.elk.core;bundle-version="0.8.1",
+ org.eclipse.elk.alg.layered;bundle-version="0.8.1",
+ org.eclipse.elk.graph;bundle-version="0.8.1"
 Import-Package: org.apache.logging.log4j;version="2.17.1"
diff --git a/examples/org.eclipse.glsp.example.workflow/build.properties b/examples/org.eclipse.glsp.example.workflow/build.properties
@@ -1,4 +1,4 @@
-#  Copyright (c) 2019-2020 EclipseSource and others.
+#  Copyright (c) 2019-2023 EclipseSource and others.
 # 
 #  This program and the accompanying materials are made available under the
 #  terms of the Eclipse Public License v. 2.0 which is available at
@@ -14,9 +14,7 @@
 
 bin.includes = .,\
                model/,\
-               META-INF/,\
-               plugin.xml,\
-               plugin.properties
+               META-INF/
 jars.compile.order = .
 source.. = src-gen,\
 		   src/
diff --git a/examples/org.eclipse.glsp.example.workflow/pom.xml b/examples/org.eclipse.glsp.example.workflow/pom.xml
@@ -43,44 +43,33 @@
 	</properties>
 
 	<dependencies>
-		<dependency>
-			<groupId>com.google.inject</groupId>
-			<artifactId>guice</artifactId>
-			<version>5.0.1</version>
-		</dependency>
 		<dependency>
 			<groupId>org.eclipse.glsp</groupId>
 			<artifactId>org.eclipse.glsp.server</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.glsp</groupId>
 			<artifactId>org.eclipse.glsp.server.websocket</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.glsp</groupId>
 			<artifactId>org.eclipse.glsp.layout</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.elk</groupId>
 			<artifactId>org.eclipse.elk.alg.layered</artifactId>
-			<version>0.7.1</version>
-			<!-- Can be removed once https://github.com/eclipse-glsp/glsp/issues/265 
-				is resolved -->
-			<exclusions>
-				<exclusion>
-					<groupId>com.google.guava</groupId>
-					<artifactId>guava</artifactId>
-				</exclusion>
+			<version>${elk.version}</version>
+				<exclusions>
+				<!--ELK still has a log4J 1.2 dependency. So we exclude it -->
+					<exclusion>
+						<groupId>log4j</groupId>
+						<artifactId>log4j</artifactId>
+					</exclusion>
 			</exclusions>
 		</dependency>
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>30.1-jre</version>
-		</dependency>
 	</dependencies>
 
 	<profiles>
@@ -97,15 +86,15 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-deploy-plugin</artifactId>
-						<version>2.8</version>
+						<version>${maven.deploy.version}</version>
 						<configuration>
 							<skip>false</skip>
 						</configuration>
 					</plugin>
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>build-helper-maven-plugin</artifactId>
-						<version>3.3.0</version>
+						<version>${buildhelper.maven.version}</version>
 						<executions>
 							<execution>
 								<id>add-resource</id>
@@ -137,7 +126,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-shade-plugin</artifactId>
-						<version>3.2.4</version>
+						<version>${maven.shade.version}</version>
 						<configuration>
 							<transformers>
 								<transformer
@@ -150,7 +139,8 @@
 							</transformers>
 							<artifactSet>
 								<excludes>
-									<exclude>javax.websocket:javax.websocket-client-api</exclude>
+									<exclude>javax.websocket:javax.websocket-api</exclude>
+									<exclude>log4j:log4j</exclude>
 								</excludes>
 							</artifactSet>
 							<filters>
@@ -162,7 +152,9 @@
 										<exclude>META-INF/ECLIPSE_*</exclude>
 										<exclude>META-INF/LICENSE*</exclude>
 										<exclude>META-INF/services/javax.servlet.ServletContainerInitializer*</exclude>
+										<exclude>META-INF/services/org.eclipse.jetty.webapp.Configuration*</exclude>
 										<exclude>META-INF/services/org.eclipse.elk.core.data.ILayoutMetaDataProvider*</exclude>
+										<exclude>META-INF/versions/9/module-info.class</exclude>
 										<exclude>META-INF/NOTICE*</exclude>
 										<exclude>.options</exclude>
 										<exclude>.api_description</exclude>

diff --git a/plugins/org.eclipse.glsp.graph/META-INF/MANIFEST.MF b/plugins/org.eclipse.glsp.graph/META-INF/MANIFEST.MF
@@ -6,9 +6,9 @@ Bundle-Version: 1.1.0.qualifier
 Bundle-Vendor: Eclipse GLSP
 Automatic-Module-Name: org.eclipse.glsp.graph
 Bundle-RequiredExecutionEnvironment: JavaSE-11
-Require-Bundle: org.eclipse.emf.common;bundle-version="2.15.0",
- com.google.gson;bundle-version="2.8.9",
- org.eclipse.emf.ecore;bundle-version="2.15.0";visibility:=reexport,
+Require-Bundle: org.eclipse.emf.common;bundle-version="2.23.0",
+ com.google.gson;bundle-version="2.8.7",
+ org.eclipse.emf.ecore;bundle-version="2.25.0";visibility:=reexport,
  com.google.guava;bundle-version="30.1.0";visibility:=reexport
 Export-Package: org.eclipse.glsp.graph,
  org.eclipse.glsp.graph,

diff --git a/plugins/org.eclipse.glsp.graph/pom.xml b/plugins/org.eclipse.glsp.graph/pom.xml
@@ -45,22 +45,22 @@
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>30.1-jre</version>
+			<version>${google.guava.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.emf</groupId>
 			<artifactId>org.eclipse.emf.common</artifactId>
-			<version>2.15.0</version>
+			<version>${emf.common.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.emf</groupId>
 			<artifactId>org.eclipse.emf.ecore</artifactId>
-			<version>2.15.0</version>
+			<version>${emf.ecore.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
-			<version>2.8.9</version>
+			<version>${google.gson.version}</version>
 		</dependency>
 	</dependencies>
 
@@ -79,15 +79,15 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-deploy-plugin</artifactId>
-						<version>2.8</version>
+						<version>${maven.deploy.version}</version>
 						<configuration>
 							<skip>false</skip>
 						</configuration>
 					</plugin>
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>build-helper-maven-plugin</artifactId>
-						<version>3.3.0</version>
+						<version>${buildhelper.maven.version}</version>
 						<executions>
 							<execution>
 								<id>add-resource</id>

diff --git a/plugins/org.eclipse.glsp.layout/META-INF/MANIFEST.MF b/plugins/org.eclipse.glsp.layout/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Vendor: EclispeSource
 Automatic-Module-Name: org.eclipse.glsp.layout
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.glsp.server;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.elk.core;bundle-version="0.7.1",
- org.eclipse.elk.graph;bundle-version="0.7.1",
+ org.eclipse.elk.core;bundle-version="0.8.1",
+ org.eclipse.elk.graph;bundle-version="0.8.1",
  com.google.guava;bundle-version="30.1.0"
 Export-Package: org.eclipse.glsp.layout
diff --git a/plugins/org.eclipse.glsp.layout/pom.xml b/plugins/org.eclipse.glsp.layout/pom.xml
@@ -45,26 +45,33 @@
 		<dependency>
 			<groupId>org.eclipse.glsp</groupId>
 			<artifactId>org.eclipse.glsp.server</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.elk</groupId>
 			<artifactId>org.eclipse.elk.core</artifactId>
-			<version>0.7.1</version>
-			<!-- Can be removed once https://github.com/eclipse-glsp/glsp/issues/265 
-				is resolved -->
+			<version>${elk.version}</version>
 			<exclusions>
+				<!--ELK still has a log4J 1.2 dependency. So we exclude it -->
 				<exclusion>
-					<groupId>com.google.guava</groupId>
-					<artifactId>guava</artifactId>
+					<groupId>log4j</groupId>
+					<artifactId>log4j</artifactId>
 				</exclusion>
 			</exclusions>
+
 		</dependency>
 
 		<dependency>
 			<groupId>org.eclipse.elk</groupId>
 			<artifactId>org.eclipse.elk.graph.text</artifactId>
-			<version>0.7.1</version>
+			<version>${elk.version}</version>
+			<exclusions>
+				<!--ELK still has a log4J 1.2 dependency. So we exclude it -->
+				<exclusion>
+					<groupId>log4j</groupId>
+					<artifactId>log4j</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 	</dependencies>
 
@@ -82,7 +89,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-deploy-plugin</artifactId>
-						<version>2.8</version>
+						<version>${maven.deploy.version}</version>
 						<configuration>
 							<skip>false</skip>
 						</configuration>

diff --git a/plugins/org.eclipse.glsp.server.emf/META-INF/MANIFEST.MF b/plugins/org.eclipse.glsp.server.emf/META-INF/MANIFEST.MF
@@ -9,8 +9,8 @@ Bundle-Localization: plugin
 Automatic-Module-Name: org.eclipse.glsp.example.emf
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.glsp.server;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.glsp.graph;bundle-version="0.10.0",
- org.eclipse.emf.ecore;bundle-version="2.23.0",
+ org.eclipse.glsp.graph;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.emf.ecore;bundle-version="2.25.0",
  org.eclipse.emf.ecore.edit;bundle-version="2.13.0",
  org.eclipse.emf.ecore.xmi;bundle-version="2.16.0"
 Export-Package: 

diff --git a/plugins/org.eclipse.glsp.server.emf/pom.xml b/plugins/org.eclipse.glsp.server.emf/pom.xml
@@ -46,32 +46,32 @@
 		<dependency>
 			<groupId>org.eclipse.glsp</groupId>
 			<artifactId>org.eclipse.glsp.server</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.glsp</groupId>
 			<artifactId>org.eclipse.glsp.graph</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.inject</groupId>
 			<artifactId>guice</artifactId>
-			<version>5.0.1</version>
+			<version>${google.guice.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.emf</groupId>
 			<artifactId>org.eclipse.emf.ecore.change</artifactId>
-			<version>2.14.0</version>
+			<version>${emf.ecore.change.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.emf</groupId>
 			<artifactId>org.eclipse.emf.ecore.edit</artifactId>
-			<version>2.13.0</version>
+			<version>${emf.ecore.edit.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-cli</groupId>
 			<artifactId>commons-cli</artifactId>
-			<version>1.4</version>
+			<version>${commons.cli.version}</version>
 		</dependency>
 	</dependencies>
 
@@ -89,15 +89,15 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-deploy-plugin</artifactId>
-						<version>2.8</version>
+						<version>${maven.deploy.version}</version>
 						<configuration>
 							<skip>false</skip>
 						</configuration>
 					</plugin>
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>build-helper-maven-plugin</artifactId>
-						<version>3.3.0</version>
+						<version>${buildhelper.maven.version}</version>
 						<executions>
 							<execution>
 								<id>add-resource</id>

diff --git a/plugins/org.eclipse.glsp.server.websocket/META-INF/MANIFEST.MF b/plugins/org.eclipse.glsp.server.websocket/META-INF/MANIFEST.MF
@@ -6,21 +6,29 @@ Bundle-Version: 1.1.0.qualifier
 Bundle-Vendor: Eclipse GLSP
 Automatic-Module-Name: com.eclipsesource.glps.server.websocket
 Bundle-RequiredExecutionEnvironment: JavaSE-11
-Require-Bundle: javax.websocket;bundle-version="1.0.0";visibility:=reexport,
- org.eclipse.jetty.server;bundle-version="9.4.0";visibility:=reexport,
- org.eclipse.jetty.servlet;bundle-version="9.4.0";visibility:=reexport,
- org.eclipse.jetty.util;bundle-version="9.4.0";visibility:=reexport,
- org.eclipse.jetty.websocket.javax.websocket;bundle-version="9.4.0";visibility:=reexport,
- org.eclipse.jetty.websocket.javax.websocket.server;bundle-version="9.4.0";visibility:=reexport,
+Require-Bundle: com.google.gson;bundle-version="2.8.7",
  org.eclipse.glsp.server;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.lsp4j.websocket;bundle-version="0.9.0",
- org.eclipse.jetty.webapp;bundle-version="9.4.0";visibility:=reexport,
- org.eclipse.jetty.websocket.api;bundle-version="9.4.0";visibility:=reexport,
- com.google.gson;bundle-version="2.8.9",
- org.eclipse.lsp4j,
- org.eclipse.lsp4j.jsonrpc
+ org.eclipse.lsp4j;bundle-version="0.11.0",
+ org.eclipse.lsp4j.jsonrpc;bundle-version="0.11.0",
+ org.eclipse.lsp4j.websocket.jakarta;bundle-version="0.11.0",
+ org.eclipse.jetty.servlet;bundle-version="11.0.0";visibility:=reexport,
+ org.eclipse.jetty.util;bundle-version="11.0.0";visibility:=reexport,
+ org.eclipse.jetty.server;bundle-version="11.0.0";visibility:=reexport,
+ org.eclipse.jetty.webapp;bundle-version="11.0.0";visibility:=reexport,
+ org.eclipse.jetty.http;bundle-version="11.0.0";visibility:=reexport,
+ org.eclipse.jetty.io;bundle-version="11.0.0";visibility:=reexport,
+ org.eclipse.jetty.client;bundle-version="11.0.0",
+ org.eclipse.jetty.websocket.jakarta.client;bundle-version="11.0.0";visibility:=reexport,
+ org.eclipse.jetty.websocket.jakarta.server;bundle-version="11.0.0";visibility:=reexport,
+ org.eclipse.jetty.websocket.jakarta.common;bundle-version="11.0.0";visibility:=reexport,
+ org.eclipse.jetty.websocket.core.common;bundle-version="11.0.0";visibility:=reexport,
+ org.eclipse.jetty.websocket.core.client;bundle-version="11.0.0";visibility:=reexport,
+ org.eclipse.jetty.websocket.servlet;bundle-version="11.0.0";visibility:=reexport,
+ org.eclipse.jetty.websocket.core.server;bundle-version="11.0.0";visibility:=reexport
 Export-Package: org.eclipse.glsp.server.websocket
-Import-Package: javax.servlet;version="[3.1.0,4.0.0)",
+Import-Package: jakarta.servlet;version="5.0.0",
+ jakarta.websocket;version="2.0.0",
+ jakarta.websocket.server;version="2.0.0",
  org.apache.logging.log4j;version="2.17.1",
  org.apache.logging.log4j.core.config;version="2.17.1",
- org.apache.logging.log4j.spi;version="2.17.1"
+ org.apache.logging.slf4j;version="2.19.0"