Merge pull request #2926 from eclipse/cd_issue2925

update to jetty 11.0.20 Closes #2925
eclipse-xtext · Feb 2, 2024 · 28d84f0 · 28d84f0
2 parents 88acf15 + 5554cc8
commit 28d84f0
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 17 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
@@ -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/...pse.xtext.tests/testdata/wizard-expectations/gradle/gradle.parent/gradle.web/build.gradle b/...pse.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/...xt.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.web/pom.xml b/...xt.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.web/pom.xml
@@ -36,7 +36,7 @@
 			<plugin>
 				<groupId>org.eclipse.jetty</groupId>
 				<artifactId>jetty-maven-plugin</artifactId>
-				<version>11.0.18</version>
+				<version>11.0.20</version>
 				<configuration>
 					<webAppSourceDirectory>WebRoot</webAppSourceDirectory>
 				</configuration>
@@ -116,7 +116,7 @@
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-annotations</artifactId>
-			<version>11.0.18</version>
+			<version>11.0.20</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>

diff --git a/...testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.web/pom.xml b/...testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.web/pom.xml
@@ -36,7 +36,7 @@
 			<plugin>
 				<groupId>org.eclipse.jetty</groupId>
 				<artifactId>jetty-maven-plugin</artifactId>
-				<version>11.0.18</version>
+				<version>11.0.20</version>
 				<configuration>
 					<webAppSourceDirectory>WebRoot</webAppSourceDirectory>
 				</configuration>
@@ -116,7 +116,7 @@
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-annotations</artifactId>
-			<version>11.0.18</version>
+			<version>11.0.20</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>

diff --git a/...ts/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.web/pom.xml b/...ts/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.web/pom.xml
@@ -36,7 +36,7 @@
 			<plugin>
 				<groupId>org.eclipse.jetty</groupId>
 				<artifactId>jetty-maven-plugin</artifactId>
-				<version>11.0.18</version>
+				<version>11.0.20</version>
 				<configuration>
 					<webAppSourceDirectory>WebRoot</webAppSourceDirectory>
 				</configuration>
@@ -116,7 +116,7 @@
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-annotations</artifactId>
-			<version>11.0.18</version>
+			<version>11.0.20</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>

diff --git a/...ta/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.web/pom.xml b/...ta/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.web/pom.xml
@@ -36,7 +36,7 @@
 			<plugin>
 				<groupId>org.eclipse.jetty</groupId>
 				<artifactId>jetty-maven-plugin</artifactId>
-				<version>11.0.18</version>
+				<version>11.0.20</version>
 				<configuration>
 					<webAppSourceDirectory>WebRoot</webAppSourceDirectory>
 				</configuration>
@@ -116,7 +116,7 @@
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-annotations</artifactId>
-			<version>11.0.18</version>
+			<version>11.0.20</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>

diff --git a/...xt.tests/testdata/wizard-expectations/plainMaven/plainMaven.parent/plainMaven.web/pom.xml b/...xt.tests/testdata/wizard-expectations/plainMaven/plainMaven.parent/plainMaven.web/pom.xml
@@ -26,7 +26,7 @@
 			<plugin>
 				<groupId>org.eclipse.jetty</groupId>
 				<artifactId>jetty-maven-plugin</artifactId>
-				<version>11.0.18</version>
+				<version>11.0.20</version>
 				<configuration>
 					<webAppSourceDirectory>src/main/webapp</webAppSourceDirectory>
 				</configuration>
@@ -106,7 +106,7 @@
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-annotations</artifactId>
-			<version>11.0.18</version>
+			<version>11.0.20</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>

diff --git a/org.eclipse.xtext.web.example.jetty/pom.xml b/org.eclipse.xtext.web.example.jetty/pom.xml
@@ -10,7 +10,7 @@
 	<packaging>war</packaging>
 
 	<properties>
-		<jetty-version>11.0.18</jetty-version>
+		<jetty-version>11.0.20</jetty-version>
 	</properties>
 
 	<dependencies>

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
@@ -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/...pse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/WebProjectDescriptor.java b/...pse.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";