diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsGradleFatjar/lsGradleFatjar.parent/lsGradleFatjar.ide/build.gradle b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsGradleFatjar/lsGradleFatjar.parent/lsGradleFatjar.ide/build.gradle index 9cebebcaa..159f54852 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsGradleFatjar/lsGradleFatjar.parent/lsGradleFatjar.ide/build.gradle +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsGradleFatjar/lsGradleFatjar.parent/lsGradleFatjar.ide/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'com.github.johnrengelman.shadow' version '7.1.0' + id 'com.github.johnrengelman.shadow' version '7.1.2' } dependencies { diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenApp/lsMavenApp.parent/lsMavenApp.ide/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenApp/lsMavenApp.parent/lsMavenApp.ide/pom.xml index 88354d4f9..9b38cf3e7 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenApp/lsMavenApp.parent/lsMavenApp.ide/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenApp/lsMavenApp.parent/lsMavenApp.ide/pom.xml @@ -28,7 +28,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.0.0 + 3.3.0 add-source diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenApp/lsMavenApp.parent/lsMavenApp/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenApp/lsMavenApp.parent/lsMavenApp/pom.xml index b54a9578d..bbf0c4eda 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenApp/lsMavenApp.parent/lsMavenApp/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenApp/lsMavenApp.parent/lsMavenApp/pom.xml @@ -79,7 +79,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.0.0 + 3.3.0 add-source @@ -107,7 +107,7 @@ maven-assembly-plugin - 3.1.1 + 3.3.0 jar-with-ecore-model.xml diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenFatjar/lsMavenFatjar.parent/lsMavenFatjar.ide/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenFatjar/lsMavenFatjar.parent/lsMavenFatjar.ide/pom.xml index 83844d577..d43398d4e 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenFatjar/lsMavenFatjar.parent/lsMavenFatjar.ide/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenFatjar/lsMavenFatjar.parent/lsMavenFatjar.ide/pom.xml @@ -28,7 +28,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.0.0 + 3.3.0 add-source diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenFatjar/lsMavenFatjar.parent/lsMavenFatjar/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenFatjar/lsMavenFatjar.parent/lsMavenFatjar/pom.xml index 46d32f98d..0f6d20be2 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenFatjar/lsMavenFatjar.parent/lsMavenFatjar/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenFatjar/lsMavenFatjar.parent/lsMavenFatjar/pom.xml @@ -79,7 +79,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.0.0 + 3.3.0 add-source @@ -107,7 +107,7 @@ maven-assembly-plugin - 3.1.1 + 3.3.0 jar-with-ecore-model.xml diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.ide/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.ide/pom.xml index e06cdc9c6..18978f3d3 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.ide/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.ide/pom.xml @@ -47,7 +47,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.1.2 + 3.2.0 copy-dependencies diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.ide/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.ide/pom.xml index d02cddd64..093bff70f 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.ide/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.ide/pom.xml @@ -47,7 +47,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.1.2 + 3.2.0 copy-dependencies diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.web/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.web/pom.xml index 2df703f4f..fac459da3 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.web/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.web/pom.xml @@ -27,7 +27,7 @@ maven-war-plugin - 3.2.3 + 3.3.2 WebRoot false @@ -44,7 +44,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.0.0 + 3.3.0 add-source diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.web/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.web/pom.xml index 8e8469c85..38b3a75e7 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.web/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.web/pom.xml @@ -27,7 +27,7 @@ maven-war-plugin - 3.2.3 + 3.3.2 WebRoot false @@ -44,7 +44,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.0.0 + 3.3.0 add-source diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.web/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.web/pom.xml index 953774b4a..a605833b7 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.web/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.web/pom.xml @@ -27,7 +27,7 @@ maven-war-plugin - 3.2.3 + 3.3.2 WebRoot false @@ -44,7 +44,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.0.0 + 3.3.0 add-source diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/plainMaven/plainMaven.parent/plainMaven.ide/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/plainMaven/plainMaven.parent/plainMaven.ide/pom.xml index c863abc3a..05e31aee5 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/plainMaven/plainMaven.parent/plainMaven.ide/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/plainMaven/plainMaven.parent/plainMaven.ide/pom.xml @@ -18,7 +18,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.0.0 + 3.3.0 add-source diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/plainMaven/plainMaven.parent/plainMaven.web/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/plainMaven/plainMaven.parent/plainMaven.web/pom.xml index 8da77a897..c02e48b74 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/plainMaven/plainMaven.parent/plainMaven.web/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/plainMaven/plainMaven.parent/plainMaven.web/pom.xml @@ -17,7 +17,7 @@ maven-war-plugin - 3.2.3 + 3.3.2 src/main/webapp false @@ -34,7 +34,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.0.0 + 3.3.0 add-source diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/plainMaven/plainMaven.parent/plainMaven/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/plainMaven/plainMaven.parent/plainMaven/pom.xml index 8c520c750..47f74790d 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/plainMaven/plainMaven.parent/plainMaven/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/plainMaven/plainMaven.parent/plainMaven/pom.xml @@ -79,7 +79,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.0.0 + 3.3.0 add-source @@ -128,7 +128,7 @@ maven-assembly-plugin - 3.1.1 + 3.3.0 jar-with-ecore-model.xml diff --git a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.xtend index c176c4a01..fa9d3cf97 100644 --- a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.xtend +++ b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.xtend @@ -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. @@ -92,7 +92,7 @@ class IdeProjectDescriptor extends ProjectDescriptor { org.codehaus.mojo build-helper-maven-plugin - 3.0.0 + 3.3.0 add-source @@ -131,7 +131,7 @@ class IdeProjectDescriptor extends ProjectDescriptor { org.apache.maven.plugins maven-dependency-plugin - 3.1.2 + 3.2.0 copy-dependencies @@ -319,7 +319,7 @@ class IdeProjectDescriptor extends ProjectDescriptor { pluginsSection = ''' «IF config.languageServer === LanguageServer.FATJAR» plugins { - id 'com.github.johnrengelman.shadow' version '7.1.0' + id 'com.github.johnrengelman.shadow' version '7.1.2' } «ENDIF» diff --git a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend index 6825c5752..8d44a4a76 100644 --- a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend +++ b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend @@ -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. @@ -434,7 +434,7 @@ class RuntimeProjectDescriptor extends TestedProjectDescriptor { org.codehaus.mojo build-helper-maven-plugin - 3.0.0 + 3.3.0 add-source @@ -486,7 +486,7 @@ class RuntimeProjectDescriptor extends TestedProjectDescriptor { «IF isPlainMavenBuild» maven-assembly-plugin - 3.1.1 + 3.3.0 jar-with-ecore-model.xml diff --git a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TestProjectDescriptor.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TestProjectDescriptor.xtend index 53e49e19b..d7d263612 100644 --- a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TestProjectDescriptor.xtend +++ b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TestProjectDescriptor.xtend @@ -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 * terms of the Eclipse Public License 2.0 which is available at * http://www.eclipse.org/legal/epl-2.0. @@ -109,7 +109,7 @@ abstract class TestProjectDescriptor extends ProjectDescriptor { org.codehaus.mojo build-helper-maven-plugin - 3.0.0 + 3.3.0 add-test-source 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 edd056f1e..a500afd72 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 @@ -102,7 +102,7 @@ class WebProjectDescriptor extends ProjectDescriptor { maven-war-plugin - 3.2.3 + 3.3.2 «Outlet.WEBAPP.sourceFolder» false @@ -119,7 +119,7 @@ class WebProjectDescriptor extends ProjectDescriptor { org.codehaus.mojo build-helper-maven-plugin - 3.0.0 + 3.3.0 add-source diff --git a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.java b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.java index fdc2c0304..e0ec5b143 100644 --- a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.java +++ b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.java @@ -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. @@ -218,7 +218,7 @@ public class IdeProjectDescriptor extends ProjectDescriptor { _builder.newLine(); _builder.append("\t\t"); _builder.append("\t"); - _builder.append("3.0.0"); + _builder.append("3.3.0"); _builder.newLine(); _builder.append("\t\t"); _builder.append("\t"); @@ -373,7 +373,7 @@ public class IdeProjectDescriptor extends ProjectDescriptor { _builder.newLine(); _builder.append("\t\t"); _builder.append("\t"); - _builder.append("3.1.2"); + _builder.append("3.2.0"); _builder.newLine(); _builder.append("\t\t"); _builder.append("\t"); @@ -1121,7 +1121,7 @@ public class IdeProjectDescriptor extends ProjectDescriptor { _builder.append("plugins {"); _builder.newLine(); _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.append("}"); _builder.newLine(); diff --git a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.java b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.java index bc7dcb687..ec2162982 100644 --- a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.java +++ b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.java @@ -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. @@ -1114,7 +1114,7 @@ public class RuntimeProjectDescriptor extends TestedProjectDescriptor { _builder.newLine(); _builder.append("\t\t"); _builder.append("\t"); - _builder.append("3.0.0"); + _builder.append("3.3.0"); _builder.newLine(); _builder.append("\t\t"); _builder.append("\t"); @@ -1347,7 +1347,7 @@ public class RuntimeProjectDescriptor extends TestedProjectDescriptor { _builder.newLine(); _builder.append("\t\t"); _builder.append("\t"); - _builder.append("3.1.1"); + _builder.append("3.3.0"); _builder.newLine(); _builder.append("\t\t"); _builder.append("\t"); diff --git a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TestProjectDescriptor.java b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TestProjectDescriptor.java index c93a8bf3d..bf24a9f7e 100644 --- a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TestProjectDescriptor.java +++ b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TestProjectDescriptor.java @@ -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 * terms of the Eclipse Public License 2.0 which is available at * http://www.eclipse.org/legal/epl-2.0. @@ -249,7 +249,7 @@ public abstract class TestProjectDescriptor extends ProjectDescriptor { _builder.newLine(); _builder.append("\t\t"); _builder.append("\t"); - _builder.append("3.0.0"); + _builder.append("3.3.0"); _builder.newLine(); _builder.append("\t\t"); _builder.append("\t"); 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 81baff282..512352557 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 @@ -215,7 +215,7 @@ public class WebProjectDescriptor extends ProjectDescriptor { _builder.append("maven-war-plugin"); _builder.newLine(); _builder.append("\t\t\t"); - _builder.append("3.2.3"); + _builder.append("3.3.2"); _builder.newLine(); _builder.append("\t\t\t"); _builder.append(""); @@ -274,7 +274,7 @@ public class WebProjectDescriptor extends ProjectDescriptor { _builder.append("build-helper-maven-plugin"); _builder.newLine(); _builder.append("\t\t\t"); - _builder.append("3.0.0"); + _builder.append("3.3.0"); _builder.newLine(); _builder.append("\t\t\t"); _builder.append("");