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 #1824 from eclipse/cd_modWiz

Browse source 
bump versions in wizard
This commit is contained in:
Christian Dietrich 2022-02-07 11:06:45 +01:00 committed by GitHub
commit 6698fe3660
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 42 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,5 @@
plugins { plugins {
id 'com.github.johnrengelman.shadow' version '7.1.0' id 'com.github.johnrengelman.shadow' version '7.1.2'
} }
dependencies { dependencies {

2
org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenApp/lsMavenApp.parent/lsMavenApp.ide/pom.xml vendored
View file

@ -28,7 +28,7 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId> <artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version> <version>3.3.0</version>
<executions> <executions>
<execution> <execution>
<id>add-source</id> <id>add-source</id>

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

@ -79,7 +79,7 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId> <artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version> <version>3.3.0</version>
<executions> <executions>
<execution> <execution>
<id>add-source</id> <id>add-source</id>
@ -107,7 +107,7 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<version>3.1.1</version> <version>3.3.0</version>
<configuration> <configuration>
<descriptors> <descriptors>
<descriptor>jar-with-ecore-model.xml</descriptor> <descriptor>jar-with-ecore-model.xml</descriptor>

2
org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenFatjar/lsMavenFatjar.parent/lsMavenFatjar.ide/pom.xml vendored
View file

@ -28,7 +28,7 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId> <artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version> <version>3.3.0</version>
<executions> <executions>
<execution> <execution>
<id>add-source</id> <id>add-source</id>

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

@ -79,7 +79,7 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId> <artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version> <version>3.3.0</version>
<executions> <executions>
<execution> <execution>
<id>add-source</id> <id>add-source</id>
@ -107,7 +107,7 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<version>3.1.1</version> <version>3.3.0</version>
<configuration> <configuration>
<descriptors> <descriptors>
<descriptor>jar-with-ecore-model.xml</descriptor> <descriptor>jar-with-ecore-model.xml</descriptor>

2
org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.ide/pom.xml vendored
View file

@ -47,7 +47,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>
<version>3.1.2</version> <version>3.2.0</version>
<executions> <executions>
<execution> <execution>
<id>copy-dependencies</id> <id>copy-dependencies</id>

2
org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.ide/pom.xml vendored
View file

@ -47,7 +47,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>
<version>3.1.2</version> <version>3.2.0</version>
<executions> <executions>
<execution> <execution>
<id>copy-dependencies</id> <id>copy-dependencies</id>

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

@ -27,7 +27,7 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<version>3.2.3</version> <version>3.3.2</version>
<configuration> <configuration>
<warSourceDirectory>WebRoot</warSourceDirectory> <warSourceDirectory>WebRoot</warSourceDirectory>
<failOnMissingWebXml>false</failOnMissingWebXml> <failOnMissingWebXml>false</failOnMissingWebXml>
@ -44,7 +44,7 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId> <artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version> <version>3.3.0</version>
<executions> <executions>
<execution> <execution>
<id>add-source</id> <id>add-source</id>

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

@ -27,7 +27,7 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<version>3.2.3</version> <version>3.3.2</version>
<configuration> <configuration>
<warSourceDirectory>WebRoot</warSourceDirectory> <warSourceDirectory>WebRoot</warSourceDirectory>
<failOnMissingWebXml>false</failOnMissingWebXml> <failOnMissingWebXml>false</failOnMissingWebXml>
@ -44,7 +44,7 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId> <artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version> <version>3.3.0</version>
<executions> <executions>
<execution> <execution>
<id>add-source</id> <id>add-source</id>

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

@ -27,7 +27,7 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<version>3.2.3</version> <version>3.3.2</version>
<configuration> <configuration>
<warSourceDirectory>WebRoot</warSourceDirectory> <warSourceDirectory>WebRoot</warSourceDirectory>
<failOnMissingWebXml>false</failOnMissingWebXml> <failOnMissingWebXml>false</failOnMissingWebXml>
@ -44,7 +44,7 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId> <artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version> <version>3.3.0</version>
<executions> <executions>
<execution> <execution>
<id>add-source</id> <id>add-source</id>

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

@ -18,7 +18,7 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId> <artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version> <version>3.3.0</version>
<executions> <executions>
<execution> <execution>
<id>add-source</id> <id>add-source</id>

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

@ -17,7 +17,7 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<version>3.2.3</version> <version>3.3.2</version>
<configuration> <configuration>
<warSourceDirectory>src/main/webapp</warSourceDirectory> <warSourceDirectory>src/main/webapp</warSourceDirectory>
<failOnMissingWebXml>false</failOnMissingWebXml> <failOnMissingWebXml>false</failOnMissingWebXml>
@ -34,7 +34,7 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId> <artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version> <version>3.3.0</version>
<executions> <executions>
<execution> <execution>
<id>add-source</id> <id>add-source</id>

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

@ -79,7 +79,7 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId> <artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version> <version>3.3.0</version>
<executions> <executions>
<execution> <execution>
<id>add-source</id> <id>add-source</id>
@ -128,7 +128,7 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<version>3.1.1</version> <version>3.3.0</version>
<configuration> <configuration>
<descriptors> <descriptors>
<descriptor>jar-with-ecore-model.xml</descriptor> <descriptor>jar-with-ecore-model.xml</descriptor>

8
org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.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 * This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at * terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0. * http://www.eclipse.org/legal/epl-2.0.
@ -92,7 +92,7 @@ class IdeProjectDescriptor extends ProjectDescriptor {
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId> <artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version> <version>3.3.0</version>
<executions> <executions>
<execution> <execution>
<id>add-source</id> <id>add-source</id>
@ -131,7 +131,7 @@ class IdeProjectDescriptor extends ProjectDescriptor {
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>
<version>3.1.2</version> <version>3.2.0</version>
<executions> <executions>
<execution> <execution>
<id>copy-dependencies</id> <id>copy-dependencies</id>
@ -319,7 +319,7 @@ class IdeProjectDescriptor extends ProjectDescriptor {
pluginsSection = ''' pluginsSection = '''
«IF config.languageServer === LanguageServer.FATJAR» «IF config.languageServer === LanguageServer.FATJAR»
plugins { plugins {
id 'com.github.johnrengelman.shadow' version '7.1.0' id 'com.github.johnrengelman.shadow' version '7.1.2'
} }
«ENDIF» «ENDIF»

6
org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.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 * This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at * terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0. * http://www.eclipse.org/legal/epl-2.0.
@ -434,7 +434,7 @@ class RuntimeProjectDescriptor extends TestedProjectDescriptor {
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId> <artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version> <version>3.3.0</version>
<executions> <executions>
<execution> <execution>
<id>add-source</id> <id>add-source</id>
@ -486,7 +486,7 @@ class RuntimeProjectDescriptor extends TestedProjectDescriptor {
«IF isPlainMavenBuild» «IF isPlainMavenBuild»
<plugin> <plugin>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<version>3.1.1</version> <version>3.3.0</version>
<configuration> <configuration>
<descriptors> <descriptors>
<descriptor>jar-with-ecore-model.xml</descriptor> <descriptor>jar-with-ecore-model.xml</descriptor>

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

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2015, 2018 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 * This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at * terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0. * http://www.eclipse.org/legal/epl-2.0.
@ -109,7 +109,7 @@ abstract class TestProjectDescriptor extends ProjectDescriptor {
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId> <artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version> <version>3.3.0</version>
<executions> <executions>
<execution> <execution>
<id>add-test-source</id> <id>add-test-source</id>

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

@ -102,7 +102,7 @@ class WebProjectDescriptor extends ProjectDescriptor {
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<version>3.2.3</version> <version>3.3.2</version>
<configuration> <configuration>
<warSourceDirectory>«Outlet.WEBAPP.sourceFolder»</warSourceDirectory> <warSourceDirectory>«Outlet.WEBAPP.sourceFolder»</warSourceDirectory>
<failOnMissingWebXml>false</failOnMissingWebXml> <failOnMissingWebXml>false</failOnMissingWebXml>
@ -119,7 +119,7 @@ class WebProjectDescriptor extends ProjectDescriptor {
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId> <artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version> <version>3.3.0</version>
<executions> <executions>
<execution> <execution>
<id>add-source</id> <id>add-source</id>

8
org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.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 * This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at * terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0. * http://www.eclipse.org/legal/epl-2.0.
@ -218,7 +218,7 @@ public class IdeProjectDescriptor extends ProjectDescriptor {
_builder.newLine(); _builder.newLine();
_builder.append("\t\t"); _builder.append("\t\t");
_builder.append("\t"); _builder.append("\t");
_builder.append("<version>3.0.0</version>"); _builder.append("<version>3.3.0</version>");
_builder.newLine(); _builder.newLine();
_builder.append("\t\t"); _builder.append("\t\t");
_builder.append("\t"); _builder.append("\t");
@ -373,7 +373,7 @@ public class IdeProjectDescriptor extends ProjectDescriptor {
_builder.newLine(); _builder.newLine();
_builder.append("\t\t"); _builder.append("\t\t");
_builder.append("\t"); _builder.append("\t");
_builder.append("<version>3.1.2</version>"); _builder.append("<version>3.2.0</version>");
_builder.newLine(); _builder.newLine();
_builder.append("\t\t"); _builder.append("\t\t");
_builder.append("\t"); _builder.append("\t");
@ -1121,7 +1121,7 @@ public class IdeProjectDescriptor extends ProjectDescriptor {
_builder.append("plugins {"); _builder.append("plugins {");
_builder.newLine(); _builder.newLine();
_builder.append("\t"); _builder.append("\t");
_builder.append("id \'com.github.johnrengelman.shadow\' version \'7.1.0\'"); _builder.append("id \'com.github.johnrengelman.shadow\' version \'7.1.2\'");
_builder.newLine(); _builder.newLine();
_builder.append("}"); _builder.append("}");
_builder.newLine(); _builder.newLine();

6
org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.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 * This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at * terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0. * http://www.eclipse.org/legal/epl-2.0.
@ -1114,7 +1114,7 @@ public class RuntimeProjectDescriptor extends TestedProjectDescriptor {
_builder.newLine(); _builder.newLine();
_builder.append("\t\t"); _builder.append("\t\t");
_builder.append("\t"); _builder.append("\t");
_builder.append("<version>3.0.0</version>"); _builder.append("<version>3.3.0</version>");
_builder.newLine(); _builder.newLine();
_builder.append("\t\t"); _builder.append("\t\t");
_builder.append("\t"); _builder.append("\t");
@ -1347,7 +1347,7 @@ public class RuntimeProjectDescriptor extends TestedProjectDescriptor {
_builder.newLine(); _builder.newLine();
_builder.append("\t\t"); _builder.append("\t\t");
_builder.append("\t"); _builder.append("\t");
_builder.append("<version>3.1.1</version>"); _builder.append("<version>3.3.0</version>");
_builder.newLine(); _builder.newLine();
_builder.append("\t\t"); _builder.append("\t\t");
_builder.append("\t"); _builder.append("\t");

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

@ -1,5 +1,5 @@
/** /**
* Copyright (c) 2015, 2018 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 * This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at * terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0. * http://www.eclipse.org/legal/epl-2.0.
@ -249,7 +249,7 @@ public abstract class TestProjectDescriptor extends ProjectDescriptor {
_builder.newLine(); _builder.newLine();
_builder.append("\t\t"); _builder.append("\t\t");
_builder.append("\t"); _builder.append("\t");
_builder.append("<version>3.0.0</version>"); _builder.append("<version>3.3.0</version>");
_builder.newLine(); _builder.newLine();
_builder.append("\t\t"); _builder.append("\t\t");
_builder.append("\t"); _builder.append("\t");

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

@ -215,7 +215,7 @@ public class WebProjectDescriptor extends ProjectDescriptor {
_builder.append("<artifactId>maven-war-plugin</artifactId>"); _builder.append("<artifactId>maven-war-plugin</artifactId>");
_builder.newLine(); _builder.newLine();
_builder.append("\t\t\t"); _builder.append("\t\t\t");
_builder.append("<version>3.2.3</version>"); _builder.append("<version>3.3.2</version>");
_builder.newLine(); _builder.newLine();
_builder.append("\t\t\t"); _builder.append("\t\t\t");
_builder.append("<configuration>"); _builder.append("<configuration>");
@ -274,7 +274,7 @@ public class WebProjectDescriptor extends ProjectDescriptor {
_builder.append("<artifactId>build-helper-maven-plugin</artifactId>"); _builder.append("<artifactId>build-helper-maven-plugin</artifactId>");
_builder.newLine(); _builder.newLine();
_builder.append("\t\t\t"); _builder.append("\t\t\t");
_builder.append("<version>3.0.0</version>"); _builder.append("<version>3.3.0</version>");
_builder.newLine(); _builder.newLine();
_builder.append("\t\t\t"); _builder.append("\t\t\t");
_builder.append("<executions>"); _builder.append("<executions>");