diff --git a/examples/org.eclipse.glsp.example.workflow/META-INF/MANIFEST.MF b/examples/org.eclipse.glsp.example.workflow/META-INF/MANIFEST.MF index e4c7c06e..f126d643 100644 --- a/examples/org.eclipse.glsp.example.workflow/META-INF/MANIFEST.MF +++ b/examples/org.eclipse.glsp.example.workflow/META-INF/MANIFEST.MF @@ -22,10 +22,10 @@ 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: org.eclipse.glsp.layout;bundle-version="[2.0.0,3.0.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)", - org.eclipse.elk.core;bundle-version="0.8.1", +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" Import-Package: org.apache.logging.log4j;version="2.17.1" diff --git a/examples/org.eclipse.glsp.example.workflow/pom.xml b/examples/org.eclipse.glsp.example.workflow/pom.xml index 31427d61..6e318ba7 100644 --- a/examples/org.eclipse.glsp.example.workflow/pom.xml +++ b/examples/org.eclipse.glsp.example.workflow/pom.xml @@ -139,8 +139,6 @@ - jakarta.websocket:jakarta.websocket-api - javax.websocket:javax.websocket-api log4j:log4j diff --git a/plugins/org.eclipse.glsp.graph/.classpath b/plugins/org.eclipse.glsp.graph/.classpath index cb66d458..aae21769 100644 --- a/plugins/org.eclipse.glsp.graph/.classpath +++ b/plugins/org.eclipse.glsp.graph/.classpath @@ -6,7 +6,11 @@ - - + + + + + + diff --git a/plugins/org.eclipse.glsp.graph/META-INF/MANIFEST.MF b/plugins/org.eclipse.glsp.graph/META-INF/MANIFEST.MF index c6bdf71f..df64ffe7 100644 --- 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: 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.23.0", - com.google.gson;bundle-version="2.8.7", - org.eclipse.emf.ecore;bundle-version="2.25.0";visibility:=reexport +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, diff --git a/plugins/org.eclipse.glsp.layout/META-INF/MANIFEST.MF b/plugins/org.eclipse.glsp.layout/META-INF/MANIFEST.MF index 2d01b452..3cb8f5f6 100644 --- a/plugins/org.eclipse.glsp.layout/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.glsp.layout/META-INF/MANIFEST.MF @@ -6,7 +6,10 @@ Bundle-Version: 2.3.0.qualifier Bundle-Vendor: EclispeSource Automatic-Module-Name: org.eclipse.glsp.layout Bundle-RequiredExecutionEnvironment: JavaSE-17 -Require-Bundle: org.eclipse.glsp.server;bundle-version="[2.0.0,3.0.0)", +Require-Bundle: com.google.inject;bundle-version="[7.0.0,8.0.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.elk.graph;bundle-version="0.8.1", + org.eclipse.glsp.server;bundle-version="[2.3.0,3.0.0)" Export-Package: org.eclipse.glsp.layout diff --git a/plugins/org.eclipse.glsp.server.emf/META-INF/MANIFEST.MF b/plugins/org.eclipse.glsp.server.emf/META-INF/MANIFEST.MF index 1e60654c..f31dce45 100644 --- a/plugins/org.eclipse.glsp.server.emf/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.glsp.server.emf/META-INF/MANIFEST.MF @@ -8,8 +8,7 @@ Bundle-Vendor: Eclipse GLSP Bundle-Localization: plugin Automatic-Module-Name: org.eclipse.glsp.example.emf Bundle-RequiredExecutionEnvironment: JavaSE-17 -Require-Bundle: org.eclipse.glsp.server;bundle-version="[2.0.0,3.0.0)", - org.eclipse.glsp.graph;bundle-version="[2.0.0,3.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" diff --git a/plugins/org.eclipse.glsp.server.websocket/META-INF/MANIFEST.MF b/plugins/org.eclipse.glsp.server.websocket/META-INF/MANIFEST.MF index 014fb01c..1a5323f0 100644 --- a/plugins/org.eclipse.glsp.server.websocket/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.glsp.server.websocket/META-INF/MANIFEST.MF @@ -6,29 +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", - org.eclipse.glsp.server;bundle-version="[2.0.0,3.0.0]", - org.eclipse.lsp4j;bundle-version="0.11.0", - org.eclipse.lsp4j.jsonrpc;bundle-version="0.11.0", - org.eclipse.lsp4j.websocket;bundle-version="0.11.0", - org.eclipse.jetty.servlet;bundle-version="[10.0.0,11.0.0)", - org.eclipse.jetty.util;bundle-version="[10.0.0,11.0.0)", - org.eclipse.jetty.server;bundle-version="[10.0.0,11.0.0)", - org.eclipse.jetty.webapp;bundle-version="[10.0.0,11.0.0)", - org.eclipse.jetty.http;bundle-version="[10.0.0,11.0.0)";visibility:=reexport, - org.eclipse.jetty.io;bundle-version="[10.0.0,11.0.0)", - org.eclipse.jetty.client;bundle-version="[10.0.0,11.0.0)", - org.eclipse.jetty.websocket.javax.client;bundle-version="[10.0.0,11.0.0)", - org.eclipse.jetty.websocket.javax.server;bundle-version="[10.0.0,11.0.0)", - org.eclipse.jetty.websocket.javax.common;bundle-version="[10.0.0,11.0.0)", - org.eclipse.jetty.websocket.core.common;bundle-version="[10.0.0,11.0.0)", - org.eclipse.jetty.websocket.core.client;bundle-version="[10.0.0,11.0.0)", - org.eclipse.jetty.websocket.servlet;bundle-version="[10.0.0,11.0.0)", - org.eclipse.jetty.websocket.core.server;bundle-version="[10.0.0,11.0.0)" +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: javax.servlet;version="[4.0.0,5.0.0)", - javax.websocket;version="1.1.0", - javax.websocket.server;version="1.1.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" diff --git a/plugins/org.eclipse.glsp.server.websocket/pom.xml b/plugins/org.eclipse.glsp.server.websocket/pom.xml index aff3d703..2b14cade 100644 --- a/plugins/org.eclipse.glsp.server.websocket/pom.xml +++ b/plugins/org.eclipse.glsp.server.websocket/pom.xml @@ -48,13 +48,13 @@ ${project.version} - org.eclipse.jetty.websocket - websocket-javax-server + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jakarta-server ${jetty.websocket.version} org.eclipse.lsp4j - org.eclipse.lsp4j.websocket + org.eclipse.lsp4j.websocket.jakarta ${lsp4j.version} diff --git a/plugins/org.eclipse.glsp.server.websocket/src/org/eclipse/glsp/server/websocket/GLSPConfigurator.java b/plugins/org.eclipse.glsp.server.websocket/src/org/eclipse/glsp/server/websocket/GLSPConfigurator.java index 0e91e9b6..8292abdd 100644 --- a/plugins/org.eclipse.glsp.server.websocket/src/org/eclipse/glsp/server/websocket/GLSPConfigurator.java +++ b/plugins/org.eclipse.glsp.server.websocket/src/org/eclipse/glsp/server/websocket/GLSPConfigurator.java @@ -19,16 +19,16 @@ import java.util.ServiceLoader; import java.util.function.Supplier; -import javax.websocket.Extension; -import javax.websocket.HandshakeResponse; -import javax.websocket.server.HandshakeRequest; -import javax.websocket.server.ServerEndpointConfig; -import javax.websocket.server.ServerEndpointConfig.Configurator; - -import org.eclipse.jetty.websocket.javax.server.config.ContainerDefaultConfigurator; +import org.eclipse.jetty.ee10.websocket.jakarta.server.config.ContainerDefaultConfigurator; import com.google.inject.Injector; +import jakarta.websocket.Extension; +import jakarta.websocket.HandshakeResponse; +import jakarta.websocket.server.HandshakeRequest; +import jakarta.websocket.server.ServerEndpointConfig; +import jakarta.websocket.server.ServerEndpointConfig.Configurator; + public class GLSPConfigurator extends Configurator { protected Configurator containerConfigurator; protected final Supplier injector; @@ -40,7 +40,7 @@ public GLSPConfigurator(final Supplier injector) { Configurator getContainerConfigurator() { if (containerConfigurator == null) { ServiceLoader loader = ServiceLoader - .load(javax.websocket.server.ServerEndpointConfig.Configurator.class); + .load(jakarta.websocket.server.ServerEndpointConfig.Configurator.class); if (loader.iterator().hasNext()) { containerConfigurator = loader.iterator().next(); } else { diff --git a/plugins/org.eclipse.glsp.server.websocket/src/org/eclipse/glsp/server/websocket/GLSPServerEndpoint.java b/plugins/org.eclipse.glsp.server.websocket/src/org/eclipse/glsp/server/websocket/GLSPServerEndpoint.java index 3f60a02c..ecd2b14f 100644 --- a/plugins/org.eclipse.glsp.server.websocket/src/org/eclipse/glsp/server/websocket/GLSPServerEndpoint.java +++ b/plugins/org.eclipse.glsp.server.websocket/src/org/eclipse/glsp/server/websocket/GLSPServerEndpoint.java @@ -19,20 +19,20 @@ import java.util.function.Consumer; import java.util.function.Function; -import javax.websocket.CloseReason; -import javax.websocket.EndpointConfig; -import javax.websocket.Session; - import org.eclipse.glsp.server.gson.ServerGsonConfigurator; import org.eclipse.glsp.server.protocol.GLSPClient; import org.eclipse.glsp.server.protocol.GLSPServer; import org.eclipse.lsp4j.jsonrpc.Launcher.Builder; import org.eclipse.lsp4j.jsonrpc.MessageConsumer; -import org.eclipse.lsp4j.websocket.WebSocketEndpoint; +import org.eclipse.lsp4j.websocket.jakarta.WebSocketEndpoint; import com.google.gson.GsonBuilder; import com.google.inject.Inject; +import jakarta.websocket.CloseReason; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.Session; + public class GLSPServerEndpoint extends WebSocketEndpoint { public static final int MAX_TEXT_MESSAGE_BUFFER_SIZE = 8388608; diff --git a/plugins/org.eclipse.glsp.server.websocket/src/org/eclipse/glsp/server/websocket/WebsocketModule.java b/plugins/org.eclipse.glsp.server.websocket/src/org/eclipse/glsp/server/websocket/WebsocketModule.java index d4b81a7d..7918dc39 100644 --- a/plugins/org.eclipse.glsp.server.websocket/src/org/eclipse/glsp/server/websocket/WebsocketModule.java +++ b/plugins/org.eclipse.glsp.server.websocket/src/org/eclipse/glsp/server/websocket/WebsocketModule.java @@ -15,10 +15,10 @@ ******************************************************************************/ package org.eclipse.glsp.server.websocket; -import javax.websocket.Endpoint; - import com.google.inject.AbstractModule; +import jakarta.websocket.Endpoint; + public class WebsocketModule extends AbstractModule { @Override diff --git a/plugins/org.eclipse.glsp.server.websocket/src/org/eclipse/glsp/server/websocket/WebsocketServerLauncher.java b/plugins/org.eclipse.glsp.server.websocket/src/org/eclipse/glsp/server/websocket/WebsocketServerLauncher.java index 5db3e28c..d292b041 100644 --- a/plugins/org.eclipse.glsp.server.websocket/src/org/eclipse/glsp/server/websocket/WebsocketServerLauncher.java +++ b/plugins/org.eclipse.glsp.server.websocket/src/org/eclipse/glsp/server/websocket/WebsocketServerLauncher.java @@ -17,20 +17,20 @@ import java.net.InetSocketAddress; -import javax.websocket.server.ServerEndpointConfig; - import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.config.Configurator; import org.eclipse.glsp.server.di.ServerModule; import org.eclipse.glsp.server.launch.GLSPServerLauncher; +import org.eclipse.jetty.ee10.servlet.ServletContextHandler; +import org.eclipse.jetty.ee10.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer; import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.servlet.ServletContextHandler; -import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer; import com.google.inject.Module; +import jakarta.websocket.server.ServerEndpointConfig; + public class WebsocketServerLauncher extends GLSPServerLauncher { public static final String START_UP_COMPLETE_MSG = "[GLSP-Server]:Startup completed. Accepting requests on port:"; protected static Logger LOGGER = LogManager.getLogger(WebsocketServerLauncher.class); @@ -68,12 +68,14 @@ public void start(final String hostname, int port) { // Configure web socket - JavaxWebSocketServletContainerInitializer.configure(webAppContext, (servletContext, wsContainer) -> { + JakartaWebSocketServletContainerInitializer.configure(webAppContext, (servletContext, wsContainer) -> { ServerEndpointConfig.Builder builder = ServerEndpointConfig.Builder.create(GLSPServerEndpoint.class, "/" + endpointPath); builder.configurator(new GLSPConfigurator(this::createInjector)); - wsContainer.setDefaultMaxSessionIdleTimeout(-1); - wsContainer.addEndpoint(builder.build()); + ServerEndpointConfig endPointConfig = builder.build(); + + // wsContainer.setDefaultMaxSessionIdleTimeout(-1); + wsContainer.addEndpoint(endPointConfig); }); server.setHandler(webAppContext); diff --git a/plugins/org.eclipse.glsp.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.glsp.server/META-INF/MANIFEST.MF index c0a84e05..d13cde77 100644 --- a/plugins/org.eclipse.glsp.server/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.glsp.server/META-INF/MANIFEST.MF @@ -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: org.eclipse.emf.ecore.change;bundle-version="2.14.0", - com.google.gson;bundle-version="2.8.7", - org.eclipse.lsp4j;bundle-version="0.11.0", - org.eclipse.lsp4j.jsonrpc;bundle-version="0.11.0", - org.apache.commons.cli;bundle-version="1.4.0";visibility:=reexport, - com.google.inject;bundle-version="[5.0.1,8.0.0)";visibility:=reexport, - org.eclipse.glsp.graph;bundle-version="[2.0.0,3.0.0)";visibility:=reexport +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, @@ -58,7 +58,6 @@ Export-Package: org.eclipse.glsp.server.actions, org.eclipse.glsp.server.types, org.eclipse.glsp.server.utils Import-Package: jakarta.inject;resolution:=optional, - javax.inject;version="1.0.0", org.apache.logging.log4j;version="2.17.1", org.apache.logging.log4j.core;version="2.17.1", org.apache.logging.log4j.core.appender;version="2.17.1", diff --git a/pom.xml b/pom.xml index 7751acf0..e064f09d 100644 --- a/pom.xml +++ b/pom.xml @@ -58,26 +58,24 @@ 3.6.0 3.3.1 3.3.1 - 10.17.0 4.0.8 2.17.1 - [2.19.0,2.23.1] + [2.19.0,2.24.2] [1.4,) 0.8.1 - [2.23.0,) + [2.29.0,) [2.14.0,) - [2.13.0,) - [2.25.0,) - 2.16.0 - 2.0.0 - [5.0.1,) - [2.8.7,) + [2.14.0,) + [2.35.0,) + [2.35.0,) + [7.0.0,) + [2.10.1,) [5.7.1,6.0.0) - [0.11.0,) - [10.0.12,) + [0.21.0,) + [12.0.3,) @@ -118,7 +116,7 @@ - + r2024-09 @@ -233,7 +231,7 @@ org.eclipse.glsp org.eclipse.glsp.parent - targetplatforms/r2022-12 + targetplatforms/${p2.target} ${project.version} diff --git a/releng/org.eclipse.glsp.feature/feature.xml b/releng/org.eclipse.glsp.feature/feature.xml index fa969d92..4d324d38 100644 --- a/releng/org.eclipse.glsp.feature/feature.xml +++ b/releng/org.eclipse.glsp.feature/feature.xml @@ -1,7 +1,7 @@ @@ -312,31 +312,25 @@ version(s), and exceptions or additional permissions here}." - - - - - + - + + + + + + version="0.0.0"/> + version="0.0.0"/> diff --git a/releng/org.eclipse.glsp.repository/category.xml b/releng/org.eclipse.glsp.repository/category.xml index 0b4c302e..e241bedf 100644 --- a/releng/org.eclipse.glsp.repository/category.xml +++ b/releng/org.eclipse.glsp.repository/category.xml @@ -1,5 +1,8 @@ + + + @@ -36,31 +39,13 @@ - + - + - - - - - - - - - - - - - - - - - - - + @@ -70,6 +55,7 @@ - - + + + diff --git a/targetplatforms/.settings/org.eclipse.core.resources.prefs b/targetplatforms/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/targetplatforms/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/targetplatforms/maven-dependencies.tpd b/targetplatforms/maven-dependencies.tpd index 016f71ad..95a131a9 100644 --- a/targetplatforms/maven-dependencies.tpd +++ b/targetplatforms/maven-dependencies.tpd @@ -1,5 +1,3 @@ -// Provides the jetty websocket artifacts from maven as a feature - target "Wrapper for maven dependencies" @@ -7,33 +5,30 @@ 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" } } + + + diff --git a/targetplatforms/pom.xml b/targetplatforms/pom.xml index d96c58ed..d402b7a5 100644 --- a/targetplatforms/pom.xml +++ b/targetplatforms/pom.xml @@ -17,7 +17,7 @@ 2.7.5 2.7.5 org.eclipse.cbi.targetplatform.tpd.converter - r2020-06.tpd + r2024-09.tpd @@ -29,9 +29,9 @@ - 2020-06 + 2024-09 p2 - https://download.eclipse.org/releases/2020-06 + https://download.eclipse.org/releases/2024-09 tpd diff --git a/targetplatforms/r2021-09_minimum-baseline.target b/targetplatforms/r2021-09_minimum-baseline.target deleted file mode 100644 index bcd45471..00000000 --- a/targetplatforms/r2021-09_minimum-baseline.target +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.apache.aries.spifly - org.apache.aries.spifly.dynamic.bundle - 1.3.6 - jar - - - - - - - org.slf4j - slf4j-api - 2.0.0 - jar - - - - - - - org.apache.logging.log4j - log4j-slf4j2-impl - 2.19.0 - jar - - - org.apache.logging.log4j - log4j-core - 2.19.0 - jar - - - org.apache.logging.log4j - log4j-api - 2.19.0 - jar - - - - - diff --git a/targetplatforms/r2021-09_minimum-baseline.tpd b/targetplatforms/r2021-09_minimum-baseline.tpd deleted file mode 100644 index 3d19995d..00000000 --- a/targetplatforms/r2021-09_minimum-baseline.tpd +++ /dev/null @@ -1,32 +0,0 @@ - -target "2021-09 - Minimum Baseline" with source requirements -include "maven-dependencies.tpd" - -location "http://download.eclipse.org/releases/2021-09" { - org.eclipse.emf.sdk.feature.group - org.eclipse.lsp4j [0.11.0,1.0.0) - org.eclipse.lsp4j.websocket [0.11.0,1.0.0) - org.apache.commons.cli [1.4.0,2.0.0) - com.google.gson [2.8.7,3.0.0) -} - -location "https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository/" { - org.junit [4.12.0,4.13.0) - org.junit.jupiter.api [5.7.1,6.0.0) - com.google.inject [5.0.1,5.0.2) -} - -location "https://download.eclipse.org/elk/updates/releases/0.8.1/" { - org.eclipse.elk.core - org.eclipse.elk.graph - org.eclipse.elk.graph.text - org.eclipse.elk.alg.layered -} - -location "mvn:org.eclipse.jetty:jetty-p2:10.0.13:zip:p2site" { - org.eclipse.jetty.websocket.javax.server -} - -location "https://download.eclipse.org/gemini/updates/web/3.0.4" { - javax.websocket -} \ No newline at end of file diff --git a/targetplatforms/r2022-12.target b/targetplatforms/r2022-12.target deleted file mode 100644 index 4738871e..00000000 --- a/targetplatforms/r2022-12.target +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.apache.aries.spifly - org.apache.aries.spifly.dynamic.bundle - 1.3.6 - jar - - - - - - - org.slf4j - slf4j-api - 2.0.0 - jar - - - - - - - org.apache.logging.log4j - log4j-slf4j2-impl - 2.19.0 - jar - - - org.apache.logging.log4j - log4j-core - 2.19.0 - jar - - - org.apache.logging.log4j - log4j-api - 2.19.0 - jar - - - - - diff --git a/targetplatforms/r2022-12.tpd b/targetplatforms/r2022-12.tpd deleted file mode 100644 index cd04b85f..00000000 --- a/targetplatforms/r2022-12.tpd +++ /dev/null @@ -1,32 +0,0 @@ - -target "2022-12 - Default" with source requirements -include "maven-dependencies.tpd" - -location "http://download.eclipse.org/releases/2022-12" { - org.eclipse.emf.sdk.feature.group - org.eclipse.lsp4j [0.19.0,1.0.0) - org.eclipse.lsp4j.websocket [0.19.0,1.0.0) - org.apache.commons.cli [1.4.0,2.0.0) - com.google.gson[2.8.7,3.0.0) - com.google.inject [5.0.1,5.0.2) -} - -location "https://download.eclipse.org/tools/orbit/downloads/drops/R20221123021534/repository/" { - org.junit [4.13.2,5.0.0) - org.junit.jupiter.api [5.8.1,6.0.0) -} - -location "https://download.eclipse.org/elk/updates/releases/0.8.1/" { - org.eclipse.elk.core - org.eclipse.elk.graph - org.eclipse.elk.graph.text - org.eclipse.elk.alg.layered -} - -location "mvn:org.eclipse.jetty:jetty-p2:10.0.13:zip:p2site" { - org.eclipse.jetty.websocket.javax.server -} - -location "https://download.eclipse.org/gemini/updates/web/3.0.4" { - javax.websocket -} \ No newline at end of file diff --git a/targetplatforms/r2023-09.target b/targetplatforms/r2023-09.target deleted file mode 100644 index 4a41da80..00000000 --- a/targetplatforms/r2023-09.target +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.apache.aries.spifly - org.apache.aries.spifly.dynamic.bundle - 1.3.6 - jar - - - - - - - org.slf4j - slf4j-api - 2.0.0 - jar - - - - - - - org.apache.logging.log4j - log4j-slf4j2-impl - 2.19.0 - jar - - - org.apache.logging.log4j - log4j-core - 2.19.0 - jar - - - org.apache.logging.log4j - log4j-api - 2.19.0 - jar - - - - - diff --git a/targetplatforms/r2023-09.tpd b/targetplatforms/r2023-09.tpd deleted file mode 100644 index f8567b99..00000000 --- a/targetplatforms/r2023-09.tpd +++ /dev/null @@ -1,33 +0,0 @@ - -target "2023-09 - Default" with source requirements -include "maven-dependencies.tpd" - -location "http://download.eclipse.org/releases/2023-09" { - org.eclipse.emf.sdk.feature.group - org.eclipse.lsp4j [0.19.0,1.0.0) - org.eclipse.lsp4j.websocket [0.19.0,1.0.0) - org.apache.commons.cli [1.4.0,2.0.0) - com.google.gson[2.8.7,3.0.0) - com.google.inject [7.0.0,8.0.0) - jakarta.inject.jakarta.inject-api [2.0.1,3.0.0) -} - -location "https://download.eclipse.org/tools/orbit/downloads/drops/R20221123021534/repository/" { - org.junit [4.13.2,5.0.0) - org.junit.jupiter.api [5.8.1,6.0.0) -} - -location "https://download.eclipse.org/elk/updates/releases/0.8.1/" { - org.eclipse.elk.core - org.eclipse.elk.graph - org.eclipse.elk.graph.text - org.eclipse.elk.alg.layered -} - -location "mvn:org.eclipse.jetty:jetty-p2:10.0.13:zip:p2site" { - org.eclipse.jetty.websocket.javax.server -} - -location "https://download.eclipse.org/gemini/updates/web/3.0.4" { - javax.websocket -} \ No newline at end of file diff --git a/targetplatforms/r2023-12.target b/targetplatforms/r2023-12.target new file mode 100644 index 00000000..fbcadfe1 --- /dev/null +++ b/targetplatforms/r2023-12.target @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.apache.logging.log4j + log4j-slf4j2-impl + 2.23.1 + jar + + + org.apache.logging.log4j + log4j-core + 2.23.1 + jar + + + org.apache.logging.log4j + log4j-api + 2.23.1 + jar + + + org.apache.logging.log4j + log4j-1.2-api + 2.23.1 + jar + + + org.apache.logging.log4j + log4j-to-slf4j + 2.23.1 + jar + + + + + diff --git a/targetplatforms/r2023-12.tpd b/targetplatforms/r2023-12.tpd new file mode 100644 index 00000000..8c1459dd --- /dev/null +++ b/targetplatforms/r2023-12.tpd @@ -0,0 +1,34 @@ + +target "2023-12 - Minimum Baseline" with source requirements +include "maven-dependencies.tpd" + +location "http://download.eclipse.org/releases/2023-12" { + org.eclipse.emf.sdk.feature.group + org.eclipse.lsp4j [0.21.1,1.0.0) + org.eclipse.lsp4j.websocket.jakarta [0.21.1,1.0.0) + org.apache.commons.cli [1.6.0,2.0.0) + com.google.gson [2.10.1,3.0.0) +} + +location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12" { + org.junit [4.13.2,5.0.0) + junit-jupiter-api [5.10.1,6.0.0) + jakarta.inject.jakarta.inject-api [2.0.1,3.0.0) + jakarta.servlet-api [4.0.0,5.0.0) + jakarta.websocket-api +} + +location "http://download.eclipse.org/elk/updates/releases/0.8.1/" { + org.eclipse.elk.core lazy + org.eclipse.elk.graph lazy + org.eclipse.elk.graph.text lazy + org.eclipse.elk.alg.layered lazy +} + +location "https://download.eclipse.org/tools/orbit/simrel/maven-jetty/release/12.0.3" { + org.eclipse.jetty.ee10.websocket.jakarta.server lazy + org.eclipse.jetty.ee10.websocket.server lazy + org.eclipse.jetty.websocket.api lazy + +} + diff --git a/targetplatforms/r2024-09.target b/targetplatforms/r2024-09.target new file mode 100644 index 00000000..75cd72ba --- /dev/null +++ b/targetplatforms/r2024-09.target @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.apache.logging.log4j + log4j-slf4j2-impl + 2.23.1 + jar + + + org.apache.logging.log4j + log4j-core + 2.23.1 + jar + + + org.apache.logging.log4j + log4j-api + 2.23.1 + jar + + + org.apache.logging.log4j + log4j-1.2-api + 2.23.1 + jar + + + org.apache.logging.log4j + log4j-to-slf4j + 2.23.1 + jar + + + + + diff --git a/targetplatforms/r2024-09.tpd b/targetplatforms/r2024-09.tpd new file mode 100644 index 00000000..5a76f456 --- /dev/null +++ b/targetplatforms/r2024-09.tpd @@ -0,0 +1,32 @@ + +target "2024-09 - Default" with source requirements +include "maven-dependencies.tpd" + +location "http://download.eclipse.org/releases/2024-09" { + org.eclipse.emf.sdk.feature.group + org.eclipse.lsp4j [0.23.0,1.0.0) + org.eclipse.lsp4j.websocket.jakarta [0.23.0,1.0.0) + org.apache.commons.cli [1.4.0,2.0.0) + com.google.gson[2.8.7,3.0.0) +} + +location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-09" { + org.junit [4.13.2,5.0.0) + junit-jupiter-api [5.11.0,6.0.0) + slf4j.api [2.0.16,3.0.0) + jakarta.inject.jakarta.inject-api [2.0.1,3.0.0) +} + +location "http://download.eclipse.org/elk/updates/releases/0.9.1/" { + org.eclipse.elk.core + org.eclipse.elk.graph + org.eclipse.elk.graph.text + org.eclipse.elk.alg.layered +} + +location "https://download.eclipse.org/tools/orbit/simrel/maven-jetty/release/12.0.12" { + org.eclipse.jetty.ee10.websocket.jakarta.server + org.eclipse.jetty.ee10.websocket.server + org.eclipse.jetty.websocket.api +} +