From 662b87ed37f40d4dd3ba1d9594ecb90dcedd919b Mon Sep 17 00:00:00 2001 From: Florian Pirchner Date: Fri, 21 Jul 2023 09:25:51 +0200 Subject: [PATCH 1/5] Renamed javax.servelt to jakarta.servlet Signed-off-by: Florian Pirchner --- org.eclipse.xtext.web.example.jetty/pom.xml | 2 +- .../web/example/jetty/MyXtextServlet.java | 4 ++-- .../web/example/jetty/ServerLauncher.java | 19 ++++++++++--------- org.eclipse.xtext.web.servlet/pom.xml | 8 ++++---- .../xtext/web/servlet/HttpServiceContext.java | 2 +- .../xtext/web/servlet/HttpSessionWrapper.java | 2 +- .../web/servlet/XtextResourcesServlet.java | 10 +++++----- .../xtext/web/servlet/XtextServlet.java | 8 ++++---- 8 files changed, 28 insertions(+), 27 deletions(-) diff --git a/org.eclipse.xtext.web.example.jetty/pom.xml b/org.eclipse.xtext.web.example.jetty/pom.xml index ead7734c60e..2edd348f6aa 100644 --- a/org.eclipse.xtext.web.example.jetty/pom.xml +++ b/org.eclipse.xtext.web.example.jetty/pom.xml @@ -10,7 +10,7 @@ war - 9.4.51.v20230217 + 11.0.15 diff --git a/org.eclipse.xtext.web.example.jetty/src/main/java/org/eclipse/xtext/web/example/jetty/MyXtextServlet.java b/org.eclipse.xtext.web.example.jetty/src/main/java/org/eclipse/xtext/web/example/jetty/MyXtextServlet.java index ad2f161cdd5..73f2b186fa5 100644 --- a/org.eclipse.xtext.web.example.jetty/src/main/java/org/eclipse/xtext/web/example/jetty/MyXtextServlet.java +++ b/org.eclipse.xtext.web.example.jetty/src/main/java/org/eclipse/xtext/web/example/jetty/MyXtextServlet.java @@ -8,8 +8,8 @@ *******************************************************************************/ package org.eclipse.xtext.web.example.jetty; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; import org.eclipse.xtext.util.DisposableRegistry; import org.eclipse.xtext.web.server.persistence.IResourceBaseProvider; import org.eclipse.xtext.web.server.persistence.ResourceBaseProviderImpl; diff --git a/org.eclipse.xtext.web.example.jetty/src/main/java/org/eclipse/xtext/web/example/jetty/ServerLauncher.java b/org.eclipse.xtext.web.example.jetty/src/main/java/org/eclipse/xtext/web/example/jetty/ServerLauncher.java index 6f84313cae5..4ff450c6070 100644 --- a/org.eclipse.xtext.web.example.jetty/src/main/java/org/eclipse/xtext/web/example/jetty/ServerLauncher.java +++ b/org.eclipse.xtext.web.example.jetty/src/main/java/org/eclipse/xtext/web/example/jetty/ServerLauncher.java @@ -16,7 +16,8 @@ import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.handler.HandlerList; import org.eclipse.jetty.server.handler.ResourceHandler; -import org.eclipse.jetty.util.log.Slf4jLog; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.eclipse.jetty.webapp.Configuration; import org.eclipse.jetty.webapp.MetaInfConfiguration; import org.eclipse.jetty.webapp.WebAppContext; @@ -25,6 +26,8 @@ public class ServerLauncher { + private static final Logger LOG = LoggerFactory.getLogger(ServerLauncher.class); + public static void main(String[] args) { Server server = new Server(new InetSocketAddress("localhost", 8080)); RewriteHandler rewriteHandler = new RewriteHandler(); @@ -45,36 +48,34 @@ public static void main(String[] args) { webAppContext.setContextPath("/"); webAppContext.setConfigurations(new Configuration[] { new AnnotationConfiguration(), new WebXmlConfiguration(), new WebInfConfiguration(), new MetaInfConfiguration() }); - webAppContext.setAttribute(WebInfConfiguration.CONTAINER_JAR_PATTERN, + webAppContext.setAttribute(MetaInfConfiguration.CONTAINER_JAR_PATTERN, ".*/org\\.eclipse\\.xtext\\.web.*,.*/org.webjars.*"); handlerList.setHandlers(new Handler[] { resourceHandler1, resourceHandler2, webAppContext }); rewriteHandler.setHandler(handlerList); - Slf4jLog log = new Slf4jLog(ServerLauncher.class.getName()); try { server.start(); - log.info("Server started " + server.getURI() + "..."); + LOG.info("Server started " + server.getURI() + "..."); new Thread() { public void run() { try { - log.info("Press enter to stop the server..."); + LOG.info("Press enter to stop the server..."); int key = System.in.read(); if (key != -1) { server.stop(); } else { - log.warn( + LOG.warn( "Console input is not available. In order to stop the server, you need to cancel process manually."); } } catch (Exception e) { - log.warn(e); + LOG.warn(e.getMessage()); } } - }.start(); server.join(); } catch (Exception exception) { - log.warn(exception.getMessage()); + LOG.warn(exception.getMessage()); System.exit(1); } } diff --git a/org.eclipse.xtext.web.servlet/pom.xml b/org.eclipse.xtext.web.servlet/pom.xml index 72dcde4814a..eac8ff81b6a 100644 --- a/org.eclipse.xtext.web.servlet/pom.xml +++ b/org.eclipse.xtext.web.servlet/pom.xml @@ -23,10 +23,10 @@ 2.10.1 - javax.servlet - javax.servlet-api - 3.0.1 - provided + jakarta.servlet + jakarta.servlet-api + 5.0.0 + provided diff --git a/org.eclipse.xtext.web.servlet/src/main/java/org/eclipse/xtext/web/servlet/HttpServiceContext.java b/org.eclipse.xtext.web.servlet/src/main/java/org/eclipse/xtext/web/servlet/HttpServiceContext.java index 1148058ec68..d536f0fbf57 100644 --- a/org.eclipse.xtext.web.servlet/src/main/java/org/eclipse/xtext/web/servlet/HttpServiceContext.java +++ b/org.eclipse.xtext.web.servlet/src/main/java/org/eclipse/xtext/web/servlet/HttpServiceContext.java @@ -17,7 +17,7 @@ import java.util.Map; import java.util.Set; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.eclipse.xtext.web.server.IServiceContext; import org.eclipse.xtext.web.server.ISession; diff --git a/org.eclipse.xtext.web.servlet/src/main/java/org/eclipse/xtext/web/servlet/HttpSessionWrapper.java b/org.eclipse.xtext.web.servlet/src/main/java/org/eclipse/xtext/web/servlet/HttpSessionWrapper.java index f9b658ccb24..22c67d2bdb5 100644 --- a/org.eclipse.xtext.web.servlet/src/main/java/org/eclipse/xtext/web/servlet/HttpSessionWrapper.java +++ b/org.eclipse.xtext.web.servlet/src/main/java/org/eclipse/xtext/web/servlet/HttpSessionWrapper.java @@ -8,7 +8,7 @@ */ package org.eclipse.xtext.web.servlet; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; import org.eclipse.xtext.web.server.ISession; import org.eclipse.xtext.xbase.lib.Functions.Function0; diff --git a/org.eclipse.xtext.web.servlet/src/main/java/org/eclipse/xtext/web/servlet/XtextResourcesServlet.java b/org.eclipse.xtext.web.servlet/src/main/java/org/eclipse/xtext/web/servlet/XtextResourcesServlet.java index 28f9bac9d11..5254c743bb3 100644 --- a/org.eclipse.xtext.web.servlet/src/main/java/org/eclipse/xtext/web/servlet/XtextResourcesServlet.java +++ b/org.eclipse.xtext.web.servlet/src/main/java/org/eclipse/xtext/web/servlet/XtextResourcesServlet.java @@ -12,11 +12,11 @@ import java.io.IOException; import java.io.InputStream; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.eclipse.xtext.web.server.XtextServiceDispatcher; import org.eclipse.xtext.xbase.lib.Exceptions; diff --git a/org.eclipse.xtext.web.servlet/src/main/java/org/eclipse/xtext/web/servlet/XtextServlet.java b/org.eclipse.xtext.web.servlet/src/main/java/org/eclipse/xtext/web/servlet/XtextServlet.java index 76ddbf26320..0a46a6981cc 100644 --- a/org.eclipse.xtext.web.servlet/src/main/java/org/eclipse/xtext/web/servlet/XtextServlet.java +++ b/org.eclipse.xtext.web.servlet/src/main/java/org/eclipse/xtext/web/servlet/XtextServlet.java @@ -11,10 +11,10 @@ import java.io.IOException; import java.util.Set; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.log4j.Logger; import org.eclipse.emf.common.util.URI; From 721a61119817b8f5f7ac4caea0ed94fb0b070dea Mon Sep 17 00:00:00 2001 From: Florian Pirchner Date: Fri, 21 Jul 2023 11:55:58 +0200 Subject: [PATCH 2/5] Added WebAppConfiguration to avoid classloading problems. Signed-off-by: Florian Pirchner --- .../org/eclipse/xtext/web/example/jetty/ServerLauncher.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/org.eclipse.xtext.web.example.jetty/src/main/java/org/eclipse/xtext/web/example/jetty/ServerLauncher.java b/org.eclipse.xtext.web.example.jetty/src/main/java/org/eclipse/xtext/web/example/jetty/ServerLauncher.java index 4ff450c6070..62a2eb897a6 100644 --- a/org.eclipse.xtext.web.example.jetty/src/main/java/org/eclipse/xtext/web/example/jetty/ServerLauncher.java +++ b/org.eclipse.xtext.web.example.jetty/src/main/java/org/eclipse/xtext/web/example/jetty/ServerLauncher.java @@ -20,6 +20,7 @@ import org.slf4j.LoggerFactory; import org.eclipse.jetty.webapp.Configuration; import org.eclipse.jetty.webapp.MetaInfConfiguration; +import org.eclipse.jetty.webapp.WebAppConfiguration; import org.eclipse.jetty.webapp.WebAppContext; import org.eclipse.jetty.webapp.WebInfConfiguration; import org.eclipse.jetty.webapp.WebXmlConfiguration; @@ -47,7 +48,7 @@ public static void main(String[] args) { webAppContext.setResourceBase("../org.eclipse.xtext.web/src/main/js"); webAppContext.setContextPath("/"); webAppContext.setConfigurations(new Configuration[] { new AnnotationConfiguration(), new WebXmlConfiguration(), - new WebInfConfiguration(), new MetaInfConfiguration() }); + new WebInfConfiguration(), new MetaInfConfiguration(), new WebAppConfiguration() }); webAppContext.setAttribute(MetaInfConfiguration.CONTAINER_JAR_PATTERN, ".*/org\\.eclipse\\.xtext\\.web.*,.*/org.webjars.*"); From 568a546063823fb7ef1b1e7ffbabd8a81914fb63 Mon Sep 17 00:00:00 2001 From: Florian Pirchner Date: Fri, 21 Jul 2023 12:10:23 +0200 Subject: [PATCH 3/5] Ported WebIntegrationFragment to jakarta.servlet. Signed-off-by: Florian Pirchner --- .../xtext/xtext/generator/web/WebIntegrationFragment.xtend | 6 +++--- .../xtext/xtext/generator/web/WebIntegrationFragment.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/web/WebIntegrationFragment.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/web/WebIntegrationFragment.xtend index e48d002c04b..50f97f2e913 100644 --- a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/web/WebIntegrationFragment.xtend +++ b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/web/WebIntegrationFragment.xtend @@ -782,7 +782,7 @@ class WebIntegrationFragment extends AbstractXtextGeneratorFragment { * Deploy this class into a servlet container to enable DSL-specific services. */ «IF useServlet3Api» - @«new TypeReference("javax.servlet.annotation.WebServlet")»(name = 'XtextServices', urlPatterns = '/xtext-service/*') + @«new TypeReference("jakarta.servlet.annotation.WebServlet")»(name = 'XtextServices', urlPatterns = '/xtext-service/*') «ENDIF» class «grammar.servletClass.simpleName» extends «'org.eclipse.xtext.web.servlet.XtextServlet'.typeRef» { @@ -813,7 +813,7 @@ class WebIntegrationFragment extends AbstractXtextGeneratorFragment { * Deploy this class into a servlet container to enable DSL-specific services. */ «IF useServlet3Api» - @«new TypeReference("javax.servlet.annotation.WebServlet")»(name = "XtextServices", urlPatterns = "/xtext-service/*") + @«new TypeReference("jakarta.servlet.annotation.WebServlet")»(name = "XtextServices", urlPatterns = "/xtext-service/*") «ENDIF» public class «grammar.servletClass.simpleName» extends «'org.eclipse.xtext.web.servlet.XtextServlet'.typeRef» { @@ -821,7 +821,7 @@ class WebIntegrationFragment extends AbstractXtextGeneratorFragment { «DisposableRegistry» disposableRegistry; - public void init() throws «'javax.servlet.ServletException'.typeRef» { + public void init() throws «'jakarta.servlet.ServletException'.typeRef» { super.init(); «'com.google.inject.Injector'.typeRef» injector = new «grammar.webSetup»().createInjectorAndDoEMFRegistration(); this.disposableRegistry = injector.getInstance(«DisposableRegistry».class); diff --git a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/web/WebIntegrationFragment.java b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/web/WebIntegrationFragment.java index ea4e9aa477a..c0a99df9f35 100644 --- a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/web/WebIntegrationFragment.java +++ b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/web/WebIntegrationFragment.java @@ -1903,7 +1903,7 @@ protected void appendTo(StringConcatenationClient.TargetStringConcatenation _bui { if (WebIntegrationFragment.this.useServlet3Api) { _builder.append("@"); - TypeReference _typeReference = new TypeReference("javax.servlet.annotation.WebServlet"); + TypeReference _typeReference = new TypeReference("jakarta.servlet.annotation.WebServlet"); _builder.append(_typeReference); _builder.append("(name = \'XtextServices\', urlPatterns = \'/xtext-service/*\')"); _builder.newLineIfNotEmpty(); @@ -1996,7 +1996,7 @@ protected void appendTo(StringConcatenationClient.TargetStringConcatenation _bui { if (WebIntegrationFragment.this.useServlet3Api) { _builder.append("@"); - TypeReference _typeReference = new TypeReference("javax.servlet.annotation.WebServlet"); + TypeReference _typeReference = new TypeReference("jakarta.servlet.annotation.WebServlet"); _builder.append(_typeReference); _builder.append("(name = \"XtextServices\", urlPatterns = \"/xtext-service/*\")"); _builder.newLineIfNotEmpty(); @@ -2025,7 +2025,7 @@ protected void appendTo(StringConcatenationClient.TargetStringConcatenation _bui _builder.newLine(); _builder.append("\t"); _builder.append("public void init() throws "); - TypeReference _typeRef_1 = TypeReference.typeRef("javax.servlet.ServletException"); + TypeReference _typeRef_1 = TypeReference.typeRef("jakarta.servlet.ServletException"); _builder.append(_typeRef_1, "\t"); _builder.append(" {"); _builder.newLineIfNotEmpty(); From 7929abaa83d9f233e426a6db8f4b056f5fba04f1 Mon Sep 17 00:00:00 2001 From: Florian Pirchner Date: Wed, 26 Jul 2023 07:27:11 +0200 Subject: [PATCH 4/5] Also migrated WebIntegrationFragment and WebProjectDescriptor Signed-off-by: Florian Pirchner --- .../web/WebIntegrationFragment.xtend | 34 ++-- .../generator/web/WebIntegrationFragment.java | 156 ++++++++++-------- .../xtext/wizard/WebProjectDescriptor.xtend | 4 +- .../xtext/wizard/WebProjectDescriptor.java | 4 +- 4 files changed, 114 insertions(+), 84 deletions(-) diff --git a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/web/WebIntegrationFragment.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/web/WebIntegrationFragment.xtend index 50f97f2e913..93a6dc09943 100644 --- a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/web/WebIntegrationFragment.xtend +++ b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/web/WebIntegrationFragment.xtend @@ -682,6 +682,9 @@ class WebIntegrationFragment extends AbstractXtextGeneratorFragment { * Just execute it and point a web browser to http://localhost:8080/ */ class «grammar.serverLauncherClass.simpleName» { + + static final «'org.slf4j.Logger'.typeRef» LOG = «'org.slf4j.LoggerFactory'.typeRef».getLogger(«grammar.serverLauncherClass.simpleName»); + def static void main(String[] args) { val server = new «'org.eclipse.jetty.server.Server'.typeRef»(new «'java.net.InetSocketAddress'.typeRef»('localhost', 8080)) server.handler = new «'org.eclipse.jetty.webapp.WebAppContext'.typeRef» => [ @@ -692,27 +695,27 @@ class WebIntegrationFragment extends AbstractXtextGeneratorFragment { new «'org.eclipse.jetty.annotations.AnnotationConfiguration'.typeRef», new «'org.eclipse.jetty.webapp.WebXmlConfiguration'.typeRef», new «'org.eclipse.jetty.webapp.WebInfConfiguration'.typeRef», - new «'org.eclipse.jetty.webapp.MetaInfConfiguration'.typeRef» + new «'org.eclipse.jetty.webapp.MetaInfConfiguration'.typeRef», + new «'org.eclipse.jetty.webapp.WebAppConfiguration'.typeRef» ] - setAttribute(«'org.eclipse.jetty.webapp.WebInfConfiguration'.typeRef».CONTAINER_JAR_PATTERN, '.*/«projectConfig.web.name.replace('.', '\\\\.')»/.*,.*\\.jar') + setAttribute(«'org.eclipse.jetty.webapp.MetaInfConfiguration'.typeRef».CONTAINER_JAR_PATTERN, '.*/«projectConfig.web.name.replace('.', '\\\\.')»/.*,.*\\.jar') setInitParameter("org.eclipse.jetty.servlet.Default.useFileMappedBuffer", "false") ] - val log = new «'org.eclipse.jetty.util.log.Slf4jLog'.typeRef»(«grammar.serverLauncherClass.simpleName».name) try { server.start - log.info('Server started ' + server.getURI + '...') + LOG.info('Server started ' + server.getURI + '...') new Thread[ log.info('Press enter to stop the server...') val key = System.in.read if (key != -1) { server.stop } else { - log.warn('Console input is not available. In order to stop the server, you need to cancel process manually.') + LOG.warn('Console input is not available. In order to stop the server, you need to cancel process manually.') } ].start server.join } catch (Exception exception) { - log.warn(exception.message) + LOG.warn(exception.message) System.exit(1) } } @@ -725,6 +728,9 @@ class WebIntegrationFragment extends AbstractXtextGeneratorFragment { * Just execute it and point a web browser to http://localhost:8080/ */ public class «grammar.serverLauncherClass.simpleName» { + + private static final «'org.slf4j.Logger'.typeRef» LOG = «'org.slf4j.LoggerFactory'.typeRef».getLogger(«grammar.serverLauncherClass.simpleName».class); + public static void main(String[] args) { «'org.eclipse.jetty.server.Server'.typeRef» server = new «'org.eclipse.jetty.server.Server'.typeRef»(new «'java.net.InetSocketAddress'.typeRef»("localhost", 8080)); «'org.eclipse.jetty.webapp.WebAppContext'.typeRef» ctx = new «'org.eclipse.jetty.webapp.WebAppContext'.typeRef»(); @@ -735,37 +741,37 @@ class WebIntegrationFragment extends AbstractXtextGeneratorFragment { new «'org.eclipse.jetty.annotations.AnnotationConfiguration'.typeRef»(), new «'org.eclipse.jetty.webapp.WebXmlConfiguration'.typeRef»(), new «'org.eclipse.jetty.webapp.WebInfConfiguration'.typeRef»(), - new «'org.eclipse.jetty.webapp.MetaInfConfiguration'.typeRef»() + new «'org.eclipse.jetty.webapp.MetaInfConfiguration'.typeRef»(), + new «'org.eclipse.jetty.webapp.WebAppConfiguration'.typeRef»() }); - ctx.setAttribute(«'org.eclipse.jetty.webapp.WebInfConfiguration'.typeRef».CONTAINER_JAR_PATTERN, + ctx.setAttribute(«'org.eclipse.jetty.webapp.MetaInfConfiguration'.typeRef».CONTAINER_JAR_PATTERN, ".*/«projectConfig.web.name.replace('.', '\\\\.')»/.*,.*\\.jar"); ctx.setInitParameter("org.eclipse.jetty.servlet.Default.useFileMappedBuffer", "false"); server.setHandler(ctx); - «'org.eclipse.jetty.util.log.Slf4jLog'.typeRef» log = new «'org.eclipse.jetty.util.log.Slf4jLog'.typeRef»(«grammar.serverLauncherClass.simpleName».class.getName()); try { server.start(); - log.info("Server started " + server.getURI() + "..."); + LOG.info("Server started " + server.getURI() + "..."); new Thread() { public void run() { try { - log.info("Press enter to stop the server..."); + LOG.info("Press enter to stop the server..."); int key = System.in.read(); if (key != -1) { server.stop(); } else { - log.warn( + LOG.warn( "Console input is not available. In order to stop the server, you need to cancel process manually."); } } catch (Exception e) { - log.warn(e); + LOG.warn(e.getMessage()); } } }.start(); server.join(); } catch (Exception exception) { - log.warn(exception.getMessage()); + LOG.warn(exception.getMessage()); System.exit(1); } } diff --git a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/web/WebIntegrationFragment.java b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/web/WebIntegrationFragment.java index c0a99df9f35..fed12ebbe0e 100644 --- a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/web/WebIntegrationFragment.java +++ b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/web/WebIntegrationFragment.java @@ -1542,21 +1542,37 @@ protected void appendTo(StringConcatenationClient.TargetStringConcatenation _bui _builder.append(" {"); _builder.newLineIfNotEmpty(); _builder.append("\t"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("static final "); + TypeReference _typeRef = TypeReference.typeRef("org.slf4j.Logger"); + _builder.append(_typeRef, "\t"); + _builder.append(" LOG = "); + TypeReference _typeRef_1 = TypeReference.typeRef("org.slf4j.LoggerFactory"); + _builder.append(_typeRef_1, "\t"); + _builder.append(".getLogger("); + String _simpleName_1 = WebIntegrationFragment.this.getServerLauncherClass(WebIntegrationFragment.this.getGrammar()).getSimpleName(); + _builder.append(_simpleName_1, "\t"); + _builder.append(");"); + _builder.newLineIfNotEmpty(); + _builder.append("\t"); + _builder.newLine(); + _builder.append("\t"); _builder.append("def static void main(String[] args) {"); _builder.newLine(); _builder.append("\t\t"); _builder.append("val server = new "); - TypeReference _typeRef = TypeReference.typeRef("org.eclipse.jetty.server.Server"); - _builder.append(_typeRef, "\t\t"); + TypeReference _typeRef_2 = TypeReference.typeRef("org.eclipse.jetty.server.Server"); + _builder.append(_typeRef_2, "\t\t"); _builder.append("(new "); - TypeReference _typeRef_1 = TypeReference.typeRef("java.net.InetSocketAddress"); - _builder.append(_typeRef_1, "\t\t"); + TypeReference _typeRef_3 = TypeReference.typeRef("java.net.InetSocketAddress"); + _builder.append(_typeRef_3, "\t\t"); _builder.append("(\'localhost\', 8080))"); _builder.newLineIfNotEmpty(); _builder.append("\t\t"); _builder.append("server.handler = new "); - TypeReference _typeRef_2 = TypeReference.typeRef("org.eclipse.jetty.webapp.WebAppContext"); - _builder.append(_typeRef_2, "\t\t"); + TypeReference _typeRef_4 = TypeReference.typeRef("org.eclipse.jetty.webapp.WebAppContext"); + _builder.append(_typeRef_4, "\t\t"); _builder.append(" => ["); _builder.newLineIfNotEmpty(); _builder.append("\t\t\t"); @@ -1579,34 +1595,40 @@ protected void appendTo(StringConcatenationClient.TargetStringConcatenation _bui _builder.newLine(); _builder.append("\t\t\t\t"); _builder.append("new "); - TypeReference _typeRef_3 = TypeReference.typeRef("org.eclipse.jetty.annotations.AnnotationConfiguration"); - _builder.append(_typeRef_3, "\t\t\t\t"); + TypeReference _typeRef_5 = TypeReference.typeRef("org.eclipse.jetty.annotations.AnnotationConfiguration"); + _builder.append(_typeRef_5, "\t\t\t\t"); _builder.append(","); _builder.newLineIfNotEmpty(); _builder.append("\t\t\t\t"); _builder.append("new "); - TypeReference _typeRef_4 = TypeReference.typeRef("org.eclipse.jetty.webapp.WebXmlConfiguration"); - _builder.append(_typeRef_4, "\t\t\t\t"); + TypeReference _typeRef_6 = TypeReference.typeRef("org.eclipse.jetty.webapp.WebXmlConfiguration"); + _builder.append(_typeRef_6, "\t\t\t\t"); _builder.append(","); _builder.newLineIfNotEmpty(); _builder.append("\t\t\t\t"); _builder.append("new "); - TypeReference _typeRef_5 = TypeReference.typeRef("org.eclipse.jetty.webapp.WebInfConfiguration"); - _builder.append(_typeRef_5, "\t\t\t\t"); + TypeReference _typeRef_7 = TypeReference.typeRef("org.eclipse.jetty.webapp.WebInfConfiguration"); + _builder.append(_typeRef_7, "\t\t\t\t"); _builder.append(","); _builder.newLineIfNotEmpty(); _builder.append("\t\t\t\t"); _builder.append("new "); - TypeReference _typeRef_6 = TypeReference.typeRef("org.eclipse.jetty.webapp.MetaInfConfiguration"); - _builder.append(_typeRef_6, "\t\t\t\t"); + TypeReference _typeRef_8 = TypeReference.typeRef("org.eclipse.jetty.webapp.MetaInfConfiguration"); + _builder.append(_typeRef_8, "\t\t\t\t"); + _builder.append(","); + _builder.newLineIfNotEmpty(); + _builder.append("\t\t\t\t"); + _builder.append("new "); + TypeReference _typeRef_9 = TypeReference.typeRef("org.eclipse.jetty.webapp.WebAppConfiguration"); + _builder.append(_typeRef_9, "\t\t\t\t"); _builder.newLineIfNotEmpty(); _builder.append("\t\t\t"); _builder.append("]"); _builder.newLine(); _builder.append("\t\t\t"); _builder.append("setAttribute("); - TypeReference _typeRef_7 = TypeReference.typeRef("org.eclipse.jetty.webapp.WebInfConfiguration"); - _builder.append(_typeRef_7, "\t\t\t"); + TypeReference _typeRef_10 = TypeReference.typeRef("org.eclipse.jetty.webapp.MetaInfConfiguration"); + _builder.append(_typeRef_10, "\t\t\t"); _builder.append(".CONTAINER_JAR_PATTERN, \'.*/"); String _replace_1 = WebIntegrationFragment.this.getProjectConfig().getWeb().getName().replace(".", "\\\\."); _builder.append(_replace_1, "\t\t\t"); @@ -1619,22 +1641,13 @@ protected void appendTo(StringConcatenationClient.TargetStringConcatenation _bui _builder.append("]"); _builder.newLine(); _builder.append("\t\t"); - _builder.append("val log = new "); - TypeReference _typeRef_8 = TypeReference.typeRef("org.eclipse.jetty.util.log.Slf4jLog"); - _builder.append(_typeRef_8, "\t\t"); - _builder.append("("); - String _simpleName_1 = WebIntegrationFragment.this.getServerLauncherClass(WebIntegrationFragment.this.getGrammar()).getSimpleName(); - _builder.append(_simpleName_1, "\t\t"); - _builder.append(".name)"); - _builder.newLineIfNotEmpty(); - _builder.append("\t\t"); _builder.append("try {"); _builder.newLine(); _builder.append("\t\t\t"); _builder.append("server.start"); _builder.newLine(); _builder.append("\t\t\t"); - _builder.append("log.info(\'Server started \' + server.getURI + \'...\')"); + _builder.append("LOG.info(\'Server started \' + server.getURI + \'...\')"); _builder.newLine(); _builder.append("\t\t\t"); _builder.append("new Thread["); @@ -1655,7 +1668,7 @@ protected void appendTo(StringConcatenationClient.TargetStringConcatenation _bui _builder.append("} else {"); _builder.newLine(); _builder.append("\t\t\t\t\t"); - _builder.append("log.warn(\'Console input is not available. In order to stop the server, you need to cancel process manually.\')"); + _builder.append("LOG.warn(\'Console input is not available. In order to stop the server, you need to cancel process manually.\')"); _builder.newLine(); _builder.append("\t\t\t\t"); _builder.append("}"); @@ -1670,7 +1683,7 @@ protected void appendTo(StringConcatenationClient.TargetStringConcatenation _bui _builder.append("} catch (Exception exception) {"); _builder.newLine(); _builder.append("\t\t\t"); - _builder.append("log.warn(exception.message)"); + _builder.append("LOG.warn(exception.message)"); _builder.newLine(); _builder.append("\t\t\t"); _builder.append("System.exit(1)"); @@ -1708,25 +1721,41 @@ protected void appendTo(StringConcatenationClient.TargetStringConcatenation _bui _builder.append(" {"); _builder.newLineIfNotEmpty(); _builder.append("\t"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("private static final "); + TypeReference _typeRef = TypeReference.typeRef("org.slf4j.Logger"); + _builder.append(_typeRef, "\t"); + _builder.append(" LOG = "); + TypeReference _typeRef_1 = TypeReference.typeRef("org.slf4j.LoggerFactory"); + _builder.append(_typeRef_1, "\t"); + _builder.append(".getLogger("); + String _simpleName_1 = WebIntegrationFragment.this.getServerLauncherClass(WebIntegrationFragment.this.getGrammar()).getSimpleName(); + _builder.append(_simpleName_1, "\t"); + _builder.append(".class);"); + _builder.newLineIfNotEmpty(); + _builder.append("\t"); + _builder.newLine(); + _builder.append("\t"); _builder.append("public static void main(String[] args) {"); _builder.newLine(); _builder.append("\t\t"); - TypeReference _typeRef = TypeReference.typeRef("org.eclipse.jetty.server.Server"); - _builder.append(_typeRef, "\t\t"); + TypeReference _typeRef_2 = TypeReference.typeRef("org.eclipse.jetty.server.Server"); + _builder.append(_typeRef_2, "\t\t"); _builder.append(" server = new "); - TypeReference _typeRef_1 = TypeReference.typeRef("org.eclipse.jetty.server.Server"); - _builder.append(_typeRef_1, "\t\t"); + TypeReference _typeRef_3 = TypeReference.typeRef("org.eclipse.jetty.server.Server"); + _builder.append(_typeRef_3, "\t\t"); _builder.append("(new "); - TypeReference _typeRef_2 = TypeReference.typeRef("java.net.InetSocketAddress"); - _builder.append(_typeRef_2, "\t\t"); + TypeReference _typeRef_4 = TypeReference.typeRef("java.net.InetSocketAddress"); + _builder.append(_typeRef_4, "\t\t"); _builder.append("(\"localhost\", 8080));"); _builder.newLineIfNotEmpty(); _builder.append("\t\t"); - TypeReference _typeRef_3 = TypeReference.typeRef("org.eclipse.jetty.webapp.WebAppContext"); - _builder.append(_typeRef_3, "\t\t"); + TypeReference _typeRef_5 = TypeReference.typeRef("org.eclipse.jetty.webapp.WebAppContext"); + _builder.append(_typeRef_5, "\t\t"); _builder.append(" ctx = new "); - TypeReference _typeRef_4 = TypeReference.typeRef("org.eclipse.jetty.webapp.WebAppContext"); - _builder.append(_typeRef_4, "\t\t"); + TypeReference _typeRef_6 = TypeReference.typeRef("org.eclipse.jetty.webapp.WebAppContext"); + _builder.append(_typeRef_6, "\t\t"); _builder.append("();"); _builder.newLineIfNotEmpty(); _builder.append("\t\t"); @@ -1740,32 +1769,38 @@ protected void appendTo(StringConcatenationClient.TargetStringConcatenation _bui _builder.newLine(); _builder.append("\t\t"); _builder.append("ctx.setConfigurations(new "); - TypeReference _typeRef_5 = TypeReference.typeRef("org.eclipse.jetty.webapp.Configuration"); - _builder.append(_typeRef_5, "\t\t"); + TypeReference _typeRef_7 = TypeReference.typeRef("org.eclipse.jetty.webapp.Configuration"); + _builder.append(_typeRef_7, "\t\t"); _builder.append("[] {"); _builder.newLineIfNotEmpty(); _builder.append("\t\t\t"); _builder.append("new "); - TypeReference _typeRef_6 = TypeReference.typeRef("org.eclipse.jetty.annotations.AnnotationConfiguration"); - _builder.append(_typeRef_6, "\t\t\t"); + TypeReference _typeRef_8 = TypeReference.typeRef("org.eclipse.jetty.annotations.AnnotationConfiguration"); + _builder.append(_typeRef_8, "\t\t\t"); _builder.append("(),"); _builder.newLineIfNotEmpty(); _builder.append("\t\t\t"); _builder.append("new "); - TypeReference _typeRef_7 = TypeReference.typeRef("org.eclipse.jetty.webapp.WebXmlConfiguration"); - _builder.append(_typeRef_7, "\t\t\t"); + TypeReference _typeRef_9 = TypeReference.typeRef("org.eclipse.jetty.webapp.WebXmlConfiguration"); + _builder.append(_typeRef_9, "\t\t\t"); _builder.append("(),"); _builder.newLineIfNotEmpty(); _builder.append("\t\t\t"); _builder.append("new "); - TypeReference _typeRef_8 = TypeReference.typeRef("org.eclipse.jetty.webapp.WebInfConfiguration"); - _builder.append(_typeRef_8, "\t\t\t"); + TypeReference _typeRef_10 = TypeReference.typeRef("org.eclipse.jetty.webapp.WebInfConfiguration"); + _builder.append(_typeRef_10, "\t\t\t"); _builder.append("(),"); _builder.newLineIfNotEmpty(); _builder.append("\t\t\t"); _builder.append("new "); - TypeReference _typeRef_9 = TypeReference.typeRef("org.eclipse.jetty.webapp.MetaInfConfiguration"); - _builder.append(_typeRef_9, "\t\t\t"); + TypeReference _typeRef_11 = TypeReference.typeRef("org.eclipse.jetty.webapp.MetaInfConfiguration"); + _builder.append(_typeRef_11, "\t\t\t"); + _builder.append("(),"); + _builder.newLineIfNotEmpty(); + _builder.append("\t\t\t"); + _builder.append("new "); + TypeReference _typeRef_12 = TypeReference.typeRef("org.eclipse.jetty.webapp.WebAppConfiguration"); + _builder.append(_typeRef_12, "\t\t\t"); _builder.append("()"); _builder.newLineIfNotEmpty(); _builder.append("\t\t"); @@ -1773,8 +1808,8 @@ protected void appendTo(StringConcatenationClient.TargetStringConcatenation _bui _builder.newLine(); _builder.append("\t\t"); _builder.append("ctx.setAttribute("); - TypeReference _typeRef_10 = TypeReference.typeRef("org.eclipse.jetty.webapp.WebInfConfiguration"); - _builder.append(_typeRef_10, "\t\t"); + TypeReference _typeRef_13 = TypeReference.typeRef("org.eclipse.jetty.webapp.MetaInfConfiguration"); + _builder.append(_typeRef_13, "\t\t"); _builder.append(".CONTAINER_JAR_PATTERN,"); _builder.newLineIfNotEmpty(); _builder.append("\t\t\t"); @@ -1790,24 +1825,13 @@ protected void appendTo(StringConcatenationClient.TargetStringConcatenation _bui _builder.append("server.setHandler(ctx);"); _builder.newLine(); _builder.append("\t\t"); - TypeReference _typeRef_11 = TypeReference.typeRef("org.eclipse.jetty.util.log.Slf4jLog"); - _builder.append(_typeRef_11, "\t\t"); - _builder.append(" log = new "); - TypeReference _typeRef_12 = TypeReference.typeRef("org.eclipse.jetty.util.log.Slf4jLog"); - _builder.append(_typeRef_12, "\t\t"); - _builder.append("("); - String _simpleName_1 = WebIntegrationFragment.this.getServerLauncherClass(WebIntegrationFragment.this.getGrammar()).getSimpleName(); - _builder.append(_simpleName_1, "\t\t"); - _builder.append(".class.getName());"); - _builder.newLineIfNotEmpty(); - _builder.append("\t\t"); _builder.append("try {"); _builder.newLine(); _builder.append("\t\t\t"); _builder.append("server.start();"); _builder.newLine(); _builder.append("\t\t\t"); - _builder.append("log.info(\"Server started \" + server.getURI() + \"...\");"); + _builder.append("LOG.info(\"Server started \" + server.getURI() + \"...\");"); _builder.newLine(); _builder.append("\t\t\t"); _builder.append("new Thread() {"); @@ -1820,7 +1844,7 @@ protected void appendTo(StringConcatenationClient.TargetStringConcatenation _bui _builder.append("try {"); _builder.newLine(); _builder.append("\t\t\t\t\t\t"); - _builder.append("log.info(\"Press enter to stop the server...\");"); + _builder.append("LOG.info(\"Press enter to stop the server...\");"); _builder.newLine(); _builder.append("\t\t\t\t\t\t"); _builder.append("int key = System.in.read();"); @@ -1835,7 +1859,7 @@ protected void appendTo(StringConcatenationClient.TargetStringConcatenation _bui _builder.append("} else {"); _builder.newLine(); _builder.append("\t\t\t\t\t\t\t"); - _builder.append("log.warn("); + _builder.append("LOG.warn("); _builder.newLine(); _builder.append("\t\t\t\t\t\t\t\t\t"); _builder.append("\"Console input is not available. In order to stop the server, you need to cancel process manually.\");"); @@ -1847,7 +1871,7 @@ protected void appendTo(StringConcatenationClient.TargetStringConcatenation _bui _builder.append("} catch (Exception e) {"); _builder.newLine(); _builder.append("\t\t\t\t\t\t"); - _builder.append("log.warn(e);"); + _builder.append("LOG.warn(e.getMessage());"); _builder.newLine(); _builder.append("\t\t\t\t\t"); _builder.append("}"); @@ -1866,7 +1890,7 @@ protected void appendTo(StringConcatenationClient.TargetStringConcatenation _bui _builder.append("} catch (Exception exception) {"); _builder.newLine(); _builder.append("\t\t\t"); - _builder.append("log.warn(exception.getMessage());"); + _builder.append("LOG.warn(exception.getMessage());"); _builder.newLine(); _builder.append("\t\t\t"); _builder.append("System.exit(1);"); diff --git a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/WebProjectDescriptor.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/WebProjectDescriptor.xtend index c9f481a22ad..aa6a19ddc27 100644 --- a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/WebProjectDescriptor.xtend +++ b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/WebProjectDescriptor.xtend @@ -18,8 +18,8 @@ class WebProjectDescriptor extends ProjectDescriptor { static val REQUIREJS_VERSION = '2.3.6' // static val REQUIREJS_TEXT_VERSION = '2.0.15' static val JQUERY_VERSION = '3.6.0' - static val JETTY_VERSION = '9.4.51.v20230217' - static val SLF4J_VERSION = '1.7.33' + static val JETTY_VERSION = '11.0.15' + static val SLF4J_VERSION = '2.0.5' static val ACE_VERSION = '1.3.3' override getUpstreamProjects() { diff --git a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/WebProjectDescriptor.java b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/WebProjectDescriptor.java index 313e647e614..04f36d6f5f0 100644 --- a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/WebProjectDescriptor.java +++ b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/WebProjectDescriptor.java @@ -25,9 +25,9 @@ public class WebProjectDescriptor extends ProjectDescriptor { private static final String JQUERY_VERSION = "3.6.0"; - private static final String JETTY_VERSION = "9.4.51.v20230217"; + private static final String JETTY_VERSION = "11.0.15"; - private static final String SLF4J_VERSION = "1.7.33"; + private static final String SLF4J_VERSION = "2.0.5"; private static final String ACE_VERSION = "1.3.3"; From d9e100afa3d460cc53c056a2f525c0233b1e2cdf Mon Sep 17 00:00:00 2001 From: Florian Pirchner Date: Wed, 26 Jul 2023 08:21:07 +0200 Subject: [PATCH 5/5] Fixed CliWizardIntegrationTest and executed tests locally. Signed-off-by: Florian Pirchner --- .../full/full.parent/full.web/build.gradle | 4 ++-- .../gradle/gradle.parent/gradle.web/build.gradle | 4 ++-- .../mavenTycho/mavenTycho.parent/mavenTycho.web/pom.xml | 6 +++--- .../mavenTychoJ17.parent/mavenTychoJ17.web/pom.xml | 6 +++--- .../mavenTychoP2.parent/mavenTychoP2.web/pom.xml | 6 +++--- .../mavenTychoP2J17.parent/mavenTychoP2J17.web/pom.xml | 6 +++--- .../plainMaven/plainMaven.parent/plainMaven.web/pom.xml | 6 +++--- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.web/build.gradle b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.web/build.gradle index 2c634f3f75e..77126ff9017 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.web/build.gradle +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.web/build.gradle @@ -10,8 +10,8 @@ dependencies { api "org.webjars:requirejs:2.3.6" api "org.webjars:jquery:3.6.0" api "org.webjars:ace:1.3.3" - providedCompile "org.eclipse.jetty:jetty-annotations:9.4.51.v20230217" - providedCompile "org.slf4j:slf4j-simple:1.7.33" + providedCompile "org.eclipse.jetty:jetty-annotations:11.0.15" + providedCompile "org.slf4j:slf4j-simple:2.0.5" } task jettyRun(type:JavaExec) { dependsOn(sourceSets.main.runtimeClasspath) diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/gradle/gradle.parent/gradle.web/build.gradle b/org.eclipse.xtext.tests/testdata/wizard-expectations/gradle/gradle.parent/gradle.web/build.gradle index d03e04ee388..1ca73e0b193 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/gradle/gradle.parent/gradle.web/build.gradle +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/gradle/gradle.parent/gradle.web/build.gradle @@ -10,8 +10,8 @@ dependencies { api "org.webjars:requirejs:2.3.6" api "org.webjars:jquery:3.6.0" api "org.webjars:ace:1.3.3" - providedCompile "org.eclipse.jetty:jetty-annotations:9.4.51.v20230217" - providedCompile "org.slf4j:slf4j-simple:1.7.33" + providedCompile "org.eclipse.jetty:jetty-annotations:11.0.15" + providedCompile "org.slf4j:slf4j-simple:2.0.5" } task jettyRun(type:JavaExec) { dependsOn(sourceSets.main.runtimeClasspath) diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.web/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.web/pom.xml index 2e1abbc10d4..8dfced37d6d 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.web/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.web/pom.xml @@ -36,7 +36,7 @@ org.eclipse.jetty jetty-maven-plugin - 9.4.51.v20230217 + 11.0.15 WebRoot @@ -116,13 +116,13 @@ org.eclipse.jetty jetty-annotations - 9.4.51.v20230217 + 11.0.15 provided org.slf4j slf4j-simple - 1.7.33 + 2.0.5 provided diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.web/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.web/pom.xml index 5fbdcf85797..a765c485d52 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.web/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.web/pom.xml @@ -36,7 +36,7 @@ org.eclipse.jetty jetty-maven-plugin - 9.4.51.v20230217 + 11.0.15 WebRoot @@ -116,13 +116,13 @@ org.eclipse.jetty jetty-annotations - 9.4.51.v20230217 + 11.0.15 provided org.slf4j slf4j-simple - 1.7.33 + 2.0.5 provided diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.web/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.web/pom.xml index a327e68e68f..9a95cd31f0c 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.web/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.web/pom.xml @@ -36,7 +36,7 @@ org.eclipse.jetty jetty-maven-plugin - 9.4.51.v20230217 + 11.0.15 WebRoot @@ -116,13 +116,13 @@ org.eclipse.jetty jetty-annotations - 9.4.51.v20230217 + 11.0.15 provided org.slf4j slf4j-simple - 1.7.33 + 2.0.5 provided diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.web/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.web/pom.xml index 50b033704cc..93115bb0e5e 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.web/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.web/pom.xml @@ -36,7 +36,7 @@ org.eclipse.jetty jetty-maven-plugin - 9.4.51.v20230217 + 11.0.15 WebRoot @@ -116,13 +116,13 @@ org.eclipse.jetty jetty-annotations - 9.4.51.v20230217 + 11.0.15 provided org.slf4j slf4j-simple - 1.7.33 + 2.0.5 provided diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/plainMaven/plainMaven.parent/plainMaven.web/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/plainMaven/plainMaven.parent/plainMaven.web/pom.xml index 74984504ffa..10c55115300 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/plainMaven/plainMaven.parent/plainMaven.web/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/plainMaven/plainMaven.parent/plainMaven.web/pom.xml @@ -26,7 +26,7 @@ org.eclipse.jetty jetty-maven-plugin - 9.4.51.v20230217 + 11.0.15 src/main/webapp @@ -106,13 +106,13 @@ org.eclipse.jetty jetty-annotations - 9.4.51.v20230217 + 11.0.15 provided org.slf4j slf4j-simple - 1.7.33 + 2.0.5 provided