Skip to content

Commit

Permalink
Bump to Eclipse 2022-06 (#273)
Browse files Browse the repository at this point in the history
* new splashscreen for version based on Eclipse 2022-06

* bump to tycho 2.7.3

* bump targetplatform to eclipse 2022-06

update some dependencies

* add m2e.pde support

* bump to newest version of melange

* remove use of deprecated xtext bundle

* update httpclient distributed version

* add org.eclipse.xtext.generator feature to maintain compilation

org.eclipse.xtext.generator is actually deprecated since xtext 2.9  an
upgrade of several xtext based project is required to get rid of it

* install xtext deprecated language generator in studio

* bump melange

* java minimal version 11

* apprently unused code clean used

* better of clean previous workspace content

* bump to GEMOC 3.6.0

contributes to #270
  • Loading branch information
dvojtise committed Aug 3, 2022
1 parent 5f8fd8d commit 40104b1
Show file tree
Hide file tree
Showing 67 changed files with 5,740 additions and 234 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -9,5 +9,6 @@ node_modules
/package-lock.json
**/.polyglot.build.properties
.polyglot.*
.tycho-consumer-pom.xml
.META-INF_MANIFEST.MF
feature.xml.takari_issue_192
2 changes: 1 addition & 1 deletion .mvn/extensions.xml
Expand Up @@ -3,6 +3,6 @@
<extension>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-build</artifactId>
<version>2.7.0</version>
<version>2.7.3</version>
</extension>
</extensions>
1 change: 0 additions & 1 deletion README.md
Expand Up @@ -22,7 +22,6 @@ The [contact page](https://projects.eclipse.org/projects/modeling.gemoc/contact)
Reporting issues
============
In case of trouble with the studio, you can use one the issue trackers of the Studio. Since the Studio is an assembly of various tools and components, the precise tracker will depend on the involved component.
A dashboard of all issues is available as a waffle: [https://waffle.io/eclipse/gemoc-studio](https://waffle.io/eclipse/gemoc-studio).

* https://github.com/eclipse/gemoc-studio/issues : Main/Global tracker, use this tracker if this is an assembly problem or if you don't know which precise component is affected.
* https://github.com/eclipse/gemoc-studio-modeldebugging/issues : Tracker for issues related to the main framework, to the definition of Sequential languages and to the sequential engine.
Expand Down
2 changes: 1 addition & 1 deletion dev_support/pomfirst_full_compilation/pom.xml
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.gemoc.gemoc_studio</groupId>
<artifactId>org.eclipse.gemoc.gemoc_studio.pomfirst</artifactId>
<version>3.5.0-SNAPSHOT</version>
<version>3.6.0-SNAPSHOT</version>

<packaging>pom</packaging>

Expand Down
2 changes: 1 addition & 1 deletion dev_support/tycho_full_compilation/pom.xml
Expand Up @@ -6,7 +6,7 @@
<groupId>org.eclipse.gemoc.gemoc-studio.bundle</groupId>
<artifactId>complete-studio</artifactId>
<packaging>pom</packaging>
<version>3.5.0-SNAPSHOT</version>
<version>3.6.0-SNAPSHOT</version>
<name>Full tycho build</name>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion docs/org.eclipse.gemoc.studio.doc/pom.xml
Expand Up @@ -5,7 +5,7 @@

<groupId>org.eclipse.gemoc.documentation</groupId>
<artifactId>gemoc-studio-documentation</artifactId>
<version>3.5.0-SNAPSHOT</version>
<version>3.6.0-SNAPSHOT</version>
<!-- <packaging>jdocbook</packaging>-->
<packaging>jar</packaging>

Expand Down
8 changes: 4 additions & 4 deletions gemoc_studio/plugins/gemoc_studio-eclipse-bom/pom.xml
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.gemoc.gemoc-studio</groupId>
<artifactId>gemoc_studio-eclipse-bom</artifactId>
<version>3.5.0-SNAPSHOT</version>
<version>3.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>GEMOC Studio Eclipse Product BOM</name>
<description>GEMOC Studio Eclipse Product Bill of Materials</description>
Expand Down Expand Up @@ -33,16 +33,16 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.deploy.skip>true</maven.deploy.skip>

<tycho-version>2.7.0</tycho-version>
<tycho-version>2.7.3</tycho-version>
<xtend.version>2.25.0</xtend.version>

<eclipse.release.p2.url>http://download.eclipse.org/releases/2021-12</eclipse.release.p2.url>
<eclipse.release.p2.url>http://download.eclipse.org/releases/2022-06</eclipse.release.p2.url>
<!--used only for amalgam which seems REALLY deprecated-->
<eclipse.photon.release.p2.url>http://download.eclipse.org/releases/photon</eclipse.photon.release.p2.url>
<k3.p2.url>http://www.kermeta.org/k3/update</k3.p2.url>
<ale.p2.url>http://www.kermeta.org/ale-lang/updates/2020-07-17</ale.p2.url>
<!-- <ale.p2.url>https://ci.inria.fr/gemoc/job/ale-lang/job/bump-to-eclipse-2020-03/lastSuccessfulBuild/artifact/releng/org.eclipse.emf.ecoretools.ale.updatesite/target/repository/</ale.p2.url>-->
<melange.p2.url>http://melange.inria.fr/updatesite/nightly/update_2020-11-16</melange.p2.url>
<melange.p2.url>http://melange.inria.fr/updatesite/nightly/update_2022-08-02</melange.p2.url>
<elk.p2.url>http://download.eclipse.org/elk/updates/releases/0.7.1</elk.p2.url>
<!-- for advanced sirius features such as Sirius ELK support , version needs to be aligned with the one in ${eclipse.release.p2.url}-->
<sirius.p2.url>https://download.eclipse.org/sirius/updates/releases/6.5.1/2020-09/</sirius.p2.url>
Expand Down
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: GEMOC Studio
Bundle-SymbolicName: org.eclipse.gemoc.gemoc_studio.branding;singleton:=true
Bundle-Version: 3.5.0.qualifier
Bundle-Version: 3.6.0.qualifier
Bundle-Vendor: Eclipse GEMOC Project
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime,
Expand Down
Expand Up @@ -8,12 +8,12 @@
<parent>
<groupId>org.eclipse.gemoc.gemoc-studio.bundle</groupId>
<artifactId>org.eclipse.gemoc.gemoc_studio.parent</artifactId>
<version>3.5.0-SNAPSHOT</version>
<version>3.6.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>

<properties>
<eclipse.version.name>2021-12</eclipse.version.name>
<eclipse.version.name>2022-06</eclipse.version.name>
<!-- override these values using -D option on the maven command line on the CI (see jenkinsfile for CI configuration)-->
<studio.variant>Local build</studio.variant>
<branch.variant>Unknown</branch.variant>
Expand Down
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 40104b1

Please sign in to comment.