Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZoltan Ujhelyi2017-11-02 09:43:08 -0400
committerZoltan Ujhelyi2017-11-10 11:48:36 -0500
commit81861ade72cd5d675473e74a02bcfb6a829d0d10 (patch)
tree780fab8cf1be6628fad88e103c3195fe4caa25a5
parent81cfa67a325969be390e041614b96dca668cef48 (diff)
downloadorg.eclipse.viatra.examples-81861ade72cd5d675473e74a02bcfb6a829d0d10.tar.gz
org.eclipse.viatra.examples-81861ade72cd5d675473e74a02bcfb6a829d0d10.tar.xz
org.eclipse.viatra.examples-81861ade72cd5d675473e74a02bcfb6a829d0d10.zip
[526765] Updated target platform for cps demonstrator1.x-maintenance
Change-Id: I4ab021656195baec614234f1ba3eadcf353eca97 Signed-off-by: Zoltan Ujhelyi <ujhelyiz@incquerylabs.com>
-rw-r--r--cps/pom.xml4
-rw-r--r--cps/releng/org.eclipse.viatra.examples.cps.application.product/cps-application.product5
-rw-r--r--cps/releng/org.eclipse.viatra.examples.cps.target/org.eclipse.viatra.examples.cps.target.target24
3 files changed, 16 insertions, 17 deletions
diff --git a/cps/pom.xml b/cps/pom.xml
index 7444d5c..f3e8db9 100644
--- a/cps/pom.xml
+++ b/cps/pom.xml
@@ -79,9 +79,9 @@
</profiles>
<properties>
<tycho.version>1.0.0</tycho.version>
- <xtend.compiler.version>2.11.0</xtend.compiler.version>
+ <xtend.compiler.version>2.10.0</xtend.compiler.version>
<viatra.repository.url>http://download.eclipse.org/viatra/updates/integration</viatra.repository.url>
- <viatra.compiler.version>1.6.0-SNAPSHOT</viatra.compiler.version>
+ <viatra.compiler.version>1.7.0-SNAPSHOT</viatra.compiler.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.7</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
diff --git a/cps/releng/org.eclipse.viatra.examples.cps.application.product/cps-application.product b/cps/releng/org.eclipse.viatra.examples.cps.application.product/cps-application.product
index 4eb72b2..1e20e70 100644
--- a/cps/releng/org.eclipse.viatra.examples.cps.application.product/cps-application.product
+++ b/cps/releng/org.eclipse.viatra.examples.cps.application.product/cps-application.product
@@ -3,7 +3,6 @@
<product name="VIATRA CPS Demonstrator Application Product" uid="org.eclipse.viatra.examples.cps.application.product" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="0.1.0" useFeatures="true" includeLaunchers="true">
-
<configIni use="default">
</configIni>
@@ -12,6 +11,7 @@
-Dcom.sun.management.jmxremote.port=&quot;10990&quot;
-Dcom.sun.management.jmxremote.authenticate=false
-Dcom.sun.management.jmxremote.ssl=false
+--add-modules=ALL-SYSTEM
</vmArgs>
<vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
</vmArgsMac>
@@ -19,14 +19,12 @@
<windowImages/>
-
<launcher name="viatra-cps">
<win useIco="false">
<bmp/>
</win>
</launcher>
-
<vm>
<linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</linux>
<macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</macos>
@@ -159,6 +157,7 @@
<plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
+ <property name="org.eclipse.update.reconcile" value="false" />
</configurations>
<preferencesInfo>
diff --git a/cps/releng/org.eclipse.viatra.examples.cps.target/org.eclipse.viatra.examples.cps.target.target b/cps/releng/org.eclipse.viatra.examples.cps.target/org.eclipse.viatra.examples.cps.target.target
index 3eb1923..d5a6b85 100644
--- a/cps/releng/org.eclipse.viatra.examples.cps.target/org.eclipse.viatra.examples.cps.target.target
+++ b/cps/releng/org.eclipse.viatra.examples.cps.target/org.eclipse.viatra.examples.cps.target.target
@@ -4,14 +4,14 @@
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.inject.multibindings" version="3.0.0.v201402270930"/>
- <unit id="org.eclipse.emf.sdk.feature.group" version="2.13.0.v20170504-0807"/>
+ <unit id="org.eclipse.emf.sdk.feature.group" version="2.13.0.v20170609-0928"/>
<unit id="org.eclipse.emf.transaction.feature.group" version="1.11.0.201706061339"/>
<unit id="org.eclipse.emf.validation.feature.group" version="1.11.0.201706061352"/>
- <unit id="org.eclipse.equinox.sdk.feature.group" version="3.13.0.v20170531-1133"/>
- <unit id="org.eclipse.sdk.feature.group" version="4.7.0.v20170531-2000"/>
+ <unit id="org.eclipse.equinox.sdk.feature.group" version="3.13.1.v20170928-1405"/>
+ <unit id="org.eclipse.sdk.feature.group" version="4.7.1.v20171009-0537"/>
<unit id="org.eclipse.draw2d.feature.group" version="3.10.100.201606061308"/>
<unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.9.1.201705291011"/>
- <repository location="http://download.eclipse.org/releases/oxygen/201706091000"/>
+ <repository location="http://download.eclipse.org/releases/oxygen/201710111001"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.xtext.sdk.feature.group" version="2.10.0.v201605250459"/>
@@ -19,18 +19,18 @@
<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.10.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
- <unit id="org.eclipse.fx.runtime.min.feature.feature.group" version="2.0.0.201506111452"/>
- <repository location="http://download.eclipse.org/efxclipse/updates-released/2.0.0/site"/>
+ <unit id="org.eclipse.fx.runtime.min.feature.feature.group" version="3.0.0.201705220748"/>
+ <repository location="http://download.eclipse.org/efxclipse/updates-released/3.0.0/site"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
- <unit id="org.eclipse.gef.graph.sdk.feature.group" version="5.0.0.201706131249"/>
- <unit id="org.eclipse.gef.zest.sdk.feature.group" version="5.0.0.201706131249"/>
- <unit id="org.eclipse.gef.layout.sdk.feature.group" version="5.0.0.201706131249"/>
- <repository location="http://download.eclipse.org/tools/gef/updates/releases/5.0.0_gef-master_4403"/>
+ <unit id="org.eclipse.gef.graph.sdk.feature.group" version="5.0.0.201708280201"/>
+ <unit id="org.eclipse.gef.zest.sdk.feature.group" version="5.0.1.201708280201"/>
+ <unit id="org.eclipse.gef.layout.sdk.feature.group" version="5.0.0.201708280201"/>
+ <repository location="http://download.eclipse.org/tools/gef/updates/releases/5.0.1_gef-maintenance_73"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.collections" version="8.2.0.v20170622-1916"/>
- <repository location="http://download.eclipse.org/collections/8.2.0/repository/"/>
+ <unit id="org.eclipse.collections" version="9.0.0.v20170920-0536"/>
+ <repository location="http://download.eclipse.org/collections/9.0.0/repository/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>

Back to the top