From cb54a760f26317507cac3d66874a439f8e4d8fd0 Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Tue, 19 May 2020 15:16:10 +0200 Subject: [PATCH 1/4] bump versions xtend 2.21.0 tycho 1.7.0 Signed-off-by: Didier Vojtisek --- .gitignore | 4 +++- .mvn/extensions.xml | 2 +- .../ui/wizards/CreateNewGemocSequentialLanguageProject.java | 4 ++-- pom.xml | 6 +++--- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index aeca2a8..2305b2b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ bin/ -**/xtend-gen/ \ No newline at end of file +**/xtend-gen/ +**/*.class +**/target \ No newline at end of file diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index 5724f5e..c8b79d9 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -3,6 +3,6 @@ org.eclipse.tycho.extras tycho-pomless - 1.5.1 + 1.7.0 \ No newline at end of file diff --git a/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/eclipse/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateNewGemocSequentialLanguageProject.java b/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/eclipse/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateNewGemocSequentialLanguageProject.java index 524926c..7e235de 100644 --- a/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/eclipse/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateNewGemocSequentialLanguageProject.java +++ b/java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.ide.ui/src/org/eclipse/gemoc/execution/sequential/javaxdsml/ide/ui/wizards/CreateNewGemocSequentialLanguageProject.java @@ -176,8 +176,8 @@ private void updateManifestFile (IProject project, IProgressMonitor monitor) { try { ManifestChanger manifestChanger = new ManifestChanger(project.getFile("META-INF/MANIFEST.MF")); - manifestChanger.addPluginDependency("org.eclipse.xtend.lib", "2.14.0", false, true); - manifestChanger.addPluginDependency("org.eclipse.xtext.xbase.lib", "2.14.0", false, true); + manifestChanger.addPluginDependency("org.eclipse.xtend.lib", "2.21.0", false, true); + manifestChanger.addPluginDependency("org.eclipse.xtext.xbase.lib", "2.21.0", false, true); manifestChanger.addPluginDependency("com.google.guava", "0.0.0", false, true); manifestChanger.addPluginDependency("org.eclipse.emf.ecore.xmi", "2.8.0", true, true); manifestChanger.addPluginDependency("org.eclipse.emf.ecore", "2.8.0", true, true); diff --git a/pom.xml b/pom.xml index 6d62def..2454e0d 100644 --- a/pom.xml +++ b/pom.xml @@ -10,13 +10,13 @@ pom - 1.5.1 - 2.14.0 + 1.7.0 + 2.21.0 UTF-8 scm:git:https://github.com/eclipse/gemoc-studio-execution-java.git - http://download.eclipse.org/releases/photon + http://download.eclipse.org/releases/2020-03 http://www.kermeta.org/k3/update_2018-09-05 http://melange.inria.fr/updatesite/nightly/update_2018-12-03/ http://download.eclipse.org/elk/updates/releases/0.4.1 From 29fdef30b43f0b8f47a15f4c32603934aa2fccbf Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Wed, 20 May 2020 10:35:34 +0200 Subject: [PATCH 2/4] bump melange version Signed-off-by: Didier Vojtisek --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2454e0d..bd67276 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ http://download.eclipse.org/releases/2020-03 http://www.kermeta.org/k3/update_2018-09-05 - http://melange.inria.fr/updatesite/nightly/update_2018-12-03/ + http://melange.inria.fr/updatesite/nightly/update_2020-05-20 http://download.eclipse.org/elk/updates/releases/0.4.1 http://download.eclipse.org/tools/ajdt/48/dev/update https://download.eclipse.org/sirius/updates/releases/6.1.3/photon From d83eedb1d8c883caccfc3fc5a922a36a0264b523 Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Fri, 19 Jun 2020 14:15:08 +0200 Subject: [PATCH 3/4] bump melange -fix some language generation issues Signed-off-by: Didier Vojtisek --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bd67276..fa26dff 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ http://download.eclipse.org/releases/2020-03 http://www.kermeta.org/k3/update_2018-09-05 - http://melange.inria.fr/updatesite/nightly/update_2020-05-20 + http://melange.inria.fr/updatesite/nightly/update_2020-06-19 http://download.eclipse.org/elk/updates/releases/0.4.1 http://download.eclipse.org/tools/ajdt/48/dev/update https://download.eclipse.org/sirius/updates/releases/6.1.3/photon From 01652b00fd167061a6727e0b5dd40320a283404d Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Fri, 17 Jul 2020 17:54:16 +0200 Subject: [PATCH 4/4] typo Signed-off-by: Didier Vojtisek --- .github/pull_request_template.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 9baf775..ecfe4a0 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -19,7 +19,7 @@ Closes # ## Companion Pull Requests - - + + - PR #