diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.web/build.gradle b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.web/build.gradle index 52814ccdc..38edf08c3 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.web/build.gradle +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.web/build.gradle @@ -10,7 +10,7 @@ dependencies { compile "org.webjars:requirejs:2.3.6" compile "org.webjars:jquery:3.4.1" compile "org.webjars:ace:1.3.3" - providedCompile "org.eclipse.jetty:jetty-annotations:9.4.14.v20181114" + providedCompile "org.eclipse.jetty:jetty-annotations:9.4.22.v20191022" providedCompile "org.slf4j:slf4j-simple:1.7.21" } task jettyRun(type:JavaExec) { diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/org.xtext.example.gradle.web/build.gradle b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/org.xtext.example.gradle.web/build.gradle index e18b09797..70974ed53 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/org.xtext.example.gradle.web/build.gradle +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/org.xtext.example.gradle.web/build.gradle @@ -10,7 +10,7 @@ dependencies { compile "org.webjars:requirejs:2.3.6" compile "org.webjars:jquery:3.4.1" compile "org.webjars:ace:1.3.3" - providedCompile "org.eclipse.jetty:jetty-annotations:9.4.14.v20181114" + providedCompile "org.eclipse.jetty:jetty-annotations:9.4.22.v20191022" providedCompile "org.slf4j:slf4j-simple:1.7.21" } task jettyRun(type:JavaExec) { diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.web/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.web/pom.xml index 5fc07c32e..e164b7ec9 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.web/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.web/pom.xml @@ -36,7 +36,7 @@ org.eclipse.jetty jetty-maven-plugin - 9.4.14.v20181114 + 9.4.22.v20191022 WebRoot @@ -116,7 +116,7 @@ org.eclipse.jetty jetty-annotations - 9.4.14.v20181114 + 9.4.22.v20191022 provided diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ9/org.xtext.example.mavenTychoJ9.parent/org.xtext.example.mavenTychoJ9.web/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ9/org.xtext.example.mavenTychoJ9.parent/org.xtext.example.mavenTychoJ9.web/pom.xml index bc13f878b..362fb9c0d 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ9/org.xtext.example.mavenTychoJ9.parent/org.xtext.example.mavenTychoJ9.web/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ9/org.xtext.example.mavenTychoJ9.parent/org.xtext.example.mavenTychoJ9.web/pom.xml @@ -36,7 +36,7 @@ org.eclipse.jetty jetty-maven-plugin - 9.4.14.v20181114 + 9.4.22.v20191022 WebRoot @@ -116,7 +116,7 @@ org.eclipse.jetty jetty-annotations - 9.4.14.v20181114 + 9.4.22.v20191022 provided diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.web/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.web/pom.xml index f9cbf1b1e..c23a56697 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.web/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.web/pom.xml @@ -36,7 +36,7 @@ org.eclipse.jetty jetty-maven-plugin - 9.4.14.v20181114 + 9.4.22.v20191022 WebRoot @@ -116,7 +116,7 @@ org.eclipse.jetty jetty-annotations - 9.4.14.v20181114 + 9.4.22.v20191022 provided diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/org.xtext.example.plainMaven.web/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/org.xtext.example.plainMaven.web/pom.xml index df4fb06c2..856153674 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/org.xtext.example.plainMaven.web/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.plainMaven/org.xtext.example.plainMaven.parent/org.xtext.example.plainMaven.web/pom.xml @@ -26,7 +26,7 @@ org.eclipse.jetty jetty-maven-plugin - 9.4.14.v20181114 + 9.4.22.v20191022 src/main/webapp @@ -106,7 +106,7 @@ org.eclipse.jetty jetty-annotations - 9.4.14.v20181114 + 9.4.22.v20191022 provided 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 68ac38472..0caf45ecc 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 @@ -17,7 +17,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.4.1' - static val JETTY_VERSION = '9.4.14.v20181114' + static val JETTY_VERSION = '9.4.22.v20191022' static val SLF4J_VERSION = '1.7.21' 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 6befeaa42..832863465 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 @@ -33,7 +33,7 @@ public class WebProjectDescriptor extends ProjectDescriptor { private static final String JQUERY_VERSION = "3.4.1"; - private static final String JETTY_VERSION = "9.4.14.v20181114"; + private static final String JETTY_VERSION = "9.4.22.v20191022"; private static final String SLF4J_VERSION = "1.7.21";