Skip to content

Bump to Eclipse 2020-03 #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jul 20, 2020
Merged

Bump to Eclipse 2020-03 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cb54a76
bump versions
dvojtise May 19, 2020
29fdef3
bump melange version
dvojtise May 20, 2020
d57b95a
Merge
dvojtise Jun 19, 2020
d83eedb
bump melange
dvojtise Jun 19, 2020
4953482
Merge remote-tracking branch 'origin/master' into bump_eclipse
dvojtise Jul 17, 2020
01652b0
typo
dvojtise Jul 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/pull_request_template.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Closes #

## Companion Pull Requests

<!-- optionnal, indicate if this PR must be accepted in conjunction with some PR in other GEMOC github repositories in order to provide a working Studio-->
<!-- you may have to edit this PR afte submitting it in order to get all cross references between the PRs -->
<!-- optional, indicate if this PR must be accepted in conjunction with some PR in other GEMOC github repositories in order to provide a working Studio-->
<!-- you may have to edit this PR after submitting it in order to get all cross references between the PRs -->

- PR #
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
bin/
**/xtend-gen/
**/*.class
**/target/
2 changes: 1 addition & 1 deletion .mvn/extensions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
<extension>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-pomless</artifactId>
<version>1.5.1</version>
<version>1.7.0</version>
</extension>
</extensions>
4 changes: 2 additions & 2 deletions ...xecution/sequential/javaxdsml/ide/ui/wizards/CreateNewGemocSequentialLanguageProject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
<packaging>pom</packaging>

<properties>
<tycho-version>1.5.1</tycho-version>
<xtend.version>2.14.0</xtend.version>
<tycho-version>1.7.0</tycho-version>
<xtend.version>2.21.0</xtend.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<tycho.scmUrl>scm:git:https://github.com/eclipse/gemoc-studio-execution-java.git</tycho.scmUrl>
<!-- <sonar.projectKey>gemoc:${project.groupId}:${project.artifactId}</sonar.projectKey>-->

<eclipse.release.p2.url>http://download.eclipse.org/releases/photon</eclipse.release.p2.url>
<eclipse.release.p2.url>http://download.eclipse.org/releases/2020-03</eclipse.release.p2.url>
<k3.p2.url>http://www.kermeta.org/k3/update_2018-09-05</k3.p2.url>
<melange.p2.url>http://melange.inria.fr/updatesite/nightly/update_2018-12-03/</melange.p2.url>
<melange.p2.url>http://melange.inria.fr/updatesite/nightly/update_2020-06-19</melange.p2.url>
<elk.p2.url>http://download.eclipse.org/elk/updates/releases/0.4.1</elk.p2.url>
<aspectJ.p2.url>http://download.eclipse.org/tools/ajdt/48/dev/update</aspectJ.p2.url>
<sirius.p2.url>https://download.eclipse.org/sirius/updates/releases/6.1.3/photon</sirius.p2.url>
Expand Down