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 ae14e00a88a..252d44f2280 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.18" + providedCompile "org.eclipse.jetty:jetty-annotations:11.0.20" 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 5057fe7dcc2..a37800d9521 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.18" + providedCompile "org.eclipse.jetty:jetty-annotations:11.0.20" 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 53111d86f8e..5a9421cb67f 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.18 + 11.0.20 WebRoot @@ -116,7 +116,7 @@ org.eclipse.jetty jetty-annotations - 11.0.18 + 11.0.20 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 4dc9c06e614..46532ca4c03 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.18 + 11.0.20 WebRoot @@ -116,7 +116,7 @@ org.eclipse.jetty jetty-annotations - 11.0.18 + 11.0.20 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 406034e35b4..9cd05fba980 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.18 + 11.0.20 WebRoot @@ -116,7 +116,7 @@ org.eclipse.jetty jetty-annotations - 11.0.18 + 11.0.20 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 a3d873270cb..e73c3fbc2b0 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.18 + 11.0.20 WebRoot @@ -116,7 +116,7 @@ org.eclipse.jetty jetty-annotations - 11.0.18 + 11.0.20 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 bf0d33c70d5..0488f1f39ae 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.18 + 11.0.20 src/main/webapp @@ -106,7 +106,7 @@ org.eclipse.jetty jetty-annotations - 11.0.18 + 11.0.20 provided diff --git a/org.eclipse.xtext.web.example.jetty/pom.xml b/org.eclipse.xtext.web.example.jetty/pom.xml index 10035965239..071b2db7c50 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.18 + 11.0.20 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 0708ddb3a41..fc11cb0159b 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2015, 2023 itemis AG (http://www.itemis.eu) and others. + * Copyright (c) 2015, 2024 itemis AG (http://www.itemis.eu) and others. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at * http://www.eclipse.org/legal/epl-2.0. @@ -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.18' + static val JETTY_VERSION = '11.0.20' 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 be0c534fd19..8ddf69b828f 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 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2015, 2023 itemis AG (http://www.itemis.eu) and others. + * Copyright (c) 2015, 2024 itemis AG (http://www.itemis.eu) and others. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at * http://www.eclipse.org/legal/epl-2.0. @@ -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.18"; + private static final String JETTY_VERSION = "11.0.20"; private static final String SLF4J_VERSION = "2.0.5";