Skip to content

Commit

Permalink
#133 Migrate to Eclipse 2021-06
Browse files Browse the repository at this point in the history
- Update jarsigner plugin version to 1.3.2 (see
eclipse-kitalpha/kitalpha#681 for details)
- Force java version to 11
- Tycho version 2.2.0

Change-Id: I3b81bcce2b350cbdcb82b193e66e43466b73454d
  • Loading branch information
arnauddieumegard authored and bzendagui committed Feb 25, 2022
1 parent d2e1895 commit 498d455
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
</licenses>

<properties>
<tycho-version>2.0.0</tycho-version>
<tycho-extras-version>2.0.0</tycho-extras-version>
<tycho-version>2.2.0</tycho-version>
<tycho-extras-version>2.2.0</tycho-extras-version>
<platform-version-name>oxygen</platform-version-name>
<tycho.scmUrl>scm:git:https://github.com/eclipse/capella-studio</tycho.scmUrl>
<maven.compiler.source>1.8</maven.compiler.source>
Expand Down Expand Up @@ -188,6 +188,7 @@
<version>${tycho-version}</version>
<configuration>
<targetDefinitionIncludeSource>honor</targetDefinitionIncludeSource>
<executionEnvironment>JavaSE-14</executionEnvironment>
<pomDependencies>consider</pomDependencies>
<target>
<artifact>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ openFile
<programArgsLin>--launcher.GTK_version
2
</programArgsLin>
<vmArgs>-Dosgi.requiredJavaVersion=1.8
<vmArgs>-Dosgi.requiredJavaVersion=11
-Dosgi.dataAreaRequiresExplicitInit=true
-Xms512m
-Xmx2048m
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@
</license>
</licenses>
<properties>
<tycho-version>2.0.0</tycho-version>
<tycho-extras-version>2.0.0</tycho-extras-version>
<platform-name>oxygen</platform-name>
<targetPlatform.repository>http://pdulth.github.io/fr.obeo.releng.targetplatform/p2/latest</targetPlatform.repository>
<targetPlatform.name>capellastudio.targetplatform</targetPlatform.name>
Expand Down

0 comments on commit 498d455

Please sign in to comment.