Version 0.1.2, including last changes of Verification

dice-project · Sep 12, 2016 · 3ae9e72 · 3ae9e72
1 parent 5a5ad24
commit 3ae9e72
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 26 deletions.
diff --git a/README.md b/README.md
@@ -64,7 +64,13 @@ If you want to build your own DICE IDE, you need to follow these steps:
 # New version of the DICE IDE
 
 * Before building a new version of the RCP, you need to set up the new version number. You can do it modifying the pom.xml file from the "org.dice.configuration" project. Replace the <dice.version> property with the new version.
-* Also you need to change the features and plugins version number from the plugin.xml file, and the dependencies of the features too. You will know that all is well configured because when a feature points to a plugin with a failing version number, the feature is marked with a Warning. Also, the build of the product will fail too.
+* Also you need to change the features and plugins version number from the plugin.xml file, and the dependencies of the features too. You will know that all is well configured because when a feature points to a plugin with a failing version number, the feature is marked with a Warning. Also, the build of the product will fail too. At least the following changes should be done:
+	* Change the version in the "org.dice.product/dice.product" file
+	* Change the version in the "org.dice.rcp/plugin.xml" file
+	* Change the version of the dependency in the "org.dice.features.base" feature to the "org.dice.rcp" plugin
+	* Change the property "dice.version" in the "org.dice.configuration/pom.xml" file
+
+* MAC Users: you need to change the permision of the DICE file: chmod 0744 DICE
 
 # How Tycho works
 

diff --git a/dice_papyrus_models/components.uml b/dice_papyrus_models/components.uml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="__KLVQOBVEeW-1LDt9RpxOw" name="Components">
-  <packagedElement xmi:type="uml:Component" xmi:id="_QCVlMOBWEeWNL_YKB8_3iw" name="DICE IDE 0.1.1">
+  <packagedElement xmi:type="uml:Component" xmi:id="_QCVlMOBWEeWNL_YKB8_3iw" name="DICE IDE 0.1.2">
     <packagedElement xmi:type="uml:Component" xmi:id="_eBirAOBWEeWNL_YKB8_3iw" name="Eclipse 4.6.0"/>
     <packagedElement xmi:type="uml:Component" xmi:id="_js0y0OBWEeWNL_YKB8_3iw" name="EMF 2.12.0">
       <packagedElement xmi:type="uml:Dependency" xmi:id="_Ps3PAOBXEeWNL_YKB8_3iw" client="_js0y0OBWEeWNL_YKB8_3iw" supplier="_OCjCQOBXEeWNL_YKB8_3iw"/>
@@ -62,7 +62,7 @@
     <packagedElement xmi:type="uml:Component" xmi:id="_FkkjcBXYEea6Lq6Z3vyxgQ" name="Deployments 0.1.2">
       <packagedElement xmi:type="uml:Dependency" xmi:id="_LBopEBXYEea6Lq6Z3vyxgQ" client="_FkkjcBXYEea6Lq6Z3vyxgQ" supplier="_eBirAOBWEeWNL_YKB8_3iw"/>
     </packagedElement>
-    <packagedElement xmi:type="uml:Component" xmi:id="_NpjeACJDEeaIF4cCpWN5hQ" name="Verification 1.0.0">
+    <packagedElement xmi:type="uml:Component" xmi:id="_NpjeACJDEeaIF4cCpWN5hQ" name="Verification 0.1.0">
       <packagedElement xmi:type="uml:Dependency" xmi:id="_hweX8DoIEeayPqVVna4Iww" client="_NpjeACJDEeaIF4cCpWN5hQ" supplier="_eBirAOBWEeWNL_YKB8_3iw"/>
     </packagedElement>
   </packagedElement>

diff --git a/org.dice.root/bundles/org.dice.rcp/META-INF/MANIFEST.MF b/org.dice.root/bundles/org.dice.rcp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: DICE RCP
 Bundle-SymbolicName: org.dice.rcp;singleton:=true
-Bundle-Version: 0.1.1.qualifier
+Bundle-Version: 0.1.2.qualifier
 Bundle-Activator: org.dice.rcp.DiceActivator
 Bundle-Vendor: DICE Project
 Require-Bundle: javax.inject;bundle-version="0.0.0",

diff --git a/org.dice.root/bundles/org.dice.verification/META-INF/MANIFEST.MF b/org.dice.root/bundles/org.dice.verification/META-INF/MANIFEST.MF
@@ -8,8 +8,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.debug.ui,
  org.eclipse.papyrus.uml.tools,
- it.polimi.dice.verification;bundle-version="1.0.0",
- it.polimi.dice.verification.ui;bundle-version="1.0.0"
+ it.polimi.dice.verification;bundle-version="0.1.0",
+ it.polimi.dice.verification.ui;bundle-version="0.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: DICE Project
diff --git a/org.dice.root/features/org.dice.features.base/feature.xml b/org.dice.root/features/org.dice.features.base/feature.xml
@@ -222,7 +222,7 @@ litigation
          id="org.dice.rcp"
          download-size="0"
          install-size="0"
