From a2e71b02ab6f22a08422442e5f1878e331b0e9c0 Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Tue, 31 Oct 2023 09:56:59 +0100 Subject: [PATCH] bump jetty Signed-off-by: Christian Dietrich --- .../full/full.parent/full.web/build.gradle | 2 +- .../gradle/gradle.parent/gradle.web/build.gradle | 2 +- .../mavenTycho/mavenTycho.parent/mavenTycho.web/pom.xml | 4 ++-- .../mavenTychoJ17.parent/mavenTychoJ17.web/pom.xml | 4 ++-- .../mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.web/pom.xml | 4 ++-- .../mavenTychoP2J17.parent/mavenTychoP2J17.web/pom.xml | 4 ++-- .../plainMaven/plainMaven.parent/plainMaven.web/pom.xml | 4 ++-- org.eclipse.xtext.web.example.jetty/pom.xml | 2 +- .../org/eclipse/xtext/xtext/wizard/WebProjectDescriptor.xtend | 2 +- .../org/eclipse/xtext/xtext/wizard/WebProjectDescriptor.java | 2 +- 10 files changed, 15 insertions(+), 15 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 77126ff9017..ae14e00a88a 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,7 +10,7 @@ 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:11.0.15" + providedCompile "org.eclipse.jetty:jetty-annotations:11.0.18" providedCompile "org.slf4j:slf4j-simple:2.0.5" } task jettyRun(type:JavaExec) { 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 1ca73e0b193..5057fe7dcc2 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,7 +10,7 @@ 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:11.0.15" + providedCompile "org.eclipse.jetty:jetty-annotations:11.0.18" providedCompile "org.slf4j:slf4j-simple:2.0.5" } task jettyRun(type:JavaExec) { 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 8dfced37d6d..53111d86f8e 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 - 11.0.15 + 11.0.18 WebRoot @@ -116,7 +116,7 @@ org.eclipse.jetty jetty-annotations - 11.0.15 + 11.0.18 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 a765c485d52..4dc9c06e614 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 - 11.0.15 + 11.0.18 WebRoot @@ -116,7 +116,7 @@ org.eclipse.jetty jetty-annotations - 11.0.15 + 11.0.18 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 9a95cd31f0c..406034e35b4 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 - 11.0.15 + 11.0.18 WebRoot @@ -116,7 +116,7 @@ org.eclipse.jetty jetty-annotations - 11.0.15 + 11.0.18 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 93115bb0e5e..a3d873270cb 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 - 11.0.15 + 11.0.18 WebRoot @@ -116,7 +116,7 @@ org.eclipse.jetty jetty-annotations - 11.0.15 + 11.0.18 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 10c55115300..bf0d33c70d5 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 - 11.0.15 + 11.0.18 src/main/webapp @@ -106,7 +106,7 @@ org.eclipse.jetty jetty-annotations - 11.0.15 + 11.0.18 provided diff --git a/org.eclipse.xtext.web.example.jetty/pom.xml b/org.eclipse.xtext.web.example.jetty/pom.xml index 381ca9386d1..323281396b3 100644 --- a/org.eclipse.xtext.web.example.jetty/pom.xml +++ b/org.eclipse.xtext.web.example.jetty/pom.xml @@ -10,7 +10,7 @@ war - 11.0.15 + 11.0.18 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 aa6a19ddc27..0708ddb3a41 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,7 +18,7 @@ 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 = '11.0.15' + static val JETTY_VERSION = '11.0.18' static val SLF4J_VERSION = '2.0.5' static val ACE_VERSION = '1.3.3' 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 04f36d6f5f0..be0c534fd19 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,7 +25,7 @@ public class WebProjectDescriptor extends ProjectDescriptor { private static final String JQUERY_VERSION = "3.6.0"; - private static final String JETTY_VERSION = "11.0.15"; + private static final String JETTY_VERSION = "11.0.18"; private static final String SLF4J_VERSION = "2.0.5";