sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-15 08:18:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1810 from eclipse/cd_issue1794

Browse source 
[#1794] bump jetty version
This commit is contained in:
Christian Dietrich 2022-01-21 12:07:21 +01:00 committed by GitHub
commit 287c2b7ff1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.web/build.gradle vendored
View file

@ -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:9.4.44.v20210927"
providedCompile "org.eclipse.jetty:jetty-annotations:9.4.45.v20220119"
providedCompile "org.slf4j:slf4j-simple:1.7.32"
}
task jettyRun(type:JavaExec) {

2
org.eclipse.xtext.tests/testdata/wizard-expectations/gradle/gradle.parent/gradle.web/build.gradle vendored
View file

@ -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:9.4.44.v20210927"
providedCompile "org.eclipse.jetty:jetty-annotations:9.4.45.v20220119"
providedCompile "org.slf4j:slf4j-simple:1.7.32"
}
task jettyRun(type:JavaExec) {

4
org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.web/pom.xml vendored
View file

@ -36,7 +36,7 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>9.4.44.v20210927</version>
<version>9.4.45.v20220119</version>
<configuration>
<webAppSourceDirectory>WebRoot</webAppSourceDirectory>
</configuration>
@ -116,7 +116,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-annotations</artifactId>
<version>9.4.44.v20210927</version>
<version>9.4.45.v20220119</version>
<scope>provided</scope>
</dependency>
<dependency>

4
org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.web/pom.xml vendored
View file

@ -36,7 +36,7 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>9.4.44.v20210927</version>
<version>9.4.45.v20220119</version>
<configuration>
<webAppSourceDirectory>WebRoot</webAppSourceDirectory>
</configuration>
@ -116,7 +116,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-annotations</artifactId>
<version>9.4.44.v20210927</version>
<version>9.4.45.v20220119</version>
<scope>provided</scope>
</dependency>
<dependency>

4
org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.web/pom.xml vendored
View file

@ -36,7 +36,7 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>9.4.44.v20210927</version>
<version>9.4.45.v20220119</version>
<configuration>
<webAppSourceDirectory>WebRoot</webAppSourceDirectory>
</configuration>
@ -116,7 +116,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-annotations</artifactId>
<version>9.4.44.v20210927</version>
<version>9.4.45.v20220119</version>
<scope>provided</scope>
</dependency>
<dependency>

4
org.eclipse.xtext.tests/testdata/wizard-expectations/plainMaven/plainMaven.parent/plainMaven.web/pom.xml vendored
View file

@ -26,7 +26,7 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>9.4.44.v20210927</version>
<version>9.4.45.v20220119</version>
<configuration>
<webAppSourceDirectory>src/main/webapp</webAppSourceDirectory>
</configuration>
@ -106,7 +106,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-annotations</artifactId>
<version>9.4.44.v20210927</version>
<version>9.4.45.v20220119</version>
<scope>provided</scope>
</dependency>
<dependency>

4
org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/WebProjectDescriptor.xtend
View file

@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2015, 2021 itemis AG (http://www.itemis.eu) and others.
* Copyright (c) 2015, 2022 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 = '9.4.44.v20210927'
static val JETTY_VERSION = '9.4.45.v20220119'
static val SLF4J_VERSION = '1.7.32'
static val ACE_VERSION = '1.3.3'

4
org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/WebProjectDescriptor.java
View file

@ -1,5 +1,5 @@
/**
* Copyright (c) 2015, 2021 itemis AG (http://www.itemis.eu) and others.
* Copyright (c) 2015, 2022 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 = "9.4.44.v20210927";
private static final String JETTY_VERSION = "9.4.45.v20220119";
private static final String SLF4J_VERSION = "1.7.32";