浏览代码

Merge branch 'master' of https://github.com/Yakindu/statecharts.git

Johannes Dicks 9 年之前
父节点
当前提交
30663ad4dd

+ 2 - 1
examples/org.yakindu.sct.standalone/META-INF/MANIFEST.MF

@@ -2,7 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Standalone
 Bundle-SymbolicName: org.yakindu.sct.standalone
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 0.9.0.qualifier
+Bundle-Vendor: itemis AG
 Export-Package: com.yakindu.sct.standalone
 Require-Bundle: org.yakindu.sct.model.sgen,
  org.yakindu.sct.generator.genmodel,

+ 1 - 1
plugins/org.yakindu.sct.generator.csharp/META-INF/MANIFEST.MF

@@ -28,5 +28,5 @@ Bundle-Vendor: statecharts.org
 Export-Package: org.yakindu.sct.generator.csharp,
  org.yakindu.sct.generator.csharp.features
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 

+ 9 - 9
releng/org.yakindu.base.target/Mars.target

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Mars (SCT)" sequenceNumber="40">
+<?pde version="3.8"?><target name="Mars (SCT)" sequenceNumber="42">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.1.1.201509120604"/>
 <unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="3.1.1.201509120604"/>
-<unit id="org.eclipse.cdt.sdk.feature.group" version="8.8.0.201509131935"/>
+<unit id="org.eclipse.cdt.sdk.feature.group" version="8.8.1.201602051005"/>
 <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.9.0.201505312221"/>
-<unit id="org.eclipse.uml2.sdk.feature.group" version="5.1.1.v20150906-1225"/>
-<unit id="org.eclipse.xtext.sdk.feature.group" version="2.8.4.v201508050135"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="2.11.1.v20150806-0404"/>
-<unit id="org.eclipse.jdt.feature.group" version="3.11.1.v20150904-0015"/>
-<unit id="org.eclipse.epp.mpc.feature.group" version="1.4.1.v20150916-1928"/>
+<unit id="org.eclipse.uml2.sdk.feature.group" version="5.1.2.v20160201-0816"/>
+<unit id="org.eclipse.xtext.sdk.feature.group" version="2.9.1.v201512180746"/>
+<unit id="org.eclipse.emf.sdk.feature.group" version="2.11.2.v20160208-0841"/>
+<unit id="org.eclipse.jdt.feature.group" version="3.11.2.v20160212-1500"/>
+<unit id="org.eclipse.epp.mpc.feature.group" version="1.4.2.v20160210-2005"/>
 <unit id="org.eclipse.gmf.feature.group" version="1.9.0.201506060219"/>
 <repository location="http://download.eclipse.org/releases/mars"/>
 </location>
@@ -20,8 +20,8 @@
 <repository location="http://download.itemis.com/updates/releases/2.1.1/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.pde.source.feature.group" version="3.11.1.v20150904-0345"/>
-<unit id="org.eclipse.platform.feature.group" version="4.5.1.v20150904-0015"/>
+<unit id="org.eclipse.pde.source.feature.group" version="3.11.2.v20160212-1500"/>
+<unit id="org.eclipse.platform.feature.group" version="4.5.2.v20160212-1500"/>
 <repository location="http://download.eclipse.org/eclipse/updates/4.5/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">

+ 19 - 15
releng/org.yakindu.base.target/Neon.target

@@ -1,20 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Neon (SCT)" sequenceNumber="25">
+<?pde version="3.8"?><target name="Neon (SCT)" sequenceNumber="27">
 <locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.platform.ide" version="4.6.0.I20151029-1100"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.6milestones"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.jdt.feature.group" version="3.12.0.v20150916-2000"/>
-<unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="3.2.0.201509300604"/>
-<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.9.0.201505312221"/>
-<unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.2.0.201509300604"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="2.12.0.v20150928-0952"/>
-<unit id="org.eclipse.xtext.sdk.feature.group" version="2.9.0.v201509281643"/>
-<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.9.0.201506060219"/>
-<repository location="http://download.eclipse.org/releases/neon"/>
-</location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="com.google.inject" version="3.0.0.v201312141243"/>
 <unit id="com.google.inject.source" version="3.0.0.v201312141243"/>
@@ -27,5 +13,23 @@
 <unit id="de.itemis.xtext.antlr.sdk.feature.group" version="2.1.1.v201405091103"/>
 <repository location="http://download.itemis.com/updates/releases/2.1.1/"/>
 </location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.platform.ide" version="4.6.0.I20160428-0800"/>
+<unit id="org.eclipse.pde.source.feature.group" version="3.12.0.v20160428-0800"/>
+<repository location="http://download.eclipse.org/eclipse/updates/4.6milestones"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.10.0.201605032009"/>
+<unit id="org.eclipse.epp.mpc.feature.group" version="1.5.0.v20160504-1925"/>
+<unit id="org.eclipse.cdt.sdk.feature.group" version="9.0.0.201605031942"/>
+<unit id="org.eclipse.emf.sdk.feature.group" version="2.12.0.v20160429-0808"/>
+<unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="3.2.0.201604280603"/>
+<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.10.0.201605030030"/>
+<unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.2.0.201604280603"/>
+<unit id="org.eclipse.jdt.feature.group" version="3.12.0.v20160428-0800"/>
+<unit id="org.eclipse.xtext.sdk.feature.group" version="2.10.0.v201604290858"/>
+<unit id="org.eclipse.uml2.sdk.feature.group" version="5.2.0.v20160502-0821"/>
+<repository location="http://download.eclipse.org/releases/neon"/>
+</location>
 </locations>
 </target>

+ 1 - 1
test-plugins/org.yakindu.sct.generator.csharp.test/META-INF/MANIFEST.MF

@@ -12,5 +12,5 @@ Require-Bundle: org.yakindu.sct.test.models;bundle-version="1.0.0",
  org.yakindu.sct.generator.genmodel;bundle-version="1.0.0",
  org.eclipse.jdt.core;bundle-version="3.7.3",
  org.eclipse.ui;bundle-version="3.7.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-Vendor: statecharts.org