Skip to content

Commit

Permalink
GLSP-1397: Jakarta migration
Browse files Browse the repository at this point in the history
- Update target platforms.
   -New default target Eclipse 2024-09
  - New minimum baseline Eclipse 2023-12
  - Switch to jarkarta variant of lsp4j websocket
  - Switch to Jetty 12

Builds on top of: #24

Changes done on top:
- Remove outdated targets
- Adjust version ranges
- Create a new target definition for the minimum supported version (2023-12)
- Restore explicit reexport of certain packages to maintain backwards compatibility
- Fix and align m2 build
- Add possibility to change the target platform of the p2 build with the p2.target property

Part of eclipse-glsp/glsp#1397
  • Loading branch information
tortmayr committed Dec 4, 2024
1 parent 604fa15 commit 854d15f
Show file tree
Hide file tree
Showing 23 changed files with 216 additions and 541 deletions.
10 changes: 3 additions & 7 deletions examples/org.eclipse.glsp.example.workflow/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,9 @@ Export-Package: org.eclipse.glsp.example.workflow,
org.eclipse.glsp.example.workflow.wfgraph.util
Automatic-Module-Name: org.eclipse.glsp.example.workflow
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Bundle: com.google.inject;bundle-version="[7.0.0,8.0.0)",
org.apache.commons.cli;bundle-version="1.9.0",
org.eclipse.emf.common;bundle-version="2.31.0",
org.eclipse.glsp.layout;bundle-version="[2.0.0,3.0.0)",
org.eclipse.glsp.graph;bundle-version="2.3.0",
org.eclipse.glsp.server;bundle-version="[2.0.0,3.0.0)",
org.eclipse.glsp.server.websocket;bundle-version="[2.0.0,3.0.0)",
Require-Bundle: org.eclipse.glsp.layout;bundle-version="[2.3.0,3.0.0)",
org.eclipse.glsp.server;bundle-version="[2.3.0,3.0.0)",
org.eclipse.glsp.server.websocket;bundle-version="[2.3.0,3.0.0)",
org.eclipse.elk.alg.layered;bundle-version="0.8.1",
org.eclipse.elk.core;bundle-version="0.8.1",
org.eclipse.elk.graph;bundle-version="0.8.1"
Expand Down
1 change: 0 additions & 1 deletion examples/org.eclipse.glsp.example.workflow/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@
</transformers>
<artifactSet>
<excludes>
<exclude>jakarta.websocket:jakarta.websocket-api</exclude>
<exclude>log4j:log4j</exclude>
</excludes>
</artifactSet>
Expand Down
6 changes: 3 additions & 3 deletions plugins/org.eclipse.glsp.graph/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ Bundle-Version: 2.3.0.qualifier
Bundle-Vendor: Eclipse GLSP
Automatic-Module-Name: org.eclipse.glsp.graph
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Bundle: org.eclipse.emf.common;bundle-version="2.31.0",
org.eclipse.emf.ecore;bundle-version="2.37.0",
com.google.gson;bundle-version="2.11.0"
Require-Bundle: org.eclipse.emf.common;bundle-version="2.29.0",
org.eclipse.emf.ecore;bundle-version="2.35.0";visibility:=reexport,
com.google.gson;bundle-version="2.10.1"
Export-Package: org.eclipse.glsp.graph,
org.eclipse.glsp.graph,
org.eclipse.glsp.graph.builder,
Expand Down
7 changes: 3 additions & 4 deletions plugins/org.eclipse.glsp.layout/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@ Bundle-Vendor: EclispeSource
Automatic-Module-Name: org.eclipse.glsp.layout
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Bundle: com.google.inject;bundle-version="[7.0.0,8.0.0)",
org.apache.commons.cli;bundle-version="1.9.0",
org.eclipse.emf.common;bundle-version="2.31.0",
org.apache.commons.cli;bundle-version="1.6.0",
org.eclipse.emf.common;bundle-version="2.29.0",
org.eclipse.elk.core;bundle-version="0.8.1",
org.eclipse.elk.graph;bundle-version="0.8.1",
org.eclipse.glsp.graph;bundle-version="2.3.0",
org.eclipse.glsp.server;bundle-version="[2.0.0,3.0.0)"
org.eclipse.glsp.server;bundle-version="[2.3.0,3.0.0)"
Export-Package: org.eclipse.glsp.layout
6 changes: 2 additions & 4 deletions plugins/org.eclipse.glsp.server.emf/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,10 @@ Bundle-Vendor: Eclipse GLSP
Bundle-Localization: plugin
Automatic-Module-Name: org.eclipse.glsp.example.emf
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Bundle: com.google.inject;bundle-version="[7.0.0,8.0.0)",
Require-Bundle: org.eclipse.glsp.server;bundle-version="[2.3.0,3.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",
org.eclipse.glsp.graph;bundle-version="[2.0.0,3.0.0)",
org.eclipse.glsp.server;bundle-version="[2.0.0,3.0.0)"
org.eclipse.emf.ecore.xmi;bundle-version="2.16.0"
Export-Package:
org.eclipse.glsp.server.emf,
org.eclipse.glsp.server.emf.idgen,
Expand Down
40 changes: 23 additions & 17 deletions plugins/org.eclipse.glsp.server.websocket/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,30 @@ Bundle-Version: 2.3.0.qualifier
Bundle-Vendor: Eclipse GLSP
Automatic-Module-Name: com.eclipsesource.glps.server.websocket
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Bundle: com.google.gson;bundle-version="2.8.7",
com.google.inject;bundle-version="[7.0.0,8.0.0)",
org.eclipse.glsp.server;bundle-version="[2.0.0,3.0.0]",
org.eclipse.jetty.ee10.servlet;bundle-version="12.0.12",
org.eclipse.jetty.ee10.websocket.jakarta.server;bundle-version="12.0.12",
org.eclipse.jetty.ee10.websocket.server;bundle-version="12.0.12",
org.eclipse.jetty.ee8.server;bundle-version="12.0.12",
org.eclipse.jetty.server;bundle-version="12.0.12",
org.eclipse.jetty.session;bundle-version="12.0.12",
org.eclipse.jetty.util;bundle-version="12.0.12",
org.eclipse.jetty.websocket.api;bundle-version="12.0.12",
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.23.1"
Require-Bundle: com.google.gson;bundle-version="2.10.1",
org.eclipse.glsp.server;bundle-version="[2.3.0,3.0.0]",
org.eclipse.lsp4j;bundle-version="0.21.0",
org.eclipse.lsp4j.jsonrpc;bundle-version="0.21.0",
org.eclipse.lsp4j.websocket.jakarta;bundle-version="0.21.0",
org.eclipse.jetty.ee10.servlet;bundle-version="12.0.0",
org.eclipse.jetty.ee10.websocket.jakarta.server;bundle-version="12.0.0",
org.eclipse.jetty.ee10.websocket.server;bundle-version="12.0.0",
org.eclipse.jetty.server;bundle-version="12.0.0",
org.eclipse.jetty.session;bundle-version="12.0.0",
org.eclipse.jetty.util;bundle-version="12.0.0",
org.eclipse.jetty.websocket.api;bundle-version="12.0.0",
org.eclipse.jetty.http;bundle-version="12.0.0",
org.eclipse.jetty.io;bundle-version="12.0.0",
org.eclipse.jetty.ee10.websocket.jakarta.client;bundle-version="12.0.0",
org.eclipse.jetty.ee10.websocket.jakarta.common;bundle-version="12.0.0",
org.eclipse.jetty.websocket.core.server;bundle-version="12.0.0",
org.eclipse.jetty.ee10.websocket.servlet;bundle-version="12.0.0",
org.eclipse.jetty.websocket.core.common;bundle-version="12.0.0",
org.eclipse.jetty.security;bundle-version="12.0.0"
Export-Package: org.eclipse.glsp.server.websocket
Import-Package: jakarta.servlet;version="[6.1.0,7.0.0)",
jakarta.websocket;version="[2.2.0,3.0.0)",
jakarta.websocket.server;version="[2.2.0,3.0.0)",
Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)",
jakarta.websocket;version="[2.0.0,3.0.0)",
jakarta.websocket.server;version="[2.0.0,3.0.0)",
org.apache.logging.log4j;version="2.17.1",
org.apache.logging.log4j.core.config;version="2.17.1",
org.apache.logging.slf4j;version="2.17.1"
6 changes: 3 additions & 3 deletions plugins/org.eclipse.glsp.server.websocket/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-javax-server</artifactId>
<groupId>org.eclipse.jetty.ee10.websocket</groupId>
<artifactId>jetty-ee10-websocket-jakarta-server</artifactId>
<version>${jetty.websocket.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.lsp4j</groupId>
<artifactId>org.eclipse.lsp4j.websocket</artifactId>
<artifactId>org.eclipse.lsp4j.websocket.jakarta</artifactId>
<version>${lsp4j.version}</version>
</dependency>
</dependencies>
Expand Down
14 changes: 7 additions & 7 deletions plugins/org.eclipse.glsp.server/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ Bundle-Version: 2.3.0.qualifier
Bundle-Vendor: Eclipse GLSP
Automatic-Module-Name: org.eclipse.glsp.server
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Bundle: com.google.inject;bundle-version="[7.0.0,8.0.0)",
com.google.gson;bundle-version="2.11.0",
org.apache.commons.cli;bundle-version="1.9.0",
org.eclipse.emf.ecore.change;bundle-version="2.17.0",
org.eclipse.glsp.graph;bundle-version="[2.3.0,3.0.0)",
org.eclipse.lsp4j;bundle-version="0.23.1",
org.eclipse.lsp4j.jsonrpc;bundle-version="0.23.1"
Require-Bundle: org.eclipse.emf.ecore.change;bundle-version="2.15.0",
com.google.gson;bundle-version="2.10.1",
org.eclipse.lsp4j;bundle-version="0.21.0",
org.eclipse.lsp4j.jsonrpc;bundle-version="0.21.0",
org.apache.commons.cli;bundle-version="1.6.0";visibility:=reexport,
com.google.inject;bundle-version="[7.0.0,8.0.0)";visibility:=reexport,
org.eclipse.glsp.graph;bundle-version="[2.3.0,3.0.0)";visibility:=reexport
Export-Package: org.eclipse.glsp.server.actions,
org.eclipse.glsp.server.di,
org.eclipse.glsp.server.di.scope,
Expand Down
22 changes: 10 additions & 12 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,26 +58,24 @@
<maven.shade.version>3.6.0</maven.shade.version>
<maven.source.version>3.3.1</maven.source.version>
<maven.surefire.version>3.3.1</maven.surefire.version>
<puppycrawl.checkstyle.version>10.17.0</puppycrawl.checkstyle.version>
<tycho.version>4.0.8</tycho.version>
<versions.maven.version>2.17.1</versions.maven.version>

<!-- Dependency Versions: Version of dependencies provided by the target
platform in ,2. We try to match the p2-version if possible. -->
<apache.logging.log4j.version>[2.19.0,2.23.1]</apache.logging.log4j.version>
<apache.logging.log4j.version>[2.19.0,2.24.2]</apache.logging.log4j.version>
<commons.cli.version>[1.4,)</commons.cli.version>
<elk.version>0.8.1</elk.version>
<emf.common.version>[2.23.0,)</emf.common.version>
<emf.common.version>[2.29.0,)</emf.common.version>
<emf.ecore.change.version>[2.14.0,)</emf.ecore.change.version>
<emf.ecore.edit.version>[2.13.0,)</emf.ecore.edit.version>
<emf.ecore.version>[2.25.0,)</emf.ecore.version>
<emf.ecore.xmi.version>2.16.0</emf.ecore.xmi.version>
<emfjson.jackson.version>2.0.0</emfjson.jackson.version>
<emf.ecore.edit.version>[2.14.0,)</emf.ecore.edit.version>
<emf.ecore.version>[2.35.0,)</emf.ecore.version>
<emf.ecore.xmi.version>[2.35.0,)</emf.ecore.xmi.version>
<google.guice.version>[7.0.0,)</google.guice.version>
<google.gson.version>[2.8.7,)</google.gson.version>
<google.gson.version>[2.10.1,)</google.gson.version>
<junit.jupiter.engine.version>[5.7.1,6.0.0)</junit.jupiter.engine.version>
<lsp4j.version>[0.23.1,)</lsp4j.version>
<jetty.websocket.version>[10.0.12,)</jetty.websocket.version>
<lsp4j.version>[0.21.0,)</lsp4j.version>
<jetty.websocket.version>[12.0.3,)</jetty.websocket.version>


<!-- Release Dependencies for M2 -->
Expand Down Expand Up @@ -118,7 +116,7 @@

<properties>
<!-- Maven Plugin Versions: General maven plugin versions -->

<p2.target>r2024-09</p2.target>
</properties>

<modules>
Expand Down Expand Up @@ -233,7 +231,7 @@
<artifact>
<groupId>org.eclipse.glsp</groupId>
<artifactId>org.eclipse.glsp.parent</artifactId>
<classifier>targetplatforms/r2024-09</classifier>
<classifier>targetplatforms/${p2.target}</classifier>
<version>${project.version}</version>
</artifact>
</target>
Expand Down
14 changes: 7 additions & 7 deletions releng/org.eclipse.glsp.feature/feature.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.glsp.feature"
label="GLSP SDK"
label="GLSP SDK (Core)"
version="2.3.0.qualifier"
provider-name="Eclipse GLSP">

Expand Down Expand Up @@ -312,17 +312,17 @@ version(s), and exceptions or additional permissions here}.&quot;
</url>

