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 # diff --git a/.gitignore b/.gitignore index d447a79..69fa912 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ bin/ **/xtend-gen/ +**/*.class **/target/ 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..fa26dff 100644 --- a/pom.xml +++ b/pom.xml @@ -10,15 +10,15 @@ 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://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