-         version="0.1.1.qualifier"
+         version="0.1.2.qualifier"
          unpack="false"/>
 
    <plugin

diff --git a/org.dice.root/features/org.dice.features.verification/feature.xml b/org.dice.root/features/org.dice.features.verification/feature.xml
@@ -222,7 +222,6 @@ litigation
       <import feature="org.dice.features.base" version="4.6.0.qualifier"/>
       <import plugin="it.polimi.dice.core"/>
       <import plugin="it.polimi.dice.core.ui"/>
-      <import plugin="it.polimi.dice.profiles"/>
       <import plugin="it.polimi.dice.verification"/>
       <import plugin="it.polimi.dice.verification.ui"/>
       <import plugin="it.polimi.dice.verification.uml2json"/>

diff --git a/org.dice.root/releng/org.dice.configuration/pom.xml b/org.dice.root/releng/org.dice.configuration/pom.xml
@@ -12,7 +12,7 @@
 		<maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-		<dice.version>0.1.1</dice.version>
+		<dice.version>0.1.2</dice.version>
 		<dice.timestamp>${maven.build.timestamp}</dice.timestamp>
 
 		<tycho.version>0.25.0</tycho.version>
@@ -24,7 +24,6 @@
 		<orbit.url>http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository</orbit.url>
 		<papyrus.url>http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/neon/</papyrus.url>
 		<ocl.url>http://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.1.0</ocl.url>
-		<subclipse.url>http://subclipse.tigris.org/update_1.12.x</subclipse.url>
 		<egit.url>http://download.eclipse.org/egit/updates</egit.url>
 		<ecf.url>http://download.eclipse.org/rt/ecf/3.13.1/site.p2/</ecf.url>
 		<pnml.url>http://pnml.lip6.fr/pnmlframework/updatesite/</pnml.url>
@@ -61,11 +60,6 @@
 			<layout>p2</layout>
 			<url>${ocl.url}</url>
 		</repository>
-		<repository>
-			<id>subclipse</id>
-			<layout>p2</layout>
-			<url>${subclipse.url}</url>
-		</repository>
 		<repository>
 			<id>egit</id>
 			<layout>p2</layout>

diff --git a/org.dice.root/releng/org.dice.product/dice.product b/org.dice.root/releng/org.dice.product/dice.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="DICE Platform" uid="org.dice.rcp.dice" id="org.dice.rcp.dice" application="org.eclipse.ui.ide.workbench" version="0.1.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="DICE Platform" uid="org.dice.rcp.dice" id="org.dice.rcp.dice" application="org.eclipse.ui.ide.workbench" version="0.1.2.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="icons/120.gif"/>
@@ -41,11 +41,9 @@ org.eclipse.papyrus.infra.core.perspective
       </win>
    </launcher>
 
-
    <vm>
    </vm>
 
-
    <plugins>
    </plugins>
 

diff --git a/org.dice.root/releng/org.dice.target/org.dice.target.target b/org.dice.root/releng/org.dice.target/org.dice.target.target
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="DICE Target Platform" sequenceNumber="269">
+<?pde version="3.8"?><target name="DICE Target Platform" sequenceNumber="270">
 <locations>
 <location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.dice.features.deployments.feature.group" version="0.1.2"/>
@@ -28,13 +28,6 @@
 <repository location="http://download.eclipse.org/rt/ecf/3.13.1/site.p2/"/>
 </location>
 <location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="it.polimi.dice.profiles.feature.feature.group" version="1.0.0.201605130950"/>
-<unit id="it.polimi.dice.verification.uml2json.feature.feature.group" version="1.0.0.201605130950"/>
-<unit id="it.polimi.dice.verification.ui.feature.feature.group" version="1.0.0.201605130950"/>
-<unit id="it.polimi.dice.verification.feature.feature.group" version="1.0.0.201605130950"/>
-<repository location="http://dice-project.github.io/DICE-Verification/updates"/>
-</location>
-<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.papyrus.extra.marte.feature.feature.group" version="1.2.0.201606080903"/>
 <unit id="org.eclipse.papyrus.extra.marte.textedit.feature.feature.group" version="1.2.0.201606080903"/>
 <unit id="org.eclipse.papyrus.extra.marte.properties.feature.feature.group" version="1.2.0.201606080903"/>
@@ -185,6 +178,12 @@
 <unit id="es.unizar.disco.simulation.quickstart.feature.feature.group" version="0.3.3.201609011724"/>
 <repository location="http://dice-project.github.io/DICE-Simulation/updates"/>
 </location>
+<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="it.polimi.dice.verification.uml2json.feature.feature.group" version="0.1.0.201609091443"/>
+<unit id="it.polimi.dice.verification.feature.feature.group" version="0.1.0.201609091443"/>
+<unit id="it.polimi.dice.verification.ui.feature.feature.group" version="0.1.0.201609091443"/>
+<repository location="http://dice-project.github.io/DICE-Verification/updates"/>
+</location>
 </locations>
 <launcherArgs>
 <vmArgs>-Dosgi.requiredJavaVersion=1.7 -Xms256m -Xmx1024m</vmArgs>