<requires>
<import plugin="org.eclipse.emf.ecore.change" version="2.14.0" match="greaterOrEqual"/>
<import plugin="com.google.gson" version="2.8.7" match="greaterOrEqual"/>
<import plugin="org.eclipse.lsp4j" version="0.23.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.lsp4j.jsonrpc" version="0.23.1" match="greaterOrEqual"/>
<import plugin="org.apache.commons.cli" version="1.4.0" match="greaterOrEqual"/>
<import plugin="com.google.gson" version="2.10.1" match="greaterOrEqual"/>
<import plugin="com.google.inject" version="5.0.1" match="greaterOrEqual"/>
<import plugin="jakarta.inject.jakarta.inject-api"/>
<import plugin="org.apache.commons.cli" version="1.4.0" match="greaterOrEqual"/>
<import plugin="org.apache.logging.log4j.api"/>
<import plugin="org.apache.logging.log4j.core"/>
<import plugin="org.eclipse.emf.common" version="2.23.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.ecore" version="2.25.0" match="greaterOrEqual"/>
<import plugin="jakarta.inject.jakarta.inject-api"/>
<import plugin="org.eclipse.emf.ecore.change" version="2.14.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.lsp4j" version="0.21.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.lsp4j.jsonrpc" version="0.21.0" match="greaterOrEqual"/>
</requires>

