Skip to content

Commit c2e382f

Browse files
authored
Merge pull request #3292 from eclipse-xtext/jetty-bump-11024
bump jetty to 11.0.24
2 parents 4fb59cc + cf35005 commit c2e382f

File tree

10 files changed

+15
-15
lines changed
  • org.eclipse.xtext.tests/testdata/wizard-expectations
    • full/full.parent/full.web
    • gradle/gradle.parent/gradle.web
    • mavenTycho/mavenTycho.parent/mavenTycho.web
    • mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.web
    • mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.web
    • mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.web
    • plainMaven/plainMaven.parent/plainMaven.web
  • org.eclipse.xtext.web.example.jetty
  • org.eclipse.xtext.xtext.wizard

10 files changed

+15
-15
lines changed

org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.web/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dependencies {
1010
api "org.webjars:requirejs:2.3.7"
1111
api "org.webjars:jquery:3.6.0"
1212
api "org.webjars:ace:1.3.3"
13-
providedCompile "org.eclipse.jetty:jetty-annotations:11.0.23"
13+
providedCompile "org.eclipse.jetty:jetty-annotations:11.0.24"
1414
providedCompile "org.slf4j:slf4j-simple:2.0.5"
1515
}
1616
task jettyRun(type:JavaExec) {

org.eclipse.xtext.tests/testdata/wizard-expectations/gradle/gradle.parent/gradle.web/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dependencies {
1010
api "org.webjars:requirejs:2.3.7"
1111
api "org.webjars:jquery:3.6.0"
1212
api "org.webjars:ace:1.3.3"
13-
providedCompile "org.eclipse.jetty:jetty-annotations:11.0.23"
13+
providedCompile "org.eclipse.jetty:jetty-annotations:11.0.24"
1414
providedCompile "org.slf4j:slf4j-simple:2.0.5"
1515
}
1616
task jettyRun(type:JavaExec) {

org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.web/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<plugin>
3737
<groupId>org.eclipse.jetty</groupId>
3838
<artifactId>jetty-maven-plugin</artifactId>
39-
<version>11.0.23</version>
39+
<version>11.0.24</version>
4040
<configuration>
4141
<webAppSourceDirectory>WebRoot</webAppSourceDirectory>
4242
</configuration>
@@ -117,7 +117,7 @@
117117
<dependency>
118118
<groupId>org.eclipse.jetty</groupId>
119119
<artifactId>jetty-annotations</artifactId>
120-
<version>11.0.23</version>
120+
<version>11.0.24</version>
121121
<scope>provided</scope>
122122
</dependency>
123123
<dependency>

org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.web/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<plugin>
3737
<groupId>org.eclipse.jetty</groupId>
3838
<artifactId>jetty-maven-plugin</artifactId>
39-
<version>11.0.23</version>
39+
<version>11.0.24</version>
4040
<configuration>
4141
<webAppSourceDirectory>WebRoot</webAppSourceDirectory>
4242
</configuration>
@@ -117,7 +117,7 @@
117117
<dependency>
118118
<groupId>org.eclipse.jetty</groupId>
119119
<artifactId>jetty-annotations</artifactId>
120-
<version>11.0.23</version>
120+
<version>11.0.24</version>
121121
<scope>provided</scope>
122122
</dependency>
123123
<dependency>

org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.web/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<plugin>
3737
<groupId>org.eclipse.jetty</groupId>
3838
<artifactId>jetty-maven-plugin</artifactId>
39-
<version>11.0.23</version>
39+
<version>11.0.24</version>
4040
<configuration>
4141
<webAppSourceDirectory>WebRoot</webAppSourceDirectory>
4242
</configuration>
@@ -117,7 +117,7 @@
117117
<dependency>
118118
<groupId>org.eclipse.jetty</groupId>
119119
<artifactId>jetty-annotations</artifactId>
120-
<version>11.0.23</version>
120+
<version>11.0.24</version>
121121
<scope>provided</scope>
122122
</dependency>
123123
<dependency>

org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.web/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<plugin>
3737
<groupId>org.eclipse.jetty</groupId>
3838
<artifactId>jetty-maven-plugin</artifactId>
39-
<version>11.0.23</version>
39+
<version>11.0.24</version>
4040
<configuration>
4141
<webAppSourceDirectory>WebRoot</webAppSourceDirectory>
4242
</configuration>
@@ -117,7 +117,7 @@
117117
<dependency>
118118
<groupId>org.eclipse.jetty</groupId>
119119
<artifactId>jetty-annotations</artifactId>
120-
<version>11.0.23</version>
120+
<version>11.0.24</version>
121121
<scope>provided</scope>
122122
</dependency>
123123
<dependency>

org.eclipse.xtext.tests/testdata/wizard-expectations/plainMaven/plainMaven.parent/plainMaven.web/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<plugin>
2727
<groupId>org.eclipse.jetty</groupId>
2828
<artifactId>jetty-maven-plugin</artifactId>
29-
<version>11.0.23</version>
29+
<version>11.0.24</version>
3030
<configuration>
3131
<webAppSourceDirectory>src/main/webapp</webAppSourceDirectory>
3232
</configuration>
@@ -107,7 +107,7 @@
107107
<dependency>
108108
<groupId>org.eclipse.jetty</groupId>
109109
<artifactId>jetty-annotations</artifactId>
110-
<version>11.0.23</version>
110+
<version>11.0.24</version>
111111
<scope>provided</scope>
112112
</dependency>
113113
<dependency>

org.eclipse.xtext.web.example.jetty/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<packaging>war</packaging>
1111

1212
<properties>
13-
<jetty-version>11.0.23</jetty-version>
13+
<jetty-version>11.0.24</jetty-version>
1414
</properties>
1515

1616
<dependencies>

org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/WebProjectDescriptor.xtend

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class WebProjectDescriptor extends ProjectDescriptor {
1818
static val REQUIREJS_VERSION = '2.3.7'
1919
// static val REQUIREJS_TEXT_VERSION = '2.0.15'
2020
static val JQUERY_VERSION = '3.6.0'
21-
static val JETTY_VERSION = '11.0.23'
21+
static val JETTY_VERSION = '11.0.24'
2222
static val SLF4J_VERSION = '2.0.5'
2323
static val ACE_VERSION = '1.3.3'
2424

org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/WebProjectDescriptor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class WebProjectDescriptor extends ProjectDescriptor {
2525

2626
private static final String JQUERY_VERSION = "3.6.0";
2727

28-
private static final String JETTY_VERSION = "11.0.23";
28+
private static final String JETTY_VERSION = "11.0.24";
2929

3030
private static final String SLF4J_VERSION = "2.0.5";
3131

0 commit comments

Comments
 (0)