<plugin
Expand Down
29 changes: 9 additions & 20 deletions releng/org.eclipse.glsp.repository/category.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
<stats location="https://download.eclipse.org/stats/">
<feature url="features/org.eclipse.glsp.feature_2.3.0.qualifier.jar" id="org.eclipse.glsp.feature" version="2.3.0.qualifier"/>
</stats>
<feature id="org.eclipse.glsp.feature">
<category name="org.eclipse.glsp"/>
</feature>
Expand Down Expand Up @@ -36,28 +39,13 @@
<bundle id="org.apache.logging.log4j.core">
<category name="org.eclipse.glsp.dependencies"/>
</bundle>
<bundle id="org.apache.logging.log4j.slf4j2-impl">
<bundle id="org.apache.logging.log4j.slf4j2.impl">
<category name="org.eclipse.glsp.dependencies"/>
</bundle>
<bundle id="slf4j.api">
<bundle id="org.apache.logging.log4j.1.2.api">
<category name="org.eclipse.glsp.dependencies"/>
</bundle>
<bundle id="org.apache.aries.spifly.dynamic.bundle">
<category name="org.eclipse.glsp.dependencies"/>
</bundle>
<bundle id="org.objectweb.asm">
<category name="org.eclipse.glsp.dependencies"/>
</bundle>
<bundle id="org.objectweb.asm.commons">
<category name="org.eclipse.glsp.dependencies"/>
</bundle>
<bundle id="org.objectweb.asm.tree">
<category name="org.eclipse.glsp.dependencies"/>
</bundle>
<bundle id="org.objectweb.asm.tree.analysis">
<category name="org.eclipse.glsp.dependencies"/>
</bundle>
<bundle id="org.objectweb.asm.util">
<bundle id="org.apache.logging.log4j.to.slf4j">
<category name="org.eclipse.glsp.dependencies"/>
</bundle>
<category-def name="org.eclipse.glsp" label="Eclipse GLSP"/>
Expand All @@ -67,6 +55,7 @@
</description>
</category-def>
<category-def name="org.eclipse.glsp.dependencies" label="External Dependencies"/>
<repository-reference location="mvn:org.eclipse.jetty:jetty-p2:10.0.13:zip:p2site" enabled="true" />
<repository-reference location="https://download.eclipse.org/elk/updates/releases/0.8.1/" enabled="true" />
<repository-reference location="https://download.eclipse.org/elk/updates/releases/0.9.1/" name="ELK 0.9.1" enabled="true" />
<repository-reference location="https://download.eclipse.org/tools/orbit/simrel/maven-jetty/release/12.0.12" name="Orbit- Jetty 12.0.12" enabled="true" />
<repository-reference location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-09" name="Orbit- Aggreation 24-09" enabled="true" />
</site>
2 changes: 0 additions & 2 deletions targetplatforms/.settings/org.eclipse.core.resources.prefs

This file was deleted.

29 changes: 12 additions & 17 deletions targetplatforms/maven-dependencies.tpd
Original file line number Diff line number Diff line change
@@ -1,39 +1,34 @@
// Provides the jetty websocket artifacts from maven as a feature

target "Wrapper for maven dependencies"


maven log4j scope=compile dependencyDepth=none missingManifest=generate {
dependency {
groupId="org.apache.logging.log4j"
artifactId="log4j-slf4j2-impl"
version="2.19.0"
version="2.23.1"
}
dependency {
groupId="org.apache.logging.log4j"
artifactId="log4j-core"
version="2.19.0"
version="2.23.1"
}
dependency {
groupId="org.apache.logging.log4j"
artifactId="log4j-api"
version="2.19.0"
version="2.23.1"
}
}

maven slf4j scope=compile dependencyDepth=none missingManifest=generate {
dependency {
groupId="org.slf4j"
artifactId="slf4j-api"
version="2.0.0"
groupId="org.apache.logging.log4j"
artifactId="log4j-1.2-api"
version="2.23.1"
}
}

maven spifly scope=compile,test dependencyDepth=infinite missingManifest=generate {
dependency {
groupId="org.apache.aries.spifly"
artifactId="org.apache.aries.spifly.dynamic.bundle"
version="1.3.6"
groupId="org.apache.logging.log4j"
artifactId="log4j-to-slf4j"
version="2.23.1"
}
}




Loading

0 comments on commit 854d15f

Please sign in to comment.