Initial step to Photon
1] Dependency cleaning
2] Fix build failures while importing into Eclipse
3] Make end of line LF instead of CRLF
4] Remove all reexported dependencies
Change-Id: I0e091c186c114c337172d7fcee91f021f6b9da0e
Signed-off-by: jeremie.tatibouet <jeremie.tatibouet@cea.fr>
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/META-INF/MANIFEST.MF b/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/META-INF/MANIFEST.MF
index a476e3b..3b8cf34 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/META-INF/MANIFEST.MF
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/META-INF/MANIFEST.MF
@@ -1,13 +1,17 @@
Manifest-Version: 1.0
Require-Bundle: org.eclipse.ui;bundle-version="[3.109.0,4.0.0)",
- org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.ui.console;bundle-version="[3.6.100,4.0.0)",
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)",
- org.aspectj.runtime;bundle-version="[1.8.10,2.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.100,4.0.0)",
+ org.eclipse.ui.console;bundle-version="[3.8.0,4.0.0)",
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.3.0,2.0.0)",
+ org.aspectj.runtime;bundle-version="[1.9.0,2.0.0)",
org.eclipse.papyrus.moka;bundle-version="2.0.100",
org.eclipse.papyrus.moka.utils;bundle-version="2.0.100",
+ org.eclipse.papyrus.moka.fuml;bundle-version="3.0.0",
+ org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="3.0.0",
org.eclipse.papyrus.moka.composites;bundle-version="3.0.0",
- org.eclipse.papyrus.moka.fuml.standardlibrary;bundle-version="2.0.100"
+ org.eclipse.papyrus.moka.composites.interfaces;bundle-version="3.0.0",
+ org.eclipse.papyrus.moka.fuml.standardlibrary;bundle-version="2.0.100",
+ org.eclipse.debug.core;bundle-version="[3.12.0,4.0.0)"
Export-Package: org.eclipse.papyrus.moka.async.fuml,
org.eclipse.papyrus.moka.async.fuml.Semantics.Classes.Kernel,
org.eclipse.papyrus.moka.async.fuml.Semantics.CommonBehaviors.Communications,
@@ -21,3 +25,4 @@
Bundle-Activator: org.eclipse.papyrus.moka.async.fuml.Activator
Bundle-SymbolicName: org.eclipse.papyrus.moka.async.fuml;singleton:=true
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.papyrus.moka.async.fuml
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/build.properties b/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/build.properties
index 23867be..d41a608 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/build.properties
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.async.fuml/build.properties
@@ -1,7 +1,9 @@
source.. = src/
+output.. = target/classes/
bin.includes = META-INF/,\
.,\
plugin.xml,\
resources/,\
- about.html
+ about.html,\
+ pom.xml
src.includes = about.html
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/META-INF/MANIFEST.MF b/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/META-INF/MANIFEST.MF
index ea42f69..f290936 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/META-INF/MANIFEST.MF
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@
Bundle-SymbolicName: org.eclipse.papyrus.moka.composites.interfaces
Bundle-Version: 3.0.0.qualifier
Bundle-Activator: org.eclipse.papyrus.moka.composites.interfaces.Activator
-Require-Bundle: org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="3.0.0";visibility:=reexport
+Require-Bundle: org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="3.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Bundle-Vendor: Eclipse Modeling Project
@@ -15,3 +15,4 @@
org.eclipse.papyrus.moka.composites.interfaces.Semantics.CompositeStructures.InvocationActions,
org.eclipse.papyrus.moka.composites.interfaces.Semantics.CompositeStructures.StructuredClasses,
org.eclipse.papyrus.moka.composites.interfaces.extensions.Semantics.CompositeStructures.StructuredClasses
+Automatic-Module-Name: org.eclipse.papyrus.moka.composites.interfaces
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/build.properties b/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/build.properties
index ca51cea..94296b5 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/build.properties
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites.interfaces/build.properties
@@ -1,5 +1,7 @@
source.. = src/
+output.. = target/classes/
bin.includes = META-INF/,\
.,\
- about.html
+ about.html,\
+ pom.xml
src.includes = about.html
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites/META-INF/MANIFEST.MF b/bundles/core/engines/org.eclipse.papyrus.moka.composites/META-INF/MANIFEST.MF
index 81c4ee4..80e35c8 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites/META-INF/MANIFEST.MF
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites/META-INF/MANIFEST.MF
@@ -1,8 +1,10 @@
Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.moka.fuml;bundle-version="2.0.100";visibility:=reexport,
- org.eclipse.papyrus.moka.composites.interfaces;bundle-version="3.0.0";visibility:=reexport,
+Require-Bundle: org.eclipse.papyrus.moka.fuml;bundle-version="3.0.0",
+ org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="3.0.0",
+ org.eclipse.papyrus.moka.composites.interfaces;bundle-version="3.0.0",
org.eclipse.papyrus.moka;bundle-version="2.0.100",
- org.aspectj.runtime;bundle-version="[1.8.10,2.0.0)"
+ org.aspectj.runtime;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.debug.core;bundle-version="[3.12.0,4.0.0)"
Export-Package: org.eclipse.papyrus.moka.composites,
org.eclipse.papyrus.moka.composites.Semantics.impl.Actions.CompleteActions,
org.eclipse.papyrus.moka.composites.Semantics.impl.Actions.IntermediateActions,
@@ -21,3 +23,4 @@
Bundle-Activator: org.eclipse.papyrus.moka.composites.Activator
Bundle-SymbolicName: org.eclipse.papyrus.moka.composites;singleton:=true
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.papyrus.moka.composites
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.composites/build.properties b/bundles/core/engines/org.eclipse.papyrus.moka.composites/build.properties
index 225a595..5062fdd 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.composites/build.properties
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.composites/build.properties
@@ -1,7 +1,9 @@
source.. = src/,\
generated/
+output.. = target/classes/
bin.includes = META-INF/,\
.,\
plugin.xml,\
- about.html
+ about.html,\
+ pom.xml
src.includes = about.html
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/META-INF/MANIFEST.MF b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/META-INF/MANIFEST.MF
index 1b8c1a9..5ed5d86 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/META-INF/MANIFEST.MF
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/META-INF/MANIFEST.MF
@@ -5,10 +5,10 @@
Bundle-Version: 3.0.0.qualifier
Bundle-Activator: org.eclipse.papyrus.moka.fuml.Semantics.Activator
Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)";visibility:=reexport,
- org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)";visibility:=reexport,
- org.aspectj.runtime;bundle-version="[1.8.10,2.0.0)",
- org.eclipse.equinox.registry;bundle-version="[3.7.0,4.0.0)"
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)";visibility:=reexport,
+ org.eclipse.uml2.uml;bundle-version="[5.4.0,6.0.0)";visibility:=reexport,
+ org.aspectj.runtime;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.equinox.registry;bundle-version="[3.8.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.papyrus.moka.fuml.Profiling,
@@ -24,3 +24,4 @@
org.eclipse.papyrus.moka.fuml.Semantics.CommonBehaviors.BasicBehaviors,
org.eclipse.papyrus.moka.fuml.Semantics.CommonBehaviors.Communications,
org.eclipse.papyrus.moka.fuml.Semantics.Loci.LociL1
+Automatic-Module-Name: org.eclipse.papyrus.moka.fuml.interfaces
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/build.properties b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/build.properties
index ca51cea..94296b5 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/build.properties
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.interfaces/build.properties
@@ -1,5 +1,7 @@
source.. = src/
+output.. = target/classes/
bin.includes = META-INF/,\
.,\
- about.html
+ about.html,\
+ pom.xml
src.includes = about.html
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/META-INF/MANIFEST.MF b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/META-INF/MANIFEST.MF
index d9796f8..e7cbb4d 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/META-INF/MANIFEST.MF
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/META-INF/MANIFEST.MF
@@ -5,7 +5,10 @@
Bundle-Version: 2.0.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.papyrus.moka.composites.interfaces;bundle-version="3.0.0";visibility:=reexport
+Require-Bundle: org.eclipse.papyrus.moka.composites.interfaces;bundle-version="3.0.0",
+ org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="3.0.0",
+ org.aspectj.runtime;bundle-version="[1.9.0,2.0.0)"
Export-Package: org.eclipse.papyrus.moka.fuml.statemachines.interfaces.Semantics.CommonBehavior,
org.eclipse.papyrus.moka.fuml.statemachines.interfaces.Semantics.StateMachines,
org.eclipse.papyrus.moka.fuml.statemachines.interfaces.Semantics.Values
+Automatic-Module-Name: org.eclipse.papyrus.moka.fuml.statemachines.interfaces
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/build.properties b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/build.properties
index b107977..dac14ed 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/build.properties
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines.interfaces/build.properties
@@ -1,3 +1,5 @@
source.. = src/
+output.. = target/classes/
bin.includes = META-INF/,\
- .
+ .,\
+ pom.xml
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/META-INF/MANIFEST.MF b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/META-INF/MANIFEST.MF
index ae310a4..c8e56d9 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/META-INF/MANIFEST.MF
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/META-INF/MANIFEST.MF
@@ -4,12 +4,16 @@
Bundle-SymbolicName: org.eclipse.papyrus.moka.fuml.statemachines;singleton:=true
Bundle-Version: 2.0.0.qualifier
Bundle-Activator: org.eclipse.papyrus.moka.fuml.statemachines.Activator
-Require-Bundle: org.eclipse.papyrus.moka.composites;bundle-version="3.0.0";visibility:=reexport,
- org.eclipse.papyrus.moka.fuml.statemachines.interfaces;bundle-version="2.0.0";visibility:=reexport,
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.moka;bundle-version="2.0.100",
+Require-Bundle: org.eclipse.debug.core;bundle-version="[3.12.0,4.0.0)",
org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
- org.aspectj.runtime;bundle-version="[1.8.10,2.0.0)"
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.3.0,2.0.0)",
+ org.aspectj.runtime;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.papyrus.moka;bundle-version="2.0.100",
+ org.eclipse.papyrus.moka.fuml;bundle-version="3.0.0",
+ org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="3.0.0",
+ org.eclipse.papyrus.moka.composites;bundle-version="3.0.0",
+ org.eclipse.papyrus.moka.composites.interfaces;bundle-version="3.0.0",
+ org.eclipse.papyrus.moka.fuml.statemachines.interfaces;bundle-version="2.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Bundle-Vendor: Eclipse Modeling Project
@@ -20,3 +24,4 @@
org.eclipse.papyrus.moka.fuml.statemachines.Semantics.StateMachines,
org.eclipse.papyrus.moka.fuml.statemachines.Semantics.StructuredClassifiers,
org.eclipse.papyrus.moka.fuml.statemachines.Semantics.Values
+Automatic-Module-Name: org.eclipse.papyrus.moka.fuml.statemachines
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/build.properties b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/build.properties
index e293cf7..6390969 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/build.properties
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml.statemachines/build.properties
@@ -1,6 +1,8 @@
source.. = src/,\
aspects/
+output.. = target/classes/
bin.includes = META-INF/,\
.,\
plugin.xml,\
- resources/
+ resources/,\
+ pom.xml
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/META-INF/MANIFEST.MF b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/META-INF/MANIFEST.MF
index 433c0c9..0203c38 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/META-INF/MANIFEST.MF
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/META-INF/MANIFEST.MF
@@ -1,35 +1,145 @@
Manifest-Version: 1.0
Require-Bundle: org.apache.commons.lang;bundle-version="[2.6.0,3.0.0)",
org.eclipse.papyrus.moka.utils;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="3.0.0";visibility:=reexport,
+ org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="3.0.0",
org.eclipse.papyrus.moka;bundle-version="2.0.100",
- org.aspectj.runtime;bundle-version="[1.8.10,2.0.0)",
- org.eclipse.papyrus.moka.service;bundle-version="2.0.100"
-Export-Package: org.eclipse.papyrus.moka.fuml;uses:="org.eclipse.ui.plugin,org.osgi.framework",
- org.eclipse.papyrus.moka.fuml.Semantics.impl.Actions.BasicActions,
- org.eclipse.papyrus.moka.fuml.Semantics.impl.Actions.CompleteActions,
- org.eclipse.papyrus.moka.fuml.Semantics.impl.Actions.IntermediateActions,
- org.eclipse.papyrus.moka.fuml.Semantics.impl.Activities.CompleteStructuredActivities,
- org.eclipse.papyrus.moka.fuml.Semantics.impl.Activities.ExtraStructuredActivities,
- org.eclipse.papyrus.moka.fuml.Semantics.impl.Activities.IntermediateActivities,
- org.eclipse.papyrus.moka.fuml.Semantics.impl.Classes.Kernel,
- org.eclipse.papyrus.moka.fuml.Semantics.impl.CommonBehaviors.BasicBehaviors,
- org.eclipse.papyrus.moka.fuml.Semantics.impl.CommonBehaviors.Communications,
- org.eclipse.papyrus.moka.fuml.Semantics.impl.Loci.LociL1,
- org.eclipse.papyrus.moka.fuml.Semantics.impl.Loci.LociL2,
- org.eclipse.papyrus.moka.fuml.Semantics.impl.Loci.LociL3,
- org.eclipse.papyrus.moka.fuml.control.execution,
- org.eclipse.papyrus.moka.fuml.control.queue,
+ org.aspectj.runtime;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.papyrus.moka.service;bundle-version="2.0.100",
+ org.eclipse.debug.core;bundle-version="[3.12.0,4.0.0)"
+Export-Package: org.eclipse.papyrus.moka.fuml;
+ uses:="org.eclipse.papyrus.moka.engine,
+ org.osgi.framework,
+ org.eclipse.core.runtime,
+ org.eclipse.debug.core.model,
+ org.eclipse.papyrus.moka.fuml.Semantics.Loci.LociL1",
+ org.eclipse.papyrus.moka.fuml.Semantics.impl.Actions.BasicActions;
+ uses:="org.eclipse.papyrus.moka.fuml.Semantics.CommonBehaviors.BasicBehaviors,
+ org.eclipse.papyrus.moka.fuml.Semantics.Actions.BasicActions,
+ org.eclipse.papyrus.moka.fuml.Semantics.impl.Classes.Kernel,
+ org.eclipse.uml2.uml,
+ org.eclipse.papyrus.moka.fuml.Semantics.Activities.IntermediateActivities,
+ org.eclipse.papyrus.moka.fuml.Semantics.impl.Activities.IntermediateActivities,
+ org.eclipse.papyrus.moka.fuml.Semantics.Classes.Kernel",
+ org.eclipse.papyrus.moka.fuml.Semantics.impl.Actions.CompleteActions;
+ uses:="org.eclipse.papyrus.moka.fuml.Semantics.CommonBehaviors.BasicBehaviors,
+ org.eclipse.uml2.uml,
+ org.eclipse.papyrus.moka.fuml.Semantics.impl.CommonBehaviors.Communications,
+ org.eclipse.papyrus.moka.fuml.Semantics.Actions.CompleteActions,
+ org.eclipse.papyrus.moka.fuml.Semantics.Activities.IntermediateActivities,
+ org.eclipse.papyrus.moka.fuml.Semantics.impl.Actions.BasicActions,
+ org.eclipse.papyrus.moka.fuml.Semantics.CommonBehaviors.Communications",
+ org.eclipse.papyrus.moka.fuml.Semantics.impl.Actions.IntermediateActions;
+ uses:="org.eclipse.papyrus.moka.fuml.Semantics.impl.Loci.LociL1,
+ org.eclipse.uml2.uml,
+ org.eclipse.papyrus.moka.fuml.Semantics.Actions.IntermediateActions,
+ org.eclipse.papyrus.moka.fuml.Semantics.Classes.Kernel,
+ org.eclipse.papyrus.moka.fuml.Semantics.impl.Actions.BasicActions,
+ org.eclipse.papyrus.moka.fuml.Semantics.Loci.LociL1",
+ org.eclipse.papyrus.moka.fuml.Semantics.impl.Activities.CompleteStructuredActivities;
+ uses:="org.eclipse.papyrus.moka.fuml.Semantics.impl.Classes.Kernel,
+ org.eclipse.uml2.uml,
+ org.eclipse.papyrus.moka.fuml.Semantics.Activities.IntermediateActivities,
+ org.eclipse.papyrus.moka.fuml.Semantics.impl.Activities.IntermediateActivities,
+ org.eclipse.papyrus.moka.fuml.Semantics.Activities.CompleteStructuredActivities,
+ org.eclipse.papyrus.moka.fuml.Semantics.impl.Actions.BasicActions",
+ org.eclipse.papyrus.moka.fuml.Semantics.impl.Activities.ExtraStructuredActivities;
+ uses:="org.eclipse.uml2.uml,
+ org.eclipse.papyrus.moka.fuml.Semantics.Activities.ExtraStructuredActivities,
+ org.eclipse.papyrus.moka.fuml.Semantics.Activities.IntermediateActivities,
+ org.eclipse.papyrus.moka.fuml.Semantics.impl.Activities.IntermediateActivities,
+ org.eclipse.papyrus.moka.fuml.Semantics.impl.Actions.BasicActions",
+ org.eclipse.papyrus.moka.fuml.Semantics.impl.Activities.IntermediateActivities;
+ uses:="org.eclipse.papyrus.moka.fuml.Semantics.CommonBehaviors.BasicBehaviors,
+ org.eclipse.papyrus.moka.fuml.Semantics.impl.Loci.LociL1,
+ org.eclipse.papyrus.moka.fuml.Semantics.impl.CommonBehaviors.BasicBehaviors,
+ org.eclipse.papyrus.moka.fuml.Semantics.impl.Classes.Kernel,
+ org.eclipse.uml2.uml,
+ org.eclipse.papyrus.moka.fuml.Semantics.Activities.IntermediateActivities,
+ org.eclipse.papyrus.moka.fuml.Semantics.Classes.Kernel,
+ org.eclipse.papyrus.moka.fuml.Semantics.Activities.CompleteStructuredActivities,
+ org.eclipse.papyrus.moka.fuml.Semantics.Loci.LociL1",
+ org.eclipse.papyrus.moka.fuml.Semantics.impl.Classes.Kernel;
+ uses:="org.eclipse.papyrus.moka.fuml.Semantics.CommonBehaviors.BasicBehaviors,
+ org.eclipse.papyrus.moka.fuml.Semantics.impl.Loci.LociL1,
+ org.eclipse.uml2.uml,
+ org.eclipse.papyrus.moka.fuml.Semantics.Classes.Kernel,
+ org.eclipse.papyrus.moka.fuml.Semantics.Loci.LociL1,
+ org.eclipse.papyrus.moka.fuml.Semantics.CommonBehaviors.Communications",
+ org.eclipse.papyrus.moka.fuml.Semantics.impl.CommonBehaviors.BasicBehaviors;
+ uses:="org.eclipse.papyrus.moka.fuml.Semantics.CommonBehaviors.BasicBehaviors,
+ org.eclipse.papyrus.moka.fuml.Semantics.impl.Classes.Kernel,
+ org.eclipse.uml2.uml,
+ org.eclipse.uml2.uml.internal.impl,
+ org.eclipse.papyrus.moka.fuml.Semantics.Classes.Kernel,
+ org.eclipse.papyrus.moka.fuml.Semantics.CommonBehaviors.Communications",
+ org.eclipse.papyrus.moka.fuml.Semantics.impl.CommonBehaviors.Communications;
+ uses:="org.eclipse.papyrus.moka.fuml.Semantics.CommonBehaviors.BasicBehaviors,
+ org.eclipse.papyrus.moka.fuml.Semantics.impl.Loci.LociL1,
+ org.eclipse.papyrus.moka.fuml.Semantics.impl.Classes.Kernel,
+ org.eclipse.uml2.uml,
+ org.eclipse.papyrus.moka.fuml.Semantics.Classes.Kernel,
+ org.eclipse.papyrus.moka.fuml.Semantics.CommonBehaviors.Communications",
+ org.eclipse.papyrus.moka.fuml.Semantics.impl.Loci.LociL1;
+ uses:="org.eclipse.papyrus.moka.fuml.Semantics.CommonBehaviors.BasicBehaviors,
+ org.eclipse.uml2.uml,
+ org.eclipse.papyrus.moka.fuml.Semantics.Classes.Kernel,
+ org.eclipse.papyrus.moka.fuml.Semantics.Loci.LociL1",
+ org.eclipse.papyrus.moka.fuml.Semantics.impl.Loci.LociL2;uses:="org.eclipse.papyrus.moka.fuml.Semantics.impl.Loci.LociL1,org.eclipse.uml2.uml,org.eclipse.papyrus.moka.fuml.Semantics.Loci.LociL1",
+ org.eclipse.papyrus.moka.fuml.Semantics.impl.Loci.LociL3;uses:="org.eclipse.uml2.uml,org.eclipse.papyrus.moka.fuml.Semantics.impl.Loci.LociL2,org.eclipse.papyrus.moka.fuml.Semantics.Loci.LociL1",
+ org.eclipse.papyrus.moka.fuml.control.execution;
+ uses:="org.eclipse.papyrus.moka.fuml.Semantics.impl.CommonBehaviors.BasicBehaviors,
+ org.eclipse.uml2.uml,
+ org.eclipse.papyrus.moka.fuml.Semantics.Classes.Kernel,
+ org.eclipse.papyrus.moka.fuml.Semantics.Loci.LociL1,
+ org.eclipse.papyrus.moka.fuml.Semantics.CommonBehaviors.Communications",
+ org.eclipse.papyrus.moka.fuml.control.queue;uses:="org.eclipse.papyrus.moka.fuml.Semantics.CommonBehaviors.BasicBehaviors,org.eclipse.papyrus.moka.fuml.control.execution",
org.eclipse.papyrus.moka.fuml.debug,
- org.eclipse.papyrus.moka.fuml.profiling,
- org.eclipse.papyrus.moka.fuml.profiling.Semantics.Actions.BasicActions,
- org.eclipse.papyrus.moka.fuml.profiling.Semantics.Actions.CompleteActions,
- org.eclipse.papyrus.moka.fuml.profiling.Semantics.Activities.IntermediateActivities,
- org.eclipse.papyrus.moka.fuml.profiling.Semantics.Classes.Kernel,
- org.eclipse.papyrus.moka.fuml.profiling.Semantics.CommonBehaviors.Communications,
- org.eclipse.papyrus.moka.fuml.profiling.Semantics.Loci,
- org.eclipse.papyrus.moka.fuml.registry,
- org.eclipse.papyrus.moka.fuml.registry.service.framework
+ org.eclipse.papyrus.moka.fuml.profiling;uses:="org.eclipse.papyrus.moka.service",
+ org.eclipse.papyrus.moka.fuml.profiling.Semantics.Actions.BasicActions;
+ uses:="org.eclipse.papyrus.moka.fuml.Semantics.Actions.BasicActions,
+ org.eclipse.uml2.uml,
+ org.eclipse.papyrus.moka.fuml.profiling.Semantics.Loci,
+ org.eclipse.papyrus.moka.fuml.Profiling,
+ org.eclipse.papyrus.moka.fuml.Semantics.Activities.IntermediateActivities,
+ org.eclipse.papyrus.moka.fuml.Semantics.Classes.Kernel,
+ org.eclipse.papyrus.moka.fuml.Semantics.Loci.LociL1",
+ org.eclipse.papyrus.moka.fuml.profiling.Semantics.Actions.CompleteActions;
+ uses:="org.eclipse.papyrus.moka.fuml.Semantics.Actions.BasicActions,
+ org.eclipse.papyrus.moka.fuml.profiling.Semantics.CommonBehaviors.Communications,
+ org.eclipse.uml2.uml,
+ org.eclipse.papyrus.moka.fuml.profiling.Semantics.Loci,
+ org.eclipse.papyrus.moka.fuml.Semantics.Actions.CompleteActions,
+ org.eclipse.papyrus.moka.fuml.Semantics.Activities.IntermediateActivities,
+ org.eclipse.papyrus.moka.fuml.Semantics.Classes.Kernel,
+ org.eclipse.papyrus.moka.fuml.Semantics.Loci.LociL1,
+ org.eclipse.papyrus.moka.fuml.Semantics.CommonBehaviors.Communications",
+ org.eclipse.papyrus.moka.fuml.profiling.Semantics.Activities.IntermediateActivities;
+ uses:="org.eclipse.papyrus.moka.fuml.Semantics.CommonBehaviors.BasicBehaviors,
+ org.eclipse.papyrus.moka.fuml.Semantics.Actions.BasicActions,
+ org.eclipse.papyrus.moka.fuml.profiling.Semantics.Loci,
+ org.eclipse.papyrus.moka.fuml.Semantics.Activities.IntermediateActivities",
+ org.eclipse.papyrus.moka.fuml.profiling.Semantics.Classes.Kernel;uses:="org.eclipse.uml2.uml,org.eclipse.papyrus.moka.fuml.Profiling.Semantics.Kernel.Classes,org.eclipse.papyrus.moka.fuml.Semantics.Classes.Kernel",
+ org.eclipse.papyrus.moka.fuml.profiling.Semantics.CommonBehaviors.Communications;uses:="org.eclipse.papyrus.moka.fuml.Profiling,org.eclipse.papyrus.moka.fuml.profiling,org.eclipse.papyrus.moka.fuml.Semantics.CommonBehaviors.Communications",
+ org.eclipse.papyrus.moka.fuml.profiling.Semantics.Loci;
+ uses:="org.eclipse.papyrus.moka.fuml.Semantics.CommonBehaviors.BasicBehaviors,
+ org.eclipse.uml2.uml,
+ org.eclipse.papyrus.moka.fuml.Semantics.Classes.Kernel,
+ org.eclipse.papyrus.moka.fuml.Semantics.Loci.LociL1,
+ org.eclipse.papyrus.moka.fuml.profiling",
+ org.eclipse.papyrus.moka.fuml.registry;
+ uses:="org.eclipse.emf.ecore,
+ org.eclipse.papyrus.moka.fuml.Semantics.impl.Loci.LociL1,
+ org.eclipse.papyrus.moka.fuml.Semantics.impl.CommonBehaviors.BasicBehaviors,
+ org.eclipse.uml2.uml,
+ org.eclipse.papyrus.moka.fuml.Semantics.Classes.Kernel,
+ org.eclipse.papyrus.moka.fuml.Semantics.Loci.LociL1",
+ org.eclipse.papyrus.moka.fuml.registry.service.framework;
+ uses:="org.eclipse.papyrus.moka.fuml.Semantics.CommonBehaviors.BasicBehaviors,
+ org.eclipse.papyrus.moka.fuml.Semantics.impl.Classes.Kernel,
+ org.eclipse.papyrus.moka.fuml.Semantics.impl.CommonBehaviors.BasicBehaviors,
+ org.eclipse.uml2.uml,
+ org.eclipse.papyrus.moka.fuml.Semantics.Classes.Kernel,
+ org.eclipse.papyrus.moka.fuml.registry"
Bundle-Vendor: Eclipse Modeling Project
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
@@ -41,3 +151,4 @@
Bundle-Description: %pluginDescription
Bundle-SymbolicName: org.eclipse.papyrus.moka.fuml;singleton:=true
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.papyrus.moka.fuml
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/build.properties b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/build.properties
index 0c13857..3922399 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/build.properties
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/build.properties
@@ -1,4 +1,5 @@
source.. = src/, generated/, aspects/
+output.. = target/classes/
bin.includes = META-INF/,\
.,\
plugin.xml,\
@@ -7,5 +8,6 @@
generated/,\
schema/,\
resources/,\
- plugin.properties
+ plugin.properties,\
+ pom.xml
src.includes = about.html
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/pom.xml b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/pom.xml
index ec28090..837e6fb 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/pom.xml
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/pom.xml
@@ -41,7 +41,6 @@
</configuration>
</execution>
</executions>
-
</plugin>
</plugins>
</build>
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml.interfaces/META-INF/MANIFEST.MF b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml.interfaces/META-INF/MANIFEST.MF
index 181f920..ab53783 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml.interfaces/META-INF/MANIFEST.MF
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml.interfaces/META-INF/MANIFEST.MF
@@ -5,5 +5,7 @@
Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.papyrus.moka.fuml.statemachines.interfaces;bundle-version="2.0.0";visibility:=reexport
+Require-Bundle: org.eclipse.papyrus.moka.fuml.statemachines.interfaces;bundle-version="2.0.0",
+ org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="3.0.0"
Export-Package: org.eclipse.papyrus.moka.timedfuml.interfaces.semantics.CommonBehaviors
+Automatic-Module-Name: org.eclipse.papyrus.moka.timedfuml.interfaces
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml.interfaces/build.properties b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml.interfaces/build.properties
index 34d2e4d..dac14ed 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml.interfaces/build.properties
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml.interfaces/build.properties
@@ -1,4 +1,5 @@
source.. = src/
-output.. = bin/
+output.. = target/classes/
bin.includes = META-INF/,\
- .
+ .,\
+ pom.xml
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/.project b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/.project
index 655f857..94871c3 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/.project
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/.project
@@ -11,6 +11,11 @@
</arguments>
</buildCommand>
<buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/META-INF/MANIFEST.MF b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/META-INF/MANIFEST.MF
index 4021563..27a6f8f 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/META-INF/MANIFEST.MF
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/META-INF/MANIFEST.MF
@@ -4,23 +4,48 @@
Bundle-SymbolicName: org.eclipse.papyrus.moka.timedfuml;singleton:=true
Bundle-Version: 3.0.0.qualifier
Bundle-Activator: org.eclipse.papyrus.moka.timedfuml.Activator
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
- org.eclipse.papyrus.moka.discreteevent;bundle-version="3.0.0";visibility:=reexport,
+Require-Bundle: org.eclipse.debug.core;bundle-version="[3.12.0,4.0.0)",
org.eclipse.papyrus.moka;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.fuml.statemachines;bundle-version="2.0.0";visibility:=reexport,
- org.aspectj.runtime;bundle-version="[1.8.10,2.0.0)",
- org.eclipse.uml2.uml,
- org.eclipse.papyrus.moka.timedfuml.interfaces;bundle-version="1.0.0";visibility:=reexport
+ org.eclipse.papyrus.moka.discreteevent;bundle-version="3.0.0",
+ org.eclipse.papyrus.moka.fuml;bundle-version="3.0.0",
+ org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="3.0.0",
+ org.eclipse.papyrus.moka.composites;bundle-version="3.0.0",
+ org.eclipse.papyrus.moka.composites.interfaces;bundle-version="3.0.0",
+ org.eclipse.papyrus.moka.fuml.statemachines;bundle-version="2.0.0",
+ org.eclipse.papyrus.moka.fuml.statemachines.interfaces;bundle-version="2.0.0",
+ org.eclipse.papyrus.moka.timedfuml.interfaces;bundle-version="1.0.0",
+ org.aspectj.runtime;bundle-version="[1.9.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.papyrus.moka.timedfuml,
- org.eclipse.papyrus.moka.timedfuml.actions,
- org.eclipse.papyrus.moka.timedfuml.control.queue,
- org.eclipse.papyrus.moka.timedfuml.semantics,
- org.eclipse.papyrus.moka.timedfuml.semantics.Actions.CompleteActions,
- org.eclipse.papyrus.moka.timedfuml.semantics.CommonBehaviors,
- org.eclipse.papyrus.moka.timedfuml.semantics.Loci,
- org.eclipse.papyrus.moka.timedfuml.semantics.StateMachines,
- org.eclipse.papyrus.moka.timedfuml.semantics.StructuredClassifiers,
- org.eclipse.papyrus.moka.timedfuml.utils
+Export-Package: org.eclipse.papyrus.moka.timedfuml;
+ uses:="org.osgi.framework,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.moka.fuml.statemachines,
+ org.eclipse.papyrus.moka.fuml.Semantics.Loci.LociL1",
+ org.eclipse.papyrus.moka.timedfuml.actions;
+ uses:="org.eclipse.papyrus.moka.timedfuml.semantics,
+ org.eclipse.papyrus.moka.discreteevent.actions,
+ org.eclipse.papyrus.moka.fuml.Semantics.Classes.Kernel,
+ org.eclipse.papyrus.moka.fuml.Semantics.Loci.LociL1",
+ org.eclipse.papyrus.moka.timedfuml.control.queue;uses:="org.eclipse.papyrus.moka.discreteevent,org.eclipse.papyrus.moka.fuml.control.queue,org.eclipse.papyrus.moka.fuml.control.execution",
+ org.eclipse.papyrus.moka.timedfuml.semantics;uses:="org.eclipse.uml2.uml,org.eclipse.papyrus.moka.fuml.Semantics.impl.Actions.BasicActions,org.eclipse.papyrus.moka.composites.Semantics.impl.CompositeStructures.InvocationActions",
+ org.eclipse.papyrus.moka.timedfuml.semantics.Actions.CompleteActions;uses:="org.eclipse.papyrus.moka.fuml.Semantics.impl.Actions.CompleteActions,org.eclipse.papyrus.moka.fuml.Semantics.CommonBehaviors.Communications",
+ org.eclipse.papyrus.moka.timedfuml.semantics.CommonBehaviors;
+ uses:="org.eclipse.uml2.uml,
+ org.eclipse.papyrus.moka.fuml.Semantics.impl.CommonBehaviors.Communications,
+ org.eclipse.papyrus.moka.timedfuml.interfaces.semantics.CommonBehaviors,
+ org.eclipse.papyrus.moka.fuml.Semantics.Classes.Kernel,
+ org.eclipse.papyrus.moka.fuml.statemachines.Semantics.CommonBehavior",
+ org.eclipse.papyrus.moka.timedfuml.semantics.Loci;
+ uses:="org.eclipse.papyrus.moka.fuml.statemachines.Semantics.Loci,
+ org.eclipse.uml2.uml,
+ org.eclipse.papyrus.moka.fuml.Semantics.Classes.Kernel,
+ org.eclipse.papyrus.moka.fuml.Semantics.Loci.LociL1",
+ org.eclipse.papyrus.moka.timedfuml.semantics.StateMachines;
+ uses:="org.eclipse.papyrus.moka.fuml.statemachines.interfaces.Semantics.StateMachines,
+ org.eclipse.uml2.uml,
+ org.eclipse.papyrus.moka.fuml.statemachines.Semantics.StateMachines,
+ org.eclipse.papyrus.moka.fuml.Semantics.Classes.Kernel",
+ org.eclipse.papyrus.moka.timedfuml.semantics.StructuredClassifiers;uses:="org.eclipse.uml2.uml,org.eclipse.papyrus.moka.fuml.statemachines.Semantics.StructuredClassifiers",
+ org.eclipse.papyrus.moka.timedfuml.utils;uses:="org.eclipse.papyrus.moka.fuml.Semantics.Classes.Kernel,org.eclipse.papyrus.moka.fuml.Semantics.Loci.LociL1"
Bundle-Vendor: Eclipse Modeling Project
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/build.properties b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/build.properties
index 7513867..3cdcd31 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/build.properties
+++ b/bundles/core/engines/org.eclipse.papyrus.moka.timedfuml/build.properties
@@ -1,6 +1,8 @@
source.. = src/
+output.. = target/classes/
bin.includes = META-INF/,\
.,\
plugin.xml,\
- about.html
+ about.html,\
+ pom.xml
src.includes = about.html
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka/META-INF/MANIFEST.MF b/bundles/core/engines/org.eclipse.papyrus.moka/META-INF/MANIFEST.MF
index a415302..1418ee9 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka/META-INF/MANIFEST.MF
+++ b/bundles/core/engines/org.eclipse.papyrus.moka/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
-Require-Bundle: org.eclipse.debug.core;bundle-version="[3.11.0,4.0.0)";visibility:=reexport,
- org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
- org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)";visibility:=reexport,
+Require-Bundle: org.eclipse.debug.core;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.4.0,6.0.0)",
org.eclipse.papyrus.moka.utils;bundle-version="2.0.100",
org.eclipse.papyrus.moka.service;bundle-version="2.0.100"
Export-Package: org.eclipse.papyrus.moka,
@@ -15,3 +15,4 @@
Bundle-Description: %pluginDescription
Bundle-SymbolicName: org.eclipse.papyrus.moka;singleton:=true
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.papyrus.moka
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka/build.properties b/bundles/core/engines/org.eclipse.papyrus.moka/build.properties
index f954bd0..6b957e4 100644
--- a/bundles/core/engines/org.eclipse.papyrus.moka/build.properties
+++ b/bundles/core/engines/org.eclipse.papyrus.moka/build.properties
@@ -1,10 +1,11 @@
source.. = src/
+output.. = target/classes/
bin.includes = META-INF/,\
.,\
plugin.xml,\
schema/,\
about.html,\
icons/,\
- .classpath,\
- plugin.properties
+ plugin.properties,\
+ pom.xml
src.includes = about.html
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/META-INF/MANIFEST.MF b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/META-INF/MANIFEST.MF
index c8a9ea7..7f1e3be 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/META-INF/MANIFEST.MF
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/META-INF/MANIFEST.MF
@@ -1,7 +1,8 @@
Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.moka.fuml;bundle-version="2.0.100",
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)"
+Require-Bundle: org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.3.0,2.0.0)",
+ org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.moka.fuml;bundle-version="3.0.0",
+ org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="3.0.0"
Export-Package: org.eclipse.papyrus.moka.fuml.assertionlibrary,
org.eclipse.papyrus.moka.fuml.assertionlibrary.basic,
org.eclipse.papyrus.moka.fuml.assertionlibrary.reporting,
@@ -14,3 +15,4 @@
Bundle-Activator: org.eclipse.papyrus.moka.fuml.assertionlibrary.Activator
Bundle-SymbolicName: org.eclipse.papyrus.moka.fuml.assertionlibrary;singleton:=true
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.papyrus.moka.fuml.assertionlibrary
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/build.properties b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/build.properties
index 23867be..d41a608 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/build.properties
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.assertionlibrary/build.properties
@@ -1,7 +1,9 @@
source.. = src/
+output.. = target/classes/
bin.includes = META-INF/,\
.,\
plugin.xml,\
resources/,\
- about.html
+ about.html,\
+ pom.xml
src.includes = about.html
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/META-INF/MANIFEST.MF b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/META-INF/MANIFEST.MF
index 5be4797..782f38e 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/META-INF/MANIFEST.MF
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/META-INF/MANIFEST.MF
@@ -1,10 +1,11 @@
Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.moka.fuml;bundle-version="2.0.100",
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)",
+Require-Bundle: org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.3.0,2.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.100,4.0.0)",
+ org.eclipse.ui.console;bundle-version="[3.8.0,4.0.0)",
+ org.eclipse.jface;bundle-version="[3.14.0,4.0.0)",
org.eclipse.papyrus.moka;bundle-version="2.0.100",
- org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.ui.console;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.jface;bundle-version="[3.13.0,4.0.0)"
+ org.eclipse.papyrus.moka.fuml;bundle-version="3.0.0",
+ org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="3.0.0"
Export-Package: org.eclipse.papyrus.moka.fuml.standardlibrary,
org.eclipse.papyrus.moka.fuml.standardlibrary.library.boolean_,
org.eclipse.papyrus.moka.fuml.standardlibrary.library.integer,
@@ -22,3 +23,4 @@
Bundle-Description: %pluginDescription
Bundle-SymbolicName: org.eclipse.papyrus.moka.fuml.standardlibrary;singleton:=true
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.papyrus.moka.fuml.standardlibrary
diff --git a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/build.properties b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/build.properties
index 23867be..d41a608 100644
--- a/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/build.properties
+++ b/bundles/core/libraries/org.eclipse.papyrus.moka.fuml.standardlibrary/build.properties
@@ -1,7 +1,9 @@
source.. = src/
+output.. = target/classes/
bin.includes = META-INF/,\
.,\
plugin.xml,\
resources/,\
- about.html
+ about.html,\
+ pom.xml
src.includes = about.html
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.animation/META-INF/MANIFEST.MF b/bundles/core/services/org.eclipse.papyrus.moka.animation/META-INF/MANIFEST.MF
index 88b6c78..c181c02 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.animation/META-INF/MANIFEST.MF
+++ b/bundles/core/services/org.eclipse.papyrus.moka.animation/META-INF/MANIFEST.MF
@@ -4,25 +4,14 @@
Bundle-SymbolicName: org.eclipse.papyrus.moka.animation;singleton:=true
Bundle-Version: 2.0.100.qualifier
Bundle-Activator: org.eclipse.papyrus.moka.animation.AnimationPlugin
-Require-Bundle: org.eclipse.ui;bundle-version="[3.109.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
- org.eclipse.debug.core;bundle-version="[3.11.0,4.0.0)",
- org.eclipse.gef;bundle-version="[3.11.0,4.0.0)",
- org.eclipse.core.jobs;bundle-version="[3.9.0,4.0.0)",
- org.eclipse.jface;bundle-version="[3.13.0,4.0.0)",
- org.eclipse.emf.transaction;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.papyrus.infra.services.markerlistener;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.gmf.runtime.notation.edit;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.1.0,3.0.0)",
- org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[1.2.0,3.0.0)",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.moka.service;bundle-version="2.0.100";visibility:=reexport,
+Require-Bundle: org.eclipse.debug.core;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.2.1,3.0.0)",
+ org.eclipse.papyrus.moka.service;bundle-version="2.0.100",
org.eclipse.papyrus.moka.utils;bundle-version="2.0.100",
org.eclipse.papyrus.moka.utils.ui;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.fuml.statemachines.interfaces;bundle-version="1.0.100",
- org.eclipse.papyrus.moka.fuml.interfaces
+ org.eclipse.papyrus.moka.fuml.statemachines.interfaces;bundle-version="2.0.0",
+ org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="3.0.0",
+ org.eclipse.papyrus.moka.composites.interfaces;bundle-version="3.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.papyrus.moka.animation,
@@ -35,3 +24,4 @@
org.eclipse.papyrus.moka.animation.presentation.data;x-internal:=true,
org.eclipse.papyrus.moka.animation.utils
Bundle-Vendor: Eclipse Modeling Project
+Automatic-Module-Name: org.eclipse.papyrus.moka.animation
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.animation/build.properties b/bundles/core/services/org.eclipse.papyrus.moka.animation/build.properties
index d3bb5ad..f998d63 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.animation/build.properties
+++ b/bundles/core/services/org.eclipse.papyrus.moka.animation/build.properties
@@ -1,9 +1,11 @@
source.. = src/
+output.. = target/classes/
bin.includes = META-INF/,\
.,\
plugin.xml,\
about.html,\
icons/,\
theme/,\
- schema/
+ schema/,\
+ pom.xml
src.includes = about.html
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/META-INF/MANIFEST.MF b/bundles/core/services/org.eclipse.papyrus.moka.debug/META-INF/MANIFEST.MF
index 0a29874..00aab2e 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/META-INF/MANIFEST.MF
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/META-INF/MANIFEST.MF
@@ -4,19 +4,18 @@
Bundle-SymbolicName: org.eclipse.papyrus.moka.debug;singleton:=true
Bundle-Version: 2.0.100.qualifier
Bundle-Activator: org.eclipse.papyrus.moka.debug.MokaDebugPlugin
-Require-Bundle: org.eclipse.ui;bundle-version="[3.109.0,4.0.0)",
- org.eclipse.papyrus.moka.utils;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.service;bundle-version="2.0.100";visibility:=reexport,
- org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
+Require-Bundle: org.eclipse.papyrus.moka.utils;bundle-version="2.0.100",
+ org.eclipse.papyrus.moka.service;bundle-version="2.0.100",
org.eclipse.papyrus.moka.animation;bundle-version="2.0.100",
org.eclipse.papyrus.moka.utils.ui;bundle-version="2.0.100",
- org.eclipse.debug.ui;bundle-version="[3.12.0,4.0.0)",
- org.eclipse.papyrus.moka.fuml.statemachines.interfaces;visibility:=reexport,
- org.eclipse.papyrus.moka.timedfuml.interfaces,
- org.eclipse.papyrus.moka.debug,
- org.eclipse.papyrus.moka.fuml.interfaces,
- org.eclipse.papyrus.infra.emf,
- org.eclipse.papyrus.infra.services.labelprovider
+ org.eclipse.debug.ui;bundle-version="[3.13.0,4.0.0)",
+ org.eclipse.papyrus.moka.debug;bundle-version="2.0.100",
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="3.0.0",
+ org.eclipse.papyrus.moka.composites.interfaces;bundle-version="3.0.0",
+ org.eclipse.papyrus.moka.fuml.statemachines.interfaces;bundle-version="2.0.0",
+ org.eclipse.papyrus.moka.timedfuml.interfaces;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Bundle-Vendor: Eclipse Modeling Project
@@ -29,3 +28,4 @@
org.eclipse.papyrus.moka.debug.model.data.presentations,
org.eclipse.papyrus.moka.debug.model.data.presentations.providers
Import-Package: org.eclipse.papyrus.moka.debug.model.data.mapping.values
+Automatic-Module-Name: org.eclipse.papyrus.moka.debug
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.debug/build.properties b/bundles/core/services/org.eclipse.papyrus.moka.debug/build.properties
index bdee51f..caa790c 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.debug/build.properties
+++ b/bundles/core/services/org.eclipse.papyrus.moka.debug/build.properties
@@ -1,7 +1,9 @@
source.. = src/
+output.. = target/classes/
bin.includes = META-INF/,\
.,\
plugin.xml,\
about.html,\
- resources/
+ resources/,\
+ pom.xml
src.includes = about.html
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.service/META-INF/MANIFEST.MF b/bundles/core/services/org.eclipse.papyrus.moka.service/META-INF/MANIFEST.MF
index 15d7c44..7efa82e 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.service/META-INF/MANIFEST.MF
+++ b/bundles/core/services/org.eclipse.papyrus.moka.service/META-INF/MANIFEST.MF
@@ -5,8 +5,9 @@
Bundle-Version: 2.0.100.qualifier
Bundle-Activator: org.eclipse.papyrus.moka.service.Activator
Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="2.0.100",
- org.eclipse.debug.core;bundle-version="[3.11.0,4.0.0)"
+Require-Bundle: org.eclipse.debug.core;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="3.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.papyrus.moka.service
+Automatic-Module-Name: org.eclipse.papyrus.moka.service
diff --git a/bundles/core/services/org.eclipse.papyrus.moka.service/build.properties b/bundles/core/services/org.eclipse.papyrus.moka.service/build.properties
index 89cbda3..fdf5f0c 100644
--- a/bundles/core/services/org.eclipse.papyrus.moka.service/build.properties
+++ b/bundles/core/services/org.eclipse.papyrus.moka.service/build.properties
@@ -1,7 +1,9 @@
source.. = src/
+output.. = target/classes/
bin.includes = META-INF/,\
.,\
plugin.xml,\
about.html,\
- schema/
+ schema/,\
+ pom.xml
src.includes = about.html
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/META-INF/MANIFEST.MF b/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/META-INF/MANIFEST.MF
index a26d888..139013a 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)",
+Require-Bundle: org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.3.0,2.0.0)",
org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)",
org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.moka.composites;bundle-version="2.0.100",
+ org.eclipse.papyrus.moka.composites;bundle-version="3.0.0",
org.eclipse.papyrus.moka.utils.ui;bundle-version="2.0.100"
Export-Package: org.eclipse.papyrus.moka.composites.utils,
org.eclipse.papyrus.moka.composites.utils.handlers,
@@ -17,3 +17,4 @@
Bundle-Activator: org.eclipse.papyrus.moka.composites.utils.Activator
Bundle-SymbolicName: org.eclipse.papyrus.moka.composites.utils;singleton:=true
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.papyrus.moka.composites.utils
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/build.properties b/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/build.properties
index 1d566ba..21688ce 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/build.properties
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.composites.utils/build.properties
@@ -1,8 +1,10 @@
source.. = src/
+output.. = target/classes/
bin.includes = META-INF/,\
.,\
plugin.xml,\
build.properties,\
icons/,\
- about.html
+ about.html,\
+ pom.xml
src.includes = about.html
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/META-INF/MANIFEST.MF b/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/META-INF/MANIFEST.MF
index 6361ecb..a48b5bf 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/META-INF/MANIFEST.MF
@@ -4,10 +4,11 @@
Bundle-SymbolicName: org.eclipse.papyrus.moka.discreteevent;singleton:=true
Bundle-Version: 3.0.0.qualifier
Bundle-Activator: org.eclipse.papyrus.moka.discreteevent.Activator
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)"
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.papyrus.moka.discreteevent,
org.eclipse.papyrus.moka.discreteevent.actions
Bundle-Vendor: Eclipse Modeling Project
Bundle-ClassPath: .
+Automatic-Module-Name: org.eclipse.papyrus.moka.discreteevent
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/build.properties b/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/build.properties
index 6be063a..5bf30e4 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/build.properties
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.discreteevent/build.properties
@@ -1,6 +1,8 @@
source.. = src/
+output.. = target/classes/
bin.includes = META-INF/,\
about.html,\
- .
+ .,\
+ pom.xml
src.includes = about.html
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/.project b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/.project
index 1b5dad9..a3ecdc5 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/.project
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/.project
@@ -27,8 +27,8 @@
</buildCommand>
</buildSpec>
<natures>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.ajdt.ui.ajnature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/META-INF/MANIFEST.MF b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/META-INF/MANIFEST.MF
index 746f800..dbd8ecc 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/META-INF/MANIFEST.MF
@@ -4,11 +4,19 @@
Bundle-SymbolicName: org.eclipse.papyrus.moka.externalcontrol
Bundle-Version: 2.1.0.qualifier
Bundle-Activator: org.eclipse.papyrus.moka.externalcontrol.Activator
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
- org.aspectj.runtime;bundle-version="[1.8.10,2.0.0)",
+Require-Bundle: org.eclipse.debug.core;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
org.eclipse.papyrus.moka;bundle-version="2.0.100",
+ org.eclipse.papyrus.moka.fuml;bundle-version="3.0.0",
+ org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="3.0.0",
+ org.eclipse.papyrus.moka.composites;bundle-version="3.0.0",
+ org.eclipse.papyrus.moka.composites.interfaces;bundle-version="3.0.0",
+ org.eclipse.papyrus.moka.fuml.statemachines;bundle-version="2.0.0",
+ org.eclipse.papyrus.moka.fuml.statemachines.interfaces;bundle-version="2.0.0",
org.eclipse.papyrus.moka.timedfuml;bundle-version="3.0.0",
- org.eclipse.debug.core;bundle-version="[3.10.100,4.0.0)";visibility:=reexport
+ org.eclipse.papyrus.moka.timedfuml.interfaces;bundle-version="1.0.0",
+ org.eclipse.papyrus.moka.discreteevent;bundle-version="3.0.0",
+ org.aspectj.runtime;bundle-version="[1.9.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Bundle-Vendor: Eclipse Modeling Project
@@ -17,3 +25,4 @@
org.eclipse.papyrus.moka.externalcontrol.controller,
org.eclipse.papyrus.moka.externalcontrol.engine,
org.eclipse.papyrus.moka.externalcontrol.semantics
+Automatic-Module-Name: org.eclipse.papyrus.moka.externalcontrol
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/build.properties b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/build.properties
index c8c9236..ac13397 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/build.properties
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.externalcontrol/build.properties
@@ -1,5 +1,9 @@
source.. = src/,\
aspects/
-output.. = bin/
+output.. = target/classes/
bin.includes = META-INF/,\
- .
+ .,\
+ about.html,\
+ doc/,\
+ pom.xml
+src.includes = about.html
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/META-INF/MANIFEST.MF b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/META-INF/MANIFEST.MF
index f761b57..dcead64 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/META-INF/MANIFEST.MF
@@ -4,14 +4,18 @@
Bundle-SymbolicName: org.eclipse.papyrus.moka.fuml.libraries.tools.annotations;singleton:=true
Bundle-Version: 1.0.100.qualifier
Bundle-Vendor: CEA
-Require-Bundle: org.eclipse.core.resources;bundle-version="[3.12.0,4.0.0)",
- org.eclipse.papyrus.moka.fuml;bundle-version="2.0.100",
- org.eclipse.pde.core;bundle-version="[3.11.100,4.0.0)",
- org.eclipse.xtend.lib;bundle-version="[2.11.0,3.0.0)",
- org.eclipse.papyrus.moka.simex;bundle-version="2.0.100"
+Require-Bundle: org.eclipse.core.resources;bundle-version="[3.13.0,4.0.0)",
+ org.eclipse.papyrus.moka.fuml;bundle-version="3.0.0",
+ org.eclipse.pde.core;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.xtend.lib;bundle-version="[2.14.0,3.0.0)",
+ org.eclipse.papyrus.moka.simex;bundle-version="2.0.100",
+ org.eclipse.equinox.registry;bundle-version="[3.8.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.4.0,6.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.eclipse.papyrus.moka.fuml.libraries.tools.annotations,
org.eclipse.papyrus.moka.fuml.libraries.tools.annotations.processor
Bundle-Activator: org.eclipse.papyrus.moka.fuml.libraries.tools.annotations.Activator
Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.papyrus.moka.fuml.libraries.tools.annotations
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/build.properties b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/build.properties
index 260f08f..7d27956 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/build.properties
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.libraries.tools.annotations/build.properties
@@ -1,5 +1,7 @@
source.. = src/,\
xtend-gen/
+output.. = target/classes/
bin.includes = META-INF/,\
.,\
- plugin.xml
+ plugin.xml,\
+ pom.xml
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/META-INF/MANIFEST.MF b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/META-INF/MANIFEST.MF
index 37de6a4..3aef67a 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
Manifest-Version: 1.0
Require-Bundle: org.eclipse.ui;bundle-version="[3.109.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
org.eclipse.emf.validation;bundle-version="[1.8.0,2.0.0)",
- org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)"
+ org.eclipse.uml2.uml;bundle-version="[5.4.0,6.0.0)"
Bundle-Vendor: Eclipse Modeling Project
Bundle-ActivationPolicy: lazy
Bundle-Version: 2.0.100.qualifier
@@ -13,3 +13,4 @@
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.eclipse.papyrus.moka.fuml.validation,
org.eclipse.papyrus.moka.fuml.validation.constraints
+Automatic-Module-Name: org.eclipse.papyrus.moka.fuml.validation
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/build.properties b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/build.properties
index 5208e9f..af0f7fd 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/build.properties
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.fuml.validation/build.properties
@@ -1,7 +1,9 @@
source.. = src/
+output.. = target/classes/
bin.includes = META-INF/,\
.,\
plugin.xml,\
build.properties,\
- about.html
+ about.html,\
+ pom.xml
src.includes = about.html
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.modeling.utils/META-INF/MANIFEST.MF b/bundles/core/tools/org.eclipse.papyrus.moka.modeling.utils/META-INF/MANIFEST.MF
index e1ab4f6..7803d3a 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.modeling.utils/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.modeling.utils/META-INF/MANIFEST.MF
@@ -4,8 +4,9 @@
Bundle-SymbolicName: org.eclipse.papyrus.moka.modeling.utils
Bundle-Version: 1.1.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.uml2.uml;bundle-version="5.3.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="3.1.0",
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.3.0"
+Require-Bundle: org.eclipse.uml2.uml;bundle-version="[5.4.0,6.0.0)",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.3.0,2.0.0)"
Bundle-Vendor: Eclipse Modeling Project
Export-Package: org.eclipse.papyrus.moka.modeling.utils
+Automatic-Module-Name: org.eclipse.papyrus.moka.modeling.utils
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.modeling.utils/build.properties b/bundles/core/tools/org.eclipse.papyrus.moka.modeling.utils/build.properties
index b107977..dac14ed 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.modeling.utils/build.properties
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.modeling.utils/build.properties
@@ -1,3 +1,5 @@
source.. = src/
+output.. = target/classes/
bin.includes = META-INF/,\
- .
+ .,\
+ pom.xml
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/META-INF/MANIFEST.MF b/bundles/core/tools/org.eclipse.papyrus.moka.simex/META-INF/MANIFEST.MF
index f5e3c3e..7e07a56 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/META-INF/MANIFEST.MF
@@ -4,24 +4,25 @@
Bundle-SymbolicName: org.eclipse.papyrus.moka.simex;singleton:=true
Bundle-Version: 2.0.100.qualifier
Bundle-Activator: org.eclipse.papyrus.moka.simex.Activator
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.4.0,2.0.0)",
org.eclipse.gef;bundle-version="[3.11.0,4.0.0)",
org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)",
- org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.activity;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.ui.emf;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.4.0,6.0.0)",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.3.0,2.0.0)",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="[3.1.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.activity;bundle-version="[3.1.0,4.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.100.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.papyrus.infra.widgets;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.papyrus.infra.ui.emf;bundle-version="[2.1.0,3.0.0)",
org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)"
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.100,4.0.0)",
+ org.eclipse.papyrus.infra.types.core;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.architecture;bundle-version="[2.0.0,3.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Bundle-Vendor: Eclipse Modeling Project
@@ -32,3 +33,4 @@
org.eclipse.papyrus.moka.simex.dnd.strategy,
org.eclipse.papyrus.moka.simex.utils,
org.eclipse.papyrus.moka.simex.viewpoint
+Automatic-Module-Name: org.eclipse.papyrus.moka.simex
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.simex/build.properties b/bundles/core/tools/org.eclipse.papyrus.moka.simex/build.properties
index 19912bb..9b06c28 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.simex/build.properties
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.simex/build.properties
@@ -1,4 +1,5 @@
source.. = src/
+output.. = target/classes/
bin.includes = META-INF/,\
.,\
plugin.xml,\
@@ -6,5 +7,6 @@
config/,\
css/,\
about.html,\
- palette/
+ palette/,\
+ pom.xml
src.includes = about.html
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/META-INF/MANIFEST.MF b/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/META-INF/MANIFEST.MF
index 8add763..1241475 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/META-INF/MANIFEST.MF
@@ -5,23 +5,16 @@
Bundle-Version: 2.0.100.qualifier
Bundle-Activator: org.eclipse.papyrus.moka.ui.table.instancespecification.Activator
Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.papyrus.infra.properties;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.constraints,
- org.eclipse.emf.ecore,
- org.eclipse.papyrus.infra.core,
- org.eclipse.papyrus.infra.emf,
- org.eclipse.uml2.uml,
- org.eclipse.papyrus.infra.nattable;bundle-version="2.0.0",
- org.eclipse.papyrus.uml.nattable;bundle-version="2.0.0",
- org.eclipse.papyrus.uml.nattable.xtext.integration;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf.gmf,
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="2.0.0",
- org.eclipse.papyrus.uml.nattable.xtext.valuespecification;bundle-version="3.0.0",
- org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils,
- org.eclipse.papyrus.infra.services.edit,
- org.eclipse.papyrus.infra.services.validation;bundle-version="3.0.0"
+Require-Bundle: org.eclipse.papyrus.infra.properties;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.nattable;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.100,2.0.0)",
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.3.0,2.0.0)",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.papyrus.uml.nattable.xtext.valuespecification;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils;bundle-version="[1.3.0,2.0.0)",
+ org.eclipse.papyrus.infra.services.validation;bundle-version="[3.0.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.papyrus.moka.ui.table.instancespecification,
org.eclipse.papyrus.moka.ui.table.instancespecification.util
+Automatic-Module-Name: org.eclipse.papyrus.moka.ui.table.instancespecification
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/build.properties b/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/build.properties
index 4b76d81..0719eab 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/build.properties
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.ui.table.instancespecification/build.properties
@@ -1,6 +1,7 @@
source.. = src/
-output.. = bin/
+output.. = target/classes/
bin.includes = META-INF/,\
.,\
config/,\
- plugin.xml
+ plugin.xml,\
+ pom.xml
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.utils.ui/META-INF/MANIFEST.MF b/bundles/core/tools/org.eclipse.papyrus.moka.utils.ui/META-INF/MANIFEST.MF
index 080c84f..e9d06cb 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.utils.ui/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.utils.ui/META-INF/MANIFEST.MF
@@ -8,3 +8,4 @@
org.eclipse.papyrus.moka.utils;bundle-version="2.0.100"
Export-Package: org.eclipse.papyrus.moka.utils.helper,
org.eclipse.papyrus.moka.utils.helper.presentation
+Automatic-Module-Name: org.eclipse.papyrus.moka.utils.ui
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.utils.ui/build.properties b/bundles/core/tools/org.eclipse.papyrus.moka.utils.ui/build.properties
index b107977..dac14ed 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.utils.ui/build.properties
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.utils.ui/build.properties
@@ -1,3 +1,5 @@
source.. = src/
+output.. = target/classes/
bin.includes = META-INF/,\
- .
+ .,\
+ pom.xml
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.utils/META-INF/MANIFEST.MF b/bundles/core/tools/org.eclipse.papyrus.moka.utils/META-INF/MANIFEST.MF
index 6f2c7ca..13c6b9b 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.utils/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.utils/META-INF/MANIFEST.MF
@@ -5,10 +5,11 @@
Bundle-Version: 2.0.100.qualifier
Bundle-Activator: org.eclipse.papyrus.moka.utils.Activator
Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.fuml.statemachines.interfaces
+Require-Bundle: org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="3.0.0",
+ org.eclipse.papyrus.moka.fuml.statemachines.interfaces;bundle-version="2.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.papyrus.moka.utils,
org.eclipse.papyrus.moka.utils.constants,
org.eclipse.papyrus.moka.utils.helper.semantics
+Automatic-Module-Name: org.eclipse.papyrus.moka.utils
diff --git a/bundles/core/tools/org.eclipse.papyrus.moka.utils/build.properties b/bundles/core/tools/org.eclipse.papyrus.moka.utils/build.properties
index ca51cea..94296b5 100644
--- a/bundles/core/tools/org.eclipse.papyrus.moka.utils/build.properties
+++ b/bundles/core/tools/org.eclipse.papyrus.moka.utils/build.properties
@@ -1,5 +1,7 @@
source.. = src/
+output.. = target/classes/
bin.includes = META-INF/,\
.,\
- about.html
+ about.html,\
+ pom.xml
src.includes = about.html
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/META-INF/MANIFEST.MF b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/META-INF/MANIFEST.MF
index ce5f5e1..6d4f9bd 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/META-INF/MANIFEST.MF
@@ -5,14 +5,16 @@
Bundle-Version: 1.0.100.qualifier
Bundle-Activator: org.eclipse.papyrus.moka.datavisualization.ui.Activator
Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.1)",
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0]",
- org.eclipse.emf.common.ui;bundle-version="[2.12.0,3.0.0)",
+Require-Bundle: org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.3.0,2.0.0)",
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.emf.common.ui;bundle-version="[2.13.0,3.0.0)",
org.eclipse.papyrus.moka.datavisualization;bundle-version="1.0.100",
org.eclipse.papyrus.moka.xygraph.common;bundle-version="1.0.100",
- org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.properties;bundle-version="[2.0.0,4.0.0)"
+ org.eclipse.papyrus.infra.services.edit;bundle-version="[3.1.0,4.0.0)",
+ org.eclipse.papyrus.infra.properties;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.moka.xygraph.model;bundle-version="1.0.100",
+ org.eclipse.papyrus.moka.xygraph.mapping;bundle-version="1.1.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.papyrus.moka.datavisualization.handlers,
@@ -22,3 +24,4 @@
org.eclipse.papyrus.moka.datavisualization.ui.diagram,
org.eclipse.papyrus.moka.datavisualization.ui.dialogs,
org.eclipse.papyrus.moka.datavisualization.ui.tester
+Automatic-Module-Name: org.eclipse.papyrus.moka.datavisualization.ui
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/build.properties b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/build.properties
index 0017c1e..b702ece 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/build.properties
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization.ui/build.properties
@@ -1,8 +1,10 @@
source.. = src/
+output.. = target/classes/
bin.includes = META-INF/,\
.,\
plugin.xml,\
about.html,\
icons/,\
- properties/
+ properties/,\
+ pom.xml
src.includes = about.html
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/META-INF/MANIFEST.MF b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/META-INF/MANIFEST.MF
index 0f4b3f2..e6054eb 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/META-INF/MANIFEST.MF
@@ -7,8 +7,8 @@
Bundle-Activator: org.eclipse.papyrus.moka.datavisualization.Activator
Bundle-Vendor: Eclipse ModelingFramework
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
- org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)";visibility:=reexport
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.4.0,6.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.papyrus.moka.datavisualization,
@@ -18,3 +18,4 @@
org.eclipse.papyrus.moka.datavisualization.profile.impl,
org.eclipse.papyrus.moka.datavisualization.profile.util,
org.eclipse.papyrus.moka.datavisualization.util
+Automatic-Module-Name: org.eclipse.papyrus.moka.datavisualization
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/build.properties b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/build.properties
index df1f872..60c0547 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/build.properties
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.datavisualization/build.properties
@@ -1,10 +1,12 @@
source.. = src/,\
src-gen/
+output.. = target/classes/
bin.includes = META-INF/,\
.,\
plugin.xml,\
profile/,\
about.html,\
plugin.properties,\
- icons/
+ icons/,\
+ pom.xml
src.includes = about.html
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/META-INF/MANIFEST.MF b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/META-INF/MANIFEST.MF
index 2ad5875..e01cbe6 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/META-INF/MANIFEST.MF
@@ -5,10 +5,11 @@
Bundle-Version: 1.1.0.qualifier
Bundle-Activator: org.eclipse.papyrus.moka.xygraph.common.Activator
Require-Bundle: org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.moka.xygraph.mapping;bundle-version="1.0.100";visibility:=reexport,
+ org.eclipse.papyrus.moka.xygraph.mapping;bundle-version="1.0.100",
org.eclipse.draw2d;bundle-version="[3.10.100,4.0.0)",
org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.nebula.visualization.xygraph;bundle-version="2.1.0"
+ org.eclipse.nebula.visualization.xygraph;bundle-version="[3.1.0,4.0.0)",
+ org.eclipse.papyrus.moka.xygraph.model;bundle-version="1.0.100"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.papyrus.moka.xygraph.common,
@@ -17,3 +18,4 @@
org.eclipse.papyrus.moka.xygraph.common.ui,
org.eclipse.papyrus.moka.xygraph.common.writing
Bundle-Vendor: Eclipse Modeling Framework
+Automatic-Module-Name: org.eclipse.papyrus.moka.xygraph.common
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/build.properties b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/build.properties
index 9aff24f..e2d29da 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/build.properties
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.common/build.properties
@@ -1,7 +1,9 @@
source.. = src/
+output.. = target/classes/
bin.includes = META-INF/,\
.,\
plugin.xml,\
icons/,\
- about.html
+ about.html,\
+ pom.xml
src.includes = about.html
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/META-INF/MANIFEST.MF b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/META-INF/MANIFEST.MF
index 5049b1c..eac38e2 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/META-INF/MANIFEST.MF
@@ -5,10 +5,10 @@
Bundle-Version: 1.1.0.qualifier
Bundle-Activator: org.eclipse.papyrus.moka.xygraph.mapping.Activator
Require-Bundle: org.eclipse.ui;bundle-version="[3.109.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
org.eclipse.draw2d;bundle-version="[3.10.100,4.0.0)",
- org.eclipse.nebula.visualization.xygraph;bundle-version="[2.1.0,4.0.0)",
- org.eclipse.papyrus.moka.xygraph.model;bundle-version="1.0.100";visibility:=reexport
+ org.eclipse.nebula.visualization.xygraph;bundle-version="[3.1.0,4.0.0)",
+ org.eclipse.papyrus.moka.xygraph.model;bundle-version="1.0.100"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.papyrus.moka.xygraph.mapping,
@@ -17,3 +17,4 @@
org.eclipse.papyrus.moka.xygraph.mapping.writing,
org.eclipse.papyrus.moka.xygraph.mapping.writing.impl
Bundle-Vendor: Eclipse Modeling Project
+Automatic-Module-Name: org.eclipse.papyrus.moka.xygraph.mapping
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/build.properties b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/build.properties
index ca51cea..94296b5 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/build.properties
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/build.properties
@@ -1,5 +1,7 @@
source.. = src/
+output.. = target/classes/
bin.includes = META-INF/,\
.,\
- about.html
+ about.html,\
+ pom.xml
src.includes = about.html
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/LightDataProvider.java b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/LightDataProvider.java
index b8ea90a..733b708 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/LightDataProvider.java
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.mapping/src/org/eclipse/papyrus/moka/xygraph/mapping/util/LightDataProvider.java
@@ -26,9 +26,6 @@
private List<Double> xValues, yValues;
private List<LightDataSample> samples = new ArrayList<>();
- private boolean dataRangedirty;
-
- //private double xMin, xMax, yMin, yMax;
private TraceDataBounds bounds;
public LightDataProvider(boolean chronological) {
@@ -64,7 +61,6 @@
fireDataChange();
- dataRangedirty = false;
}
@Override
@@ -99,54 +95,6 @@
fireDataChange();
- dataRangedirty = false;
- }
-
- @Override
- protected void innerUpdate() {
- dataRangedirty = true;
- }
-
- @Override
- protected void updateDataRange() {
- if (!dataRangedirty)
- return;
-
- dataRangedirty = false;
-
- if (getSize() > 0) {
- int lowerBound = 0;
-
- double xMin;
- double xMax;
- xMin = getXValue(lowerBound);//getSample(lowerBound).getXValue();
- xMax = xMin;
-
- double yMin;
- double yMax;
- yMin = getYValue(lowerBound);//getSample(lowerBound).getYValue();
- yMax = yMin;
-
- for (int i = lowerBound + 1; i < getSize(); i++) {
- ISample dp = getSample(i);
- if (xMin > dp.getXValue() - dp.getXMinusError())
- xMin = dp.getXValue() - dp.getXMinusError();
- if (xMax < dp.getXValue() + dp.getXPlusError())
- xMax = dp.getXValue() + dp.getXPlusError();
-
- if (yMin > dp.getYValue() - dp.getYMinusError())
- yMin = dp.getYValue() - dp.getYMinusError();
- if (yMax < dp.getYValue() + dp.getYPlusError())
- yMax = dp.getYValue() + dp.getYPlusError();
- }
-
- xDataMinMax = new Range(xMin, xMax);
- yDataMinMax = new Range(yMin, yMax);
-
- } else {
- xDataMinMax = null;
- yDataMinMax = null;
- }
}
public double getXValue(int index) {
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/META-INF/MANIFEST.MF b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/META-INF/MANIFEST.MF
index c41f98e..b239ffb 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@
Bundle-Vendor: Eclipse Modeling Project
Bundle-Localization: plugin
Bundle-Activator: org.eclipse.papyrus.moka.xygraph.model.Activator
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.13.0,3.0.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.eclipse.papyrus.moka.xygraph.model.reflection,
@@ -27,3 +27,4 @@
org.eclipse.papyrus.infra.xygraph.model.xygraph,
org.eclipse.emf.ecore.util"
Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.papyrus.moka.xygraph.model
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/build.properties b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/build.properties
index f9c2973..d8ad50d 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/build.properties
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.model/build.properties
@@ -1,12 +1,12 @@
-#
-
bin.includes = .,\
model/,\
META-INF/,\
plugin.xml,\
plugin.properties,\
- about.html
+ about.html,\
+ pom.xml
jars.compile.order = .
source.. = src-gen/,\
src/
src.includes = about.html
+output.. = target/classes/
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/META-INF/MANIFEST.MF b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/META-INF/MANIFEST.MF
index 05d2298..db3364a 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/META-INF/MANIFEST.MF
@@ -5,13 +5,13 @@
Bundle-Version: 1.0.100.qualifier
Bundle-Activator: org.eclipse.papyrus.moka.xygraph.modelexplorer.Activator
Require-Bundle: org.eclipse.ui;bundle-version="[3.109.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
org.eclipse.papyrus.moka.xygraph.model;bundle-version="1.0.100",
org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.100,2.0.0)",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="[3.1.0,4.0.0)",
org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -19,3 +19,4 @@
Export-Package: org.eclipse.papyrus.moka.xygraph.modelexplorer,
org.eclipse.papyrus.moka.xygraph.modelexplorer.queries
Bundle-Vendor: Eclipse Modeling Project
+Automatic-Module-Name: org.eclipse.papyrus.moka.xygraph.modelexplorer
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/build.properties b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/build.properties
index 40f8365..c89dbae 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/build.properties
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.modelexplorer/build.properties
@@ -1,6 +1,8 @@
source.. = src/
+output.. = target/classes/
bin.includes = META-INF/,\
.,\
plugin.xml,\
icons/,\
- resources/
+ resources/,\
+ pom.xml
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.properties/META-INF/MANIFEST.MF b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.properties/META-INF/MANIFEST.MF
index f7c1edc..f31f26d 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.properties/META-INF/MANIFEST.MF
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.properties/META-INF/MANIFEST.MF
@@ -5,10 +5,11 @@
Bundle-Version: 1.0.100.qualifier
Bundle-Activator: org.eclipse.papyrus.moka.xygraph.properties.Activator
Require-Bundle: org.eclipse.papyrus.moka.xygraph.model;bundle-version="1.0.100",
- org.eclipse.papyrus.infra.properties.ui;bundle-version="[2.0.0,4.0.0)"
+ org.eclipse.papyrus.infra.properties.ui;bundle-version="[3.3.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.papyrus.moka.xygraph.properties,
org.eclipse.papyrus.moka.xygraph.properties.constraints,
org.eclipse.papyrus.moka.xygraph.properties.modelelement
Bundle-Vendor: Eclipse Modeling Framework
+Automatic-Module-Name: org.eclipse.papyrus.moka.xygraph.properties
diff --git a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.properties/build.properties b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.properties/build.properties
index 9caa8e2..b946399 100644
--- a/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.properties/build.properties
+++ b/bundles/core/tools/visualization/org.eclipse.papyrus.moka.xygraph.properties/build.properties
@@ -1,7 +1,9 @@
source.. = src/
+output.. = target/classes/
bin.includes = META-INF/,\
.,\
plugin.xml,\
about.html,\
- properties/
+ properties/,\
+ pom.xml
src.includes = about.html
diff --git a/bundles/core/ui/org.eclipse.papyrus.moka.ui/META-INF/MANIFEST.MF b/bundles/core/ui/org.eclipse.papyrus.moka.ui/META-INF/MANIFEST.MF
index 7514b2d..fbe5869 100644
--- a/bundles/core/ui/org.eclipse.papyrus.moka.ui/META-INF/MANIFEST.MF
+++ b/bundles/core/ui/org.eclipse.papyrus.moka.ui/META-INF/MANIFEST.MF
@@ -1,32 +1,13 @@
Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui;bundle-version="[3.109.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
- org.eclipse.papyrus.moka;bundle-version="2.0.100",
- org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.debug.core;bundle-version="[3.11.0,4.0.0)",
- org.eclipse.debug.ui;bundle-version="[3.12.0,4.0.0)",
- org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.gmf.runtime.notation;bundle-version="[1.8.0,2.0.0)",
- org.eclipse.gef;bundle-version="[3.11.0,4.0.0)",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.services.decoration;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.13.0,4.0.0)",
+Require-Bundle: org.eclipse.papyrus.moka;bundle-version="2.0.100",
+ org.eclipse.debug.ui;bundle-version="[3.13.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.2.0,4.0.0)",
org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.1.0,3.0.0)",
- org.eclipse.e4.ui.css.core;bundle-version="[0.12.100,1.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.services.markerlistener;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.2.1,3.0.0)",
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.3.0,2.0.0)",
org.eclipse.papyrus.moka.utils;bundle-version="2.0.100",
org.eclipse.papyrus.moka.debug;bundle-version="2.0.100",
org.eclipse.papyrus.moka.utils.ui;bundle-version="2.0.100",
- org.eclipse.ui.console;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.jdt.ui;bundle-version="[3.13.0,4.0.0)",
org.eclipse.papyrus.moka.animation;bundle-version="2.0.100"
Export-Package: org.eclipse.papyrus.moka.launch,
org.eclipse.papyrus.moka.ui,
@@ -43,3 +24,4 @@
Bundle-SymbolicName: org.eclipse.papyrus.moka.ui;singleton:=true
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.papyrus.moka.ui
diff --git a/bundles/core/ui/org.eclipse.papyrus.moka.ui/build.properties b/bundles/core/ui/org.eclipse.papyrus.moka.ui/build.properties
index 9b9d0a8..6b65ebe 100644
--- a/bundles/core/ui/org.eclipse.papyrus.moka.ui/build.properties
+++ b/bundles/core/ui/org.eclipse.papyrus.moka.ui/build.properties
@@ -1,9 +1,11 @@
source.. = src/
+output.. = target/classes/
bin.includes = META-INF/,\
.,\
plugin.xml,\
theme/,\
about.html,\
icons/,\
- build.properties
+ build.properties,\
+ pom.xml
src.includes = about.html
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/META-INF/MANIFEST.MF b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/META-INF/MANIFEST.MF
index 88b5b9d..f3ef3d9 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/META-INF/MANIFEST.MF
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/META-INF/MANIFEST.MF
@@ -4,13 +4,18 @@
Bundle-SymbolicName: org.eclipse.papyrus.moka.fmi.master;singleton:=true
Bundle-Version: 2.1.0.qualifier
Bundle-Activator: org.eclipse.papyrus.moka.fmi.master.Activator
-Require-Bundle: org.eclipse.papyrus.moka;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.composites;bundle-version="2.0.100",
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)",
+Require-Bundle: org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.3.0,2.0.0)",
+ org.eclipse.jface;bundle-version="[3.14.0,4.0.0)",
+ com.github.jnr.jffi;bundle-version="[1.2.15,1.3.0)",
+ com.github.jnr.ffi;bundle-version="[2.1.4,3.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
+ org.eclipse.papyrus.moka;bundle-version="2.0.100",
+ org.eclipse.papyrus.moka.fmi;bundle-version="2.0.100",
org.eclipse.papyrus.moka.fmi.profile;bundle-version="2.0.100",
- org.eclipse.jface;bundle-version="[3.12.0,4.0.0)",
- com.github.jnr.jffi;bundle-version="1.2.11",
- com.github.jnr.ffi;bundle-version="2.0.9"
+ org.eclipse.papyrus.moka.fuml;bundle-version="3.0.0",
+ org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="3.0.0",
+ org.eclipse.papyrus.moka.composites;bundle-version="3.0.0",
+ org.eclipse.papyrus.moka.composites.interfaces;bundle-version="3.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.papyrus.moka.fmi.master,
@@ -20,3 +25,4 @@
org.eclipse.papyrus.moka.fmi.master.masterlibrary,
org.eclipse.papyrus.moka.fmi.master.masterproxy
Bundle-Vendor: Eclipse Modeling Project
+Automatic-Module-Name: org.eclipse.papyrus.moka.fmi.master
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/build.properties b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/build.properties
index 1692e85..7a52811 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/build.properties
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/build.properties
@@ -1,4 +1,5 @@
source.. = src/
+output.. = target/classes/
bin.includes = META-INF/,\
.,\
plugin.xml,\
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2Parameters.java b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2Parameters.java
index 70c8487..7f4dd15 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2Parameters.java
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmi.master/src/org/eclipse/papyrus/moka/fmi/master/fmilibrary/Fmi2Parameters.java
@@ -12,7 +12,6 @@
package org.eclipse.papyrus.moka.fmi.master.fmilibrary;
import java.io.File;
-import java.io.FileNotFoundException;
import java.io.IOException;
import org.eclipse.papyrus.moka.fmi.fmiprofile.CS_FMU;
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/META-INF/MANIFEST.MF b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/META-INF/MANIFEST.MF
index 593f64b..503c215 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/META-INF/MANIFEST.MF
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/META-INF/MANIFEST.MF
@@ -4,12 +4,24 @@
Bundle-SymbolicName: org.eclipse.papyrus.moka.fmu.engine.debug;singleton:=true
Bundle-Version: 3.0.0.qualifier
Bundle-Activator: org.eclipse.papyrus.moka.fmu.engine.debug.Activator
-Require-Bundle: org.eclipse.ui;bundle-version="[3.109.0,4.0.0)",
+Require-Bundle: org.eclipse.debug.core;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.ui;bundle-version="[3.109.0,4.0.0)",
org.eclipse.papyrus.moka.fmu.engine;bundle-version="3.0.0",
org.eclipse.papyrus.moka;bundle-version="2.0.100",
org.eclipse.papyrus.moka.service;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.utils;bundle-version="2.0.100"
+ org.eclipse.papyrus.moka.utils;bundle-version="2.0.100",
+ org.eclipse.papyrus.moka.fmi.profile;bundle-version="2.0.100",
+ org.eclipse.papyrus.moka.discreteevent;bundle-version="3.0.0",
+ org.eclipse.uml2.uml;bundle-version="[5.4.0,6.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
+ org.eclipse.papyrus.moka.fuml;bundle-version="3.0.0",
+ org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="3.0.0",
+ org.eclipse.papyrus.moka.composites;bundle-version="3.0.0",
+ org.eclipse.papyrus.moka.fuml.statemachines;bundle-version="2.0.0",
+ org.eclipse.papyrus.moka.timedfuml;bundle-version="3.0.0",
+ org.eclipse.papyrus.moka.timedfuml.interfaces;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Bundle-Vendor: Eclipse Modeling Project
Export-Package: org.eclipse.papyrus.moka.fmu.engine.debug
+Automatic-Module-Name: org.eclipse.papyrus.moka.fmu.engine.debug
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/build.properties b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/build.properties
index e9863e2..80e0e19 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/build.properties
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine.debug/build.properties
@@ -1,5 +1,6 @@
source.. = src/
-output.. = bin/
+output.. = target/classes/
bin.includes = META-INF/,\
.,\
- plugin.xml
+ plugin.xml,\
+ pom.xml
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/META-INF/MANIFEST.MF b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/META-INF/MANIFEST.MF
index e69262a..cd55701 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/META-INF/MANIFEST.MF
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fmu.engine/META-INF/MANIFEST.MF
@@ -4,13 +4,22 @@
Bundle-SymbolicName: org.eclipse.papyrus.moka.fmu.engine;singleton:=true
Bundle-Version: 3.0.0.qualifier
Bundle-Activator: org.eclipse.papyrus.moka.fmu.engine.Activator
-Require-Bundle: org.eclipse.papyrus.moka.timedfuml;bundle-version="3.0.0";visibility:=reexport,
- org.eclipse.papyrus.moka.fmi.profile;bundle-version="2.0.100";visibility:=reexport,
+Require-Bundle: org.eclipse.debug.core;bundle-version="[3.12.0,4.0.0)",
+ com.fasterxml.jackson.core.jackson-core;bundle-version="[2.5.0,3.0.0)",
+ com.fasterxml.jackson.core.jackson-annotations;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.papyrus.moka.fmi.profile;bundle-version="2.0.100",
org.eclipse.papyrus.moka.service;bundle-version="2.0.100",
org.eclipse.papyrus.moka;bundle-version="2.0.100",
org.eclipse.papyrus.moka.utils;bundle-version="2.0.100",
- com.fasterxml.jackson.core.jackson-core;bundle-version="[2.5.0,3.0.0)",
- com.fasterxml.jackson.core.jackson-annotations;bundle-version="[2.5.0,3.0.0)"
+ org.eclipse.papyrus.moka.discreteevent;bundle-version="3.0.0",
+ org.eclipse.papyrus.moka.fuml;bundle-version="3.0.0",
+ org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="3.0.0",
+ org.eclipse.papyrus.moka.composites;bundle-version="3.0.0",
+ org.eclipse.papyrus.moka.composites.interfaces;bundle-version="3.0.0",
+ org.eclipse.papyrus.moka.fuml.statemachines;bundle-version="2.0.0",
+ org.eclipse.papyrus.moka.fuml.statemachines.interfaces;bundle-version="2.0.0",
+ org.eclipse.papyrus.moka.timedfuml;bundle-version="3.0.0",
+ org.eclipse.papyrus.moka.timedfuml.interfaces;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.papyrus.moka.fmu.communication,
@@ -22,3 +31,4 @@
org.eclipse.papyrus.moka.fmu.engine.utils,
org.eclipse.papyrus.moka.fmu.json
Bundle-Vendor: Eclipse Modeling Project
+Automatic-Module-Name: org.eclipse.papyrus.moka.fmu.engine
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/META-INF/MANIFEST.MF b/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/META-INF/MANIFEST.MF
index ee8a66a..dd50f0b 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/META-INF/MANIFEST.MF
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/META-INF/MANIFEST.MF
@@ -3,12 +3,19 @@
Bundle-Name: Moka execution engine for cosimulation
Bundle-SymbolicName: org.eclipse.papyrus.moka.fuml.cosimulation;singleton:=true
Bundle-Version: 2.1.0.qualifier
-Require-Bundle: org.eclipse.papyrus.moka.fmi.master;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.timedfuml;bundle-version="3.0.0";visibility:=reexport,
+Require-Bundle: org.eclipse.papyrus.moka.fmi.master;bundle-version="2.1.0",
+ org.eclipse.papyrus.moka.timedfuml;bundle-version="3.0.0",
org.eclipse.papyrus.moka;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.fmi.profile;bundle-version="2.0.100"
+ org.eclipse.papyrus.moka.fmi.profile;bundle-version="2.0.100",
+ org.eclipse.papyrus.moka.fuml;bundle-version="3.0.0",
+ org.eclipse.papyrus.moka.fuml.interfaces;bundle-version="3.0.0",
+ org.eclipse.papyrus.moka.composites;bundle-version="3.0.0",
+ org.eclipse.papyrus.moka.composites.interfaces;bundle-version="3.0.0",
+ org.eclipse.papyrus.moka.fuml.statemachines;bundle-version="2.0.0",
+ org.eclipse.debug.core;bundle-version="[3.12.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Bundle-Vendor: Eclipse Modeling Project
Export-Package: org.eclipse.papyrus.moka.fuml.cosimulation,
org.eclipse.papyrus.moka.fuml.cosimulation.semantics
+Automatic-Module-Name: org.eclipse.papyrus.moka.fuml.cosimulation
diff --git a/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/build.properties b/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/build.properties
index 7513867..3cdcd31 100644
--- a/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/build.properties
+++ b/bundles/fmi/engines/org.eclipse.papyrus.moka.fuml.cosimulation/build.properties
@@ -1,6 +1,8 @@
source.. = src/
+output.. = target/classes/
bin.includes = META-INF/,\
.,\
plugin.xml,\
- about.html
+ about.html,\
+ pom.xml
src.includes = about.html
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/META-INF/MANIFEST.MF b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/META-INF/MANIFEST.MF
index 878dcf8..6397f46 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/META-INF/MANIFEST.MF
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
- org.eclipse.uml2.uml.resources;bundle-version="[5.3.0,6.0.0)",
- org.eclipse.uml2.uml.profile.standard;bundle-version="[1.0.100,2.0.0)";visibility:=reexport,
- org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)";visibility:=reexport,
- org.eclipse.papyrus.moka.fmi;bundle-version="2.0.100";visibility:=reexport
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
+ org.eclipse.uml2.uml.resources;bundle-version="[5.4.0,6.0.0)",
+ org.eclipse.uml2.uml.profile.standard;bundle-version="[1.4.0,2.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.4.0,6.0.0)",
+ org.eclipse.papyrus.moka.fmi;bundle-version="2.0.100"
Bundle-ActivationPolicy: lazy
Bundle-Version: 2.0.100.qualifier
Bundle-ClassPath: .
@@ -17,3 +17,4 @@
org.eclipse.papyrus.moka.fmi.profile.custom,
org.eclipse.papyrus.moka.fmi.profile.util
Bundle-Vendor: Eclipse Modeling Project
+Automatic-Module-Name: org.eclipse.papyrus.moka.fmi.profile
diff --git a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/build.properties b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/build.properties
index 51b4624..e16b6fe 100644
--- a/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/build.properties
+++ b/bundles/fmi/language/org.eclipse.papyrus.moka.fmi.profile/build.properties
@@ -1,8 +1,10 @@
source.. = src/,\
src-gen/
+output.. = target/classes/
bin.includes = META-INF/,\
.,\
plugin.xml,\
model/,\
- about.html
+ about.html,\
+ pom.xml
src.includes = about.html
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/META-INF/MANIFEST.MF b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/META-INF/MANIFEST.MF
index 8fad690..af77ea5 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/META-INF/MANIFEST.MF
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/META-INF/MANIFEST.MF
@@ -3,10 +3,13 @@
Bundle-Name: FMI 2 UML Importer
Bundle-SymbolicName: org.eclipse.papyrus.moka.fmi.fmi2uml
Bundle-Version: 2.0.100.qualifier
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
- org.eclipse.papyrus.moka.fmi.profile;bundle-version="2.0.100";visibility:=reexport
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.4.0,6.0.0)",
+ org.eclipse.papyrus.moka.fmi.profile;bundle-version="2.0.100",
+ org.eclipse.papyrus.moka.fmi;bundle-version="2.0.100"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.papyrus.moka.fmi.fmi2uml
Bundle-Vendor: Eclipse Modeling Project
Bundle-Activator: org.eclipse.papyrus.moka.fmi.fmi2uml.Activator
+Automatic-Module-Name: org.eclipse.papyrus.moka.fmi.fmi2uml
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/build.properties b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/build.properties
index 6f029a7..534edef 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/build.properties
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.fmi2uml/build.properties
@@ -1,7 +1,9 @@
source.. = src/
+output.. = target/classes/
bin.includes = META-INF/,\
about.html,\
- .
+ .,\
+ pom.xml
jars.compile.order = .
source.. = src/
src.includes = about.html
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/META-INF/MANIFEST.MF b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/META-INF/MANIFEST.MF
index 933c59b..9741b7e 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/META-INF/MANIFEST.MF
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/META-INF/MANIFEST.MF
@@ -6,7 +6,8 @@
Bundle-Activator: org.eclipse.papyrus.moka.fmi.profile.ui.Activator
Bundle-Vendor: Eclipse Modeling Project
Require-Bundle: org.eclipse.ui;bundle-version="[3.109.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)"
+ org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.papyrus.moka.fmi.profile.ui
+Automatic-Module-Name: org.eclipse.papyrus.moka.fmi.profile.ui
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/build.properties b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/build.properties
index d64280b..3378a01 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/build.properties
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.profile.ui/build.properties
@@ -1,5 +1,7 @@
source.. = src/
+output.. = target/classes/
bin.includes = META-INF/,\
.,\
plugin.xml,\
- icons/
+ icons/,\
+ pom.xml
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.rcp.export/META-INF/MANIFEST.MF b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.rcp.export/META-INF/MANIFEST.MF
index 615efc7..7a99e53 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.rcp.export/META-INF/MANIFEST.MF
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.rcp.export/META-INF/MANIFEST.MF
@@ -5,3 +5,4 @@
Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: Eclipse Modeling project
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.papyrus.moka.fmi.rcp.export
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.rcp.export/build.properties b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.rcp.export/build.properties
index 19f676e..b9f1158 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.rcp.export/build.properties
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi.rcp.export/build.properties
@@ -1,4 +1,5 @@
source.. = src/
+output.. = target/classes/
bin.includes = META-INF/,\
.,\
resources/
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/META-INF/MANIFEST.MF b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/META-INF/MANIFEST.MF
index 9b7357e..cfbd06d 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/META-INF/MANIFEST.MF
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.13.0,3.0.0)";visibility:=reexport,
- org.eclipse.uml2.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecore.xmi;bundle-version="[2.13.0,3.0.0)";visibility:=reexport
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.14.0,3.0.0)",
+ org.eclipse.uml2.types;bundle-version="[2.4.0,3.0.0)",
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.14.0,3.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-Version: 2.0.100.qualifier
Bundle-ClassPath: .
@@ -22,3 +22,4 @@
org.eclipse.papyrus.moka.fmi.fmumetamodel.impl,
org.eclipse.papyrus.moka.fmi.fmumetamodel.util
Bundle-Activator: org.eclipse.papyrus.moka.fmi.Activator
+Automatic-Module-Name: org.eclipse.papyrus.moka.fmi
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/build.properties b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/build.properties
index ad503a4..a8f8206 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/build.properties
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmi/build.properties
@@ -1,10 +1,11 @@
source.. = src/,\
src-gen/
+ output.. = target/classes/
bin.includes = META-INF/,\
.,\
plugin.xml,\
- schema/,\
model/,\
- plugin.properties
-src.includes = schema/fmi2ModelDescription.xsd,\
- about.html
+ plugin.properties,\
+ pom.xml,\
+ schema/
+src.includes = about.html
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/META-INF/MANIFEST.MF b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/META-INF/MANIFEST.MF
index 2623df9..5cf5c21 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/META-INF/MANIFEST.MF
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/META-INF/MANIFEST.MF
@@ -3,12 +3,21 @@
Bundle-Name: Moka standalone RCP for FMU
Bundle-SymbolicName: org.eclipse.papyrus.moka.fmu.rcp;singleton:=true
Bundle-Version: 2.0.100.qualifier
-Require-Bundle: org.eclipse.papyrus.moka.fmu.engine;bundle-version="2.0.100",
+Require-Bundle: org.eclipse.papyrus.moka.fmu.engine;bundle-version="3.0.0",
org.apache.commons.cli;bundle-version="[1.2.0,2.0.0)",
org.eclipse.papyrus.moka;bundle-version="2.0.100",
org.eclipse.papyrus.moka.fmi.profile;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.timedfuml;bundle-version="2.0.100",
- org.aspectj.runtime;bundle-version="[1.8.10,2.0.0)"
+ org.eclipse.papyrus.moka.timedfuml;bundle-version="3.0.0",
+ org.aspectj.runtime;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.equinox.app;bundle-version="[1.3.500,2.0.0)",
+ org.eclipse.papyrus.moka.fmi;bundle-version="2.0.100",
+ org.eclipse.emf.common;bundle-version="[2.14.0,3.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.14.0,3.0.0)",
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.14.0,3.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.4.0,6.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
+ org.eclipse.debug.core;bundle-version="[3.12.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ClassPath: .
Export-Package: org.eclipse.papyrus.moka.fmu.rcp
+Automatic-Module-Name: org.eclipse.papyrus.moka.fmu.rcp
diff --git a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/build.properties b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/build.properties
index d87c40f..e57b096 100644
--- a/bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/build.properties
+++ b/bundles/fmi/tools/org.eclipse.papyrus.moka.fmu.rcp/build.properties
@@ -1,4 +1,5 @@
source.. = src/
bin.includes = plugin.xml,\
META-INF/,\
- .
+ .,\
+ pom.xml
diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/META-INF/MANIFEST.MF b/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/META-INF/MANIFEST.MF
index 7d924ec..ca3bb64 100644
--- a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/META-INF/MANIFEST.MF
+++ b/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/META-INF/MANIFEST.MF
@@ -5,22 +5,24 @@
Bundle-Version: 2.1.0.qualifier
Bundle-Activator: org.eclipse.papyrus.moka.fmi.ui.Activator
Require-Bundle: org.eclipse.ui;bundle-version="[3.109.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.13.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
+ org.eclipse.ui.ide;bundle-version="[3.14.0,4.0.0)",
org.eclipse.gef;bundle-version="[3.11.0,4.0.0)",
- org.eclipse.emf.transaction;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.transaction;bundle-version="[1.9.1,2.0.0)",
org.eclipse.papyrus.moka.ui;bundle-version="2.0.100",
org.eclipse.papyrus.moka.composites.utils;bundle-version="2.0.100",
- org.eclipse.papyrus.moka.fmu.engine;bundle-version="2.0.100",
+ org.eclipse.papyrus.moka.fmu.engine;bundle-version="3.0.0",
org.eclipse.papyrus.moka.fmi.fmi2uml;bundle-version="2.0.100",
org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.1.0,3.0.0)",
- org.eclipse.papyrus.uml.diagram.composite;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.uml.diagram.wizards;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.2.1,3.0.0)",
+ org.eclipse.papyrus.uml.diagram.composite;bundle-version="[3.1.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.4.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.wizards;bundle-version="[3.0.2,4.0.0)",
org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.core;bundle-version="2.0.0"
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.100,4.0.0)",
+ org.eclipse.papyrus.moka.fmi;bundle-version="2.0.100",
+ org.eclipse.papyrus.moka.fmi.profile
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Bundle-Vendor: Eclipse Modeling Project
@@ -29,3 +31,4 @@
org.eclipse.papyrus.moka.fmi.ui.dialogs,
org.eclipse.papyrus.moka.fmi.ui.dnd,
org.eclipse.papyrus.moka.fmi.ui.handlers
+Automatic-Module-Name: org.eclipse.papyrus.moka.fmi.ui
diff --git a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/build.properties b/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/build.properties
index 0d9f371..b4abc3f 100644
--- a/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/build.properties
+++ b/bundles/fmi/ui/org.eclipse.papyrus.moka.fmi.ui/build.properties
@@ -1,7 +1,9 @@
source.. = src/
+output.. = target/classes/
bin.includes = META-INF/,\
.,\
plugin.xml,\
css/,\
models/,\
- icons/
+ icons/,\
+ pom.xml
diff --git a/features/org.eclipse.papyrus.moka.feature/feature.xml b/features/org.eclipse.papyrus.moka.feature/feature.xml
index ba63e91..26200e4 100644
--- a/features/org.eclipse.papyrus.moka.feature/feature.xml
+++ b/features/org.eclipse.papyrus.moka.feature/feature.xml
@@ -29,81 +29,78 @@
</license>
<requires>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.uml2.uml" version="5.2.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.ui" version="3.107.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.core.runtime" version="3.12.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.debug.core" version="3.10.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.papyrus.infra.core" version="2.0.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.papyrus.infra.core.log" version="1.2.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.ui.console" version="3.6.100" match="greaterOrEqual"/>
- <import plugin="org.apache.commons.lang" version="2.6.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.papyrus.uml.extensionpoints" version="1.2.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.emf" version="2.6.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.emf.ecore" version="2.12.0" match="greaterOrEqual"/>
- <import plugin="org.aspectj.runtime" version="1.8.10" match="greaterOrEqual"/>
- <import plugin="org.eclipse.ui.workbench" version="3.108.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.emf.common" version="2.12.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.debug.ui" version="3.11.100" match="greaterOrEqual"/>
- <import plugin="org.eclipse.papyrus.infra.widgets" version="2.0.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.gmf.runtime.notation" version="1.8.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.gef" version="3.11.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.gmf.runtime.diagram.ui" version="1.8.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.papyrus.uml.diagram.common" version="2.0.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.papyrus.infra.emf" version="2.0.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.papyrus.infra.services.decoration" version="1.2.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.papyrus.infra.services.labelprovider" version="1.2.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.ui.ide" version="3.12.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.papyrus.editor" version="1.2.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.papyrus.infra.gmfdiag.css" version="1.2.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.e4.ui.css.core" version="0.11.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.papyrus.infra.gmfdiag.common" version="2.0.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.papyrus.infra.services.markerlistener" version="1.2.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.jdt.ui"/>
- <import plugin="org.eclipse.papyrus.moka.animation"/>
- <import plugin="org.eclipse.emf.transaction" version="1.9.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.papyrus.uml.tools.utils" version="2.0.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.papyrus.uml.icons" version="1.2.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.gmf.runtime.notation.edit" version="1.7.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.papyrus.infra.gmfdiag.common" version="1.2.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.core.jobs" version="3.8.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.jface" version="3.12.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.papyrus.infra.core.sashwindows.di" version="1.2.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.papyrus.infra.viewpoints.policy" version="1.2.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.papyrus.infra.gmfdiag.dnd" version="1.2.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.papyrus.infra.services.edit" version="2.0.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.papyrus.uml.diagram.activity" version="2.0.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.papyrus.uml.service.types" version="2.0.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.papyrus.infra.ui.emf" version="1.2.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.gmf.runtime.emf.type.core" version="1.9.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.papyrus.infra.types.core" version="2.0.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.equinox.registry" version="3.6.100" match="greaterOrEqual"/>
- <import plugin="org.eclipse.emf.validation" version="1.8.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.core.resources" version="3.11.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.debug.core" version="3.12.0" match="compatible"/>
+ <import plugin="org.eclipse.core.runtime" version="3.14.0" match="compatible"/>
+ <import plugin="org.eclipse.uml2.uml" version="5.4.0" match="compatible"/>
+ <import plugin="org.eclipse.papyrus.moka.utils" version="2.0.100" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.papyrus.moka.service" version="2.0.100" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.ui" version="3.109.0" match="compatible"/>
+ <import plugin="org.eclipse.papyrus.infra.core" version="3.0.100" match="compatible"/>
+ <import plugin="org.eclipse.ui.console" version="3.8.0" match="compatible"/>
+ <import plugin="org.eclipse.papyrus.uml.extensionpoints" version="1.3.0" match="compatible"/>
+ <import plugin="org.aspectj.runtime" version="1.9.0" match="compatible"/>
+ <import plugin="org.eclipse.papyrus.moka" version="2.0.100" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.papyrus.moka.fuml" version="3.0.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.papyrus.moka.fuml.interfaces" version="3.0.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.papyrus.moka.composites" version="3.0.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.papyrus.moka.composites.interfaces" version="3.0.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.papyrus.moka.fuml.standardlibrary" version="2.0.100" match="greaterOrEqual"/>
+ <import plugin="org.apache.commons.lang" version="2.6.0" match="compatible"/>
+ <import plugin="org.eclipse.papyrus.infra.core.log" version="1.2.0" match="compatible"/>
+ <import plugin="org.eclipse.jface" version="3.14.0" match="compatible"/>
+ <import plugin="org.eclipse.debug.ui" version="3.13.0" match="compatible"/>
+ <import plugin="org.eclipse.papyrus.uml.diagram.common" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.papyrus.editor" version="2.0.0" match="compatible"/>
+ <import plugin="org.eclipse.papyrus.infra.gmfdiag.css" version="2.2.1" match="compatible"/>
+ <import plugin="org.eclipse.papyrus.moka.debug" version="2.0.100" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.papyrus.moka.utils.ui" version="2.0.100" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.papyrus.moka.animation" version="2.0.100" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.papyrus.uml.tools.utils" version="3.4.0" match="compatible"/>
+ <import plugin="org.eclipse.papyrus.infra.emf" version="3.0.0" match="compatible"/>
+ <import plugin="org.eclipse.gmf.runtime.diagram.ui" version="1.8.0" match="compatible"/>
+ <import plugin="org.eclipse.papyrus.moka.fuml.statemachines.interfaces" version="2.0.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.papyrus.infra.viewpoints.policy" version="3.0.0" match="compatible"/>
+ <import plugin="org.eclipse.papyrus.infra.gmfdiag.dnd" version="1.4.0" match="compatible"/>
+ <import plugin="org.eclipse.gef" version="3.11.0" match="compatible"/>
+ <import plugin="org.eclipse.papyrus.infra.services.edit" version="3.1.0" match="compatible"/>
+ <import plugin="org.eclipse.papyrus.uml.diagram.activity" version="3.1.0" match="compatible"/>
+ <import plugin="org.eclipse.papyrus.uml.service.types" version="4.0.0" match="compatible"/>
+ <import plugin="org.eclipse.papyrus.infra.gmfdiag.common" version="3.100.0" match="compatible"/>
+ <import plugin="org.eclipse.papyrus.infra.widgets" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.papyrus.infra.ui.emf" version="2.1.0" match="compatible"/>
+ <import plugin="org.eclipse.gmf.runtime.emf.type.core" version="1.9.0" match="compatible"/>
+ <import plugin="org.eclipse.papyrus.infra.types.core" version="4.0.0" match="compatible"/>
+ <import plugin="org.eclipse.papyrus.infra.architecture" version="2.0.0" match="compatible"/>
+ <import plugin="org.eclipse.equinox.registry" version="3.8.0" match="compatible"/>
+ <import plugin="org.eclipse.emf.validation" version="1.8.0" match="compatible"/>
+ <import plugin="org.eclipse.papyrus.infra.services.labelprovider" version="2.0.0" match="compatible"/>
+ <import plugin="org.eclipse.papyrus.moka.timedfuml.interfaces" version="1.0.0" match="greaterOrEqual"/>
+ <import plugin="org.aspectj.runtime" version="1.9.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.osgi" version="3.10.0" match="compatible"/>
- <import plugin="org.eclipse.papyrus.infra.ui" version="1.2.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.uml2.types"/>
- <import plugin="org.eclipse.emf.common.ui"/>
- <import plugin="org.eclipse.papyrus.moka.xygraph.mapping"/>
- <import plugin="org.eclipse.papyrus.infra.properties" version="1.2.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.draw2d" version="3.10.100" match="greaterOrEqual"/>
- <import plugin="org.eclipse.nebula.visualization.xygraph" version="2.0.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.papyrus.moka.discreteevent" version="3.0.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.papyrus.moka.fuml.statemachines" version="2.0.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.papyrus.infra.ui" version="2.0.0" match="compatible"/>
+ <import plugin="org.eclipse.emf.common.ui" version="2.13.0" match="compatible"/>
+ <import plugin="org.eclipse.papyrus.moka.datavisualization" version="1.0.100" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.papyrus.moka.xygraph.common" version="1.0.100" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.papyrus.infra.properties" version="3.0.0" match="compatible"/>
+ <import plugin="org.eclipse.papyrus.moka.xygraph.model" version="1.0.100" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.papyrus.moka.xygraph.mapping" version="1.0.100" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.draw2d" version="3.10.100" match="compatible"/>
+ <import plugin="org.eclipse.nebula.visualization.xygraph" version="3.1.0" match="compatible"/>
+ <import plugin="org.eclipse.emf.ecore" version="2.13.0" match="compatible"/>
<import plugin="org.eclipse.papyrus.infra.emf.gmf" version="1.2.100" match="compatible"/>
- <import plugin="org.eclipse.papyrus.infra.viewpoints.policy" version="1.2.0"/>
<import plugin="org.eclipse.papyrus.emf.facet.query.java.core" version="2.0.0" match="compatible"/>
<import plugin="org.eclipse.papyrus.emf.facet.custom.metamodel" version="1.3.0" match="compatible"/>
- <import plugin="org.eclipse.papyrus.emf.facet.custom.ui" version="1.2.0"/>
- <import plugin="org.eclipse.papyrus.infra.ui" version="2.0.0" match="compatible"/>
- <import plugin="org.eclipse.papyrus.infra.emf" version="1.2.0"/>
- <import plugin="org.eclipse.papyrus.infra.properties.ui" version="1.2.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.uml2.uml" version="4.1.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.papyrus.moka"/>
- <import plugin="org.eclipse.papyrus.moka.composites"/>
- <import plugin="org.eclipse.papyrus.moka.fuml"/>
- <import plugin="org.eclipse.debug.core" version="3.8.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.papyrus.moka.ui"/>
- <import plugin="org.eclipse.papyrus.moka.fuml.interfaces"/>
- <import plugin="org.eclipse.papyrus.moka.composites.interfaces"/>
+ <import plugin="org.eclipse.papyrus.emf.facet.custom.ui" version="3.1.0" match="compatible"/>
+ <import plugin="org.eclipse.papyrus.infra.properties.ui" version="3.3.0" match="compatible"/>
+ <import plugin="org.eclipse.swt"/>
+ <import plugin="org.eclipse.papyrus.moka.timedfuml" version="3.0.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.papyrus.uml.nattable" version="5.0.0" match="compatible"/>
+ <import plugin="org.eclipse.papyrus.uml.nattable.xtext.valuespecification" version="5.0.0" match="compatible"/>
+ <import plugin="org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils" version="1.3.0" match="compatible"/>
+ <import plugin="org.eclipse.papyrus.infra.services.validation" version="3.0.0" match="compatible"/>
+ <import plugin="org.eclipse.papyrus.moka.xygraph.mapping" version="1.1.0" match="greaterOrEqual"/>
</requires>
<plugin
diff --git a/features/org.eclipse.papyrus.moka.fmi.feature/feature.xml b/features/org.eclipse.papyrus.moka.fmi.feature/feature.xml
index c493d6e..693c069 100644
--- a/features/org.eclipse.papyrus.moka.fmi.feature/feature.xml
+++ b/features/org.eclipse.papyrus.moka.fmi.feature/feature.xml
@@ -18,48 +18,56 @@
</copyright>
<requires>
- <import plugin="org.eclipse.papyrus.infra.core" version="2.0.0" match="greaterOrEqual"/>
- <import feature="org.eclipse.papyrus.moka.feature" version="2.0.0.qualifier"/>
- <import plugin="org.eclipse.core.runtime" version="3.13.0" match="compatible"/>
- <import plugin="org.eclipse.emf.ecore" version="2.13.0" match="compatible"/>
- <import plugin="org.eclipse.uml2.types" version="2.0.0" match="compatible"/>
- <import plugin="org.eclipse.emf.ecore.xmi" version="2.13.0" match="compatible"/>
+ <import plugin="org.eclipse.core.runtime" version="3.14.0" match="compatible"/>
+ <import plugin="org.eclipse.emf.ecore" version="2.14.0" match="compatible"/>
+ <import plugin="org.eclipse.uml2.types" version="2.4.0" match="compatible"/>
+ <import plugin="org.eclipse.emf.ecore.xmi" version="2.14.0" match="compatible"/>
+ <import plugin="org.eclipse.uml2.uml" version="5.4.0" match="compatible"/>
<import plugin="org.eclipse.papyrus.moka.fmi.profile" version="2.0.100" match="greaterOrEqual"/>
- <import plugin="org.eclipse.papyrus.moka" version="2.0.100" match="greaterOrEqual"/>
- <import plugin="org.eclipse.papyrus.moka.composites" version="2.0.100" match="greaterOrEqual"/>
- <import plugin="org.eclipse.papyrus.uml.extensionpoints" version="1.2.0" match="compatible"/>
- <import plugin="org.eclipse.jface" version="3.12.0" match="compatible"/>
- <import plugin="com.github.jnr.jffi" version="1.2.11" match="greaterOrEqual"/>
- <import plugin="com.github.jnr.ffi" version="2.0.9" match="greaterOrEqual"/>
- <import plugin="org.eclipse.papyrus.moka.fmi.master" version="2.0.100" match="greaterOrEqual"/>
- <import plugin="org.eclipse.papyrus.moka.timedfuml" version="3.0.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.uml2.uml.resources" version="5.3.0" match="compatible"/>
- <import plugin="org.eclipse.uml2.uml.profile.standard" version="1.0.100" match="compatible"/>
- <import plugin="org.eclipse.uml2.uml" version="5.3.0" match="compatible"/>
<import plugin="org.eclipse.papyrus.moka.fmi" version="2.0.100" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.papyrus.uml.extensionpoints" version="1.3.0" match="compatible"/>
+ <import plugin="org.eclipse.jface" version="3.14.0" match="compatible"/>
+ <import plugin="com.github.jnr.jffi" version="1.2.15" match="equivalent"/>
+ <import plugin="com.github.jnr.ffi" version="2.1.4" match="compatible"/>
+ <import plugin="org.eclipse.papyrus.moka" version="2.0.100" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.papyrus.moka.fuml" version="3.0.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.papyrus.moka.fuml.interfaces" version="3.0.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.papyrus.moka.composites" version="3.0.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.papyrus.moka.composites.interfaces" version="3.0.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.papyrus.moka.fmi.master" version="2.1.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.papyrus.moka.timedfuml" version="3.0.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.papyrus.moka.fuml.statemachines" version="2.0.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.debug.core" version="3.12.0" match="compatible"/>
+ <import plugin="org.eclipse.uml2.uml.resources" version="5.4.0" match="compatible"/>
+ <import plugin="org.eclipse.uml2.uml.profile.standard" version="1.4.0" match="compatible"/>
<import plugin="org.eclipse.ui" version="3.109.0" match="compatible"/>
- <import plugin="org.eclipse.ui.ide" version="3.13.0" match="compatible"/>
+ <import plugin="org.eclipse.ui.ide" version="3.14.0" match="compatible"/>
<import plugin="org.eclipse.gef" version="3.11.0" match="compatible"/>
- <import plugin="org.eclipse.emf.transaction" version="1.9.0" match="compatible"/>
+ <import plugin="org.eclipse.emf.transaction" version="1.9.1" match="compatible"/>
<import plugin="org.eclipse.papyrus.moka.ui" version="2.0.100" match="greaterOrEqual"/>
<import plugin="org.eclipse.papyrus.moka.composites.utils" version="2.0.100" match="greaterOrEqual"/>
- <import plugin="org.eclipse.papyrus.moka.fmu.engine" version="2.0.100" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.papyrus.moka.fmu.engine" version="3.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.papyrus.moka.fmi.fmi2uml" version="2.0.100" match="greaterOrEqual"/>
<import plugin="org.eclipse.gmf.runtime.diagram.ui" version="1.8.0" match="compatible"/>
- <import plugin="org.eclipse.papyrus.infra.gmfdiag.css" version="2.1.0" match="compatible"/>
- <import plugin="org.eclipse.papyrus.uml.diagram.composite" version="3.0.0" match="compatible"/>
- <import plugin="org.eclipse.papyrus.infra.gmfdiag.dnd" version="1.2.0" match="compatible"/>
- <import plugin="org.eclipse.papyrus.uml.diagram.wizards" version="3.0.0" match="compatible"/>
+ <import plugin="org.eclipse.papyrus.infra.gmfdiag.css" version="2.2.1" match="compatible"/>
+ <import plugin="org.eclipse.papyrus.uml.diagram.composite" version="3.1.0" match="compatible"/>
+ <import plugin="org.eclipse.papyrus.infra.gmfdiag.dnd" version="1.4.0" match="compatible"/>
+ <import plugin="org.eclipse.papyrus.uml.diagram.wizards" version="3.0.2" match="compatible"/>
<import plugin="org.eclipse.papyrus.infra.ui" version="2.0.0" match="compatible"/>
- <import plugin="org.eclipse.papyrus.uml.tools.utils" version="3.0.0" match="compatible"/>
- <import plugin="org.eclipse.papyrus.moka.service" version="2.0.100" match="greaterOrEqual"/>
- <import plugin="org.eclipse.papyrus.moka.utils" version="2.0.100" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.papyrus.uml.tools.utils" version="3.4.0" match="compatible"/>
+ <import plugin="org.eclipse.papyrus.infra.core" version="3.0.100" match="compatible"/>
<import plugin="com.fasterxml.jackson.core.jackson-core" version="2.5.0" match="compatible"/>
<import plugin="com.fasterxml.jackson.core.jackson-annotations" version="2.5.0" match="compatible"/>
- <import plugin="org.eclipse.papyrus.moka.fmu.engine" version="3.0.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.papyrus.moka.service" version="2.0.100" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.papyrus.moka.utils" version="2.0.100" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.papyrus.moka.discreteevent" version="3.0.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.papyrus.moka.fuml.statemachines.interfaces" version="2.0.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.papyrus.moka.timedfuml.interfaces" version="1.0.0" match="greaterOrEqual"/>
<import plugin="org.apache.commons.cli" version="1.2.0" match="compatible"/>
- <import plugin="org.eclipse.papyrus.moka.timedfuml" version="2.0.100" match="greaterOrEqual"/>
- <import plugin="org.aspectj.runtime" version="1.8.10" match="compatible"/>
+ <import plugin="org.aspectj.runtime" version="1.9.0" match="compatible"/>
+ <import plugin="org.eclipse.equinox.app" version="1.3.500" match="compatible"/>
+ <import plugin="org.eclipse.emf.common" version="2.14.0" match="compatible"/>
+ <import feature="org.eclipse.papyrus.moka.feature" version="3.1.0.qualifier"/>
</requires>
<plugin
diff --git a/products/org.eclipse.papyrus.moka.fmu.product/.classpath b/products/org.eclipse.papyrus.moka.fmu.product/.classpath
index dc9b3f5..e226fb2 100644
--- a/products/org.eclipse.papyrus.moka.fmu.product/.classpath
+++ b/products/org.eclipse.papyrus.moka.fmu.product/.classpath
@@ -12,10 +12,5 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/products/org.eclipse.papyrus.moka.fmu.product/META-INF/MANIFEST.MF b/products/org.eclipse.papyrus.moka.fmu.product/META-INF/MANIFEST.MF
index 08a04e5..2697958 100644
--- a/products/org.eclipse.papyrus.moka.fmu.product/META-INF/MANIFEST.MF
+++ b/products/org.eclipse.papyrus.moka.fmu.product/META-INF/MANIFEST.MF
@@ -5,3 +5,4 @@
Bundle-Version: 2.0.0.qualifier
Bundle-Vendor: Eclipse Modelling Project
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.papyrus.moka.fmu.product
diff --git a/products/org.eclipse.papyrus.moka.fmu.product/build.properties b/products/org.eclipse.papyrus.moka.fmu.product/build.properties
index b107977..f44aa9d 100644
--- a/products/org.eclipse.papyrus.moka.fmu.product/build.properties
+++ b/products/org.eclipse.papyrus.moka.fmu.product/build.properties
@@ -1,3 +1,3 @@
-source.. = src/
bin.includes = META-INF/,\
- .
+ .,\
+ pom.xml
diff --git a/products/org.eclipse.papyrus.moka.fmu.product/fmu_rcp.product b/products/org.eclipse.papyrus.moka.fmu.product/fmu_rcp.product
index 55f3bb0..ae4808a 100644
--- a/products/org.eclipse.papyrus.moka.fmu.product/fmu_rcp.product
+++ b/products/org.eclipse.papyrus.moka.fmu.product/fmu_rcp.product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="FMU Embedded Moka" uid="fmu_embedded_moka" id="org.eclipse.papyrus.moka.fmu.rcp.product" application="org.eclipse.papyrus.moka.fmu.rcpapplication" version="0.1" useFeatures="false" includeLaunchers="true">
+<product name="FMU Embedded Moka" uid="fmu_embedded_moka" application="org.eclipse.papyrus.moka.fmu.rcpapplication" version="0.1" useFeatures="false" includeLaunchers="true">
<configIni use="default">
</configIni>
@@ -18,7 +18,6 @@
<windowImages/>
<launcher name="fmu_rcp">
- <solaris/>
<win useIco="false">
<bmp/>
</win>
@@ -30,30 +29,174 @@
<plugins>
<plugin id="com.fasterxml.jackson.core.jackson-annotations"/>
<plugin id="com.fasterxml.jackson.core.jackson-core"/>
+ <plugin id="com.google.guava"/>
+ <plugin id="com.ibm.icu"/>
+ <plugin id="javax.annotation"/>
+ <plugin id="javax.inject"/>
<plugin id="javax.xml"/>
+ <plugin id="org.apache.ant"/>
+ <plugin id="org.apache.batik.constants"/>
+ <plugin id="org.apache.batik.css"/>
+ <plugin id="org.apache.batik.i18n"/>
+ <plugin id="org.apache.batik.util"/>
<plugin id="org.apache.commons.cli"/>
+ <plugin id="org.apache.commons.io"/>
+ <plugin id="org.apache.commons.jxpath"/>
<plugin id="org.apache.commons.lang"/>
<plugin id="org.apache.commons.logging"/>
+ <plugin id="org.apache.xmlgraphics"/>
<plugin id="org.aspectj.runtime"/>
+ <plugin id="org.eclipse.ant.core"/>
+ <plugin id="org.eclipse.ant.launching"/>
+ <plugin id="org.eclipse.ant.ui"/>
+ <plugin id="org.eclipse.compare"/>
+ <plugin id="org.eclipse.compare.core"/>
+ <plugin id="org.eclipse.core.commands"/>
<plugin id="org.eclipse.core.contenttype"/>
+ <plugin id="org.eclipse.core.databinding"/>
+ <plugin id="org.eclipse.core.databinding.observable"/>
+ <plugin id="org.eclipse.core.databinding.property"/>
<plugin id="org.eclipse.core.expressions"/>
+ <plugin id="org.eclipse.core.externaltools"/>
+ <plugin id="org.eclipse.core.filebuffers"/>
<plugin id="org.eclipse.core.filesystem"/>
+ <plugin id="org.eclipse.core.filesystem.win32.x86_64" fragment="true"/>
<plugin id="org.eclipse.core.jobs"/>
<plugin id="org.eclipse.core.resources"/>
+ <plugin id="org.eclipse.core.resources.win32.x86_64" fragment="true"/>
<plugin id="org.eclipse.core.runtime"/>
+ <plugin id="org.eclipse.core.variables"/>
+ <plugin id="org.eclipse.debug.core"/>
+ <plugin id="org.eclipse.debug.ui"/>
+ <plugin id="org.eclipse.draw2d"/>
+ <plugin id="org.eclipse.e4.core.commands"/>
+ <plugin id="org.eclipse.e4.core.contexts"/>
+ <plugin id="org.eclipse.e4.core.di"/>
+ <plugin id="org.eclipse.e4.core.di.annotations"/>
+ <plugin id="org.eclipse.e4.core.di.extensions"/>
+ <plugin id="org.eclipse.e4.core.di.extensions.supplier"/>
+ <plugin id="org.eclipse.e4.core.services"/>
+ <plugin id="org.eclipse.e4.emf.xpath"/>
+ <plugin id="org.eclipse.e4.ui.bindings"/>
+ <plugin id="org.eclipse.e4.ui.css.core"/>
+ <plugin id="org.eclipse.e4.ui.css.swt"/>
+ <plugin id="org.eclipse.e4.ui.css.swt.theme"/>
+ <plugin id="org.eclipse.e4.ui.di"/>
+ <plugin id="org.eclipse.e4.ui.model.workbench"/>
+ <plugin id="org.eclipse.e4.ui.services"/>
+ <plugin id="org.eclipse.e4.ui.widgets"/>
+ <plugin id="org.eclipse.e4.ui.workbench"/>
+ <plugin id="org.eclipse.e4.ui.workbench.addons.swt"/>
+ <plugin id="org.eclipse.e4.ui.workbench.renderers.swt"/>
+ <plugin id="org.eclipse.e4.ui.workbench.swt"/>
+ <plugin id="org.eclipse.e4.ui.workbench3"/>
<plugin id="org.eclipse.emf"/>
<plugin id="org.eclipse.emf.common"/>
+ <plugin id="org.eclipse.emf.common.ui"/>
<plugin id="org.eclipse.emf.ecore"/>
+ <plugin id="org.eclipse.emf.ecore.change"/>
+ <plugin id="org.eclipse.emf.ecore.edit"/>
<plugin id="org.eclipse.emf.ecore.xmi"/>
+ <plugin id="org.eclipse.emf.edit"/>
+ <plugin id="org.eclipse.emf.edit.ui"/>
<plugin id="org.eclipse.emf.mapping.ecore2xml"/>
+ <plugin id="org.eclipse.emf.transaction"/>
+ <plugin id="org.eclipse.emf.validation"/>
+ <plugin id="org.eclipse.emf.workspace"/>
<plugin id="org.eclipse.equinox.app"/>
+ <plugin id="org.eclipse.equinox.bidi"/>
<plugin id="org.eclipse.equinox.common"/>
+ <plugin id="org.eclipse.equinox.frameworkadmin"/>
+ <plugin id="org.eclipse.equinox.frameworkadmin.equinox"/>
+ <plugin id="org.eclipse.equinox.p2.artifact.repository"/>
+ <plugin id="org.eclipse.equinox.p2.core"/>
+ <plugin id="org.eclipse.equinox.p2.director"/>
+ <plugin id="org.eclipse.equinox.p2.director.app"/>
+ <plugin id="org.eclipse.equinox.p2.engine"/>
+ <plugin id="org.eclipse.equinox.p2.garbagecollector"/>
+ <plugin id="org.eclipse.equinox.p2.jarprocessor"/>
+ <plugin id="org.eclipse.equinox.p2.metadata"/>
+ <plugin id="org.eclipse.equinox.p2.metadata.repository"/>
+ <plugin id="org.eclipse.equinox.p2.operations"/>
+ <plugin id="org.eclipse.equinox.p2.publisher"/>
+ <plugin id="org.eclipse.equinox.p2.publisher.eclipse"/>
+ <plugin id="org.eclipse.equinox.p2.repository"/>
+ <plugin id="org.eclipse.equinox.p2.repository.tools"/>
+ <plugin id="org.eclipse.equinox.p2.touchpoint.eclipse"/>
+ <plugin id="org.eclipse.equinox.p2.ui"/>
<plugin id="org.eclipse.equinox.preferences"/>
<plugin id="org.eclipse.equinox.registry"/>
+ <plugin id="org.eclipse.equinox.security"/>
+ <plugin id="org.eclipse.equinox.security.ui"/>
+ <plugin id="org.eclipse.equinox.security.win32.x86_64" fragment="true"/>
+ <plugin id="org.eclipse.equinox.simpleconfigurator"/>
+ <plugin id="org.eclipse.equinox.simpleconfigurator.manipulator"/>
<plugin id="org.eclipse.equinox.weaving.hook" fragment="true"/>
+ <plugin id="org.eclipse.gmf.runtime.common.core"/>
+ <plugin id="org.eclipse.gmf.runtime.emf.clipboard.core"/>
+ <plugin id="org.eclipse.gmf.runtime.emf.commands.core"/>
+ <plugin id="org.eclipse.gmf.runtime.emf.core"/>
+ <plugin id="org.eclipse.gmf.runtime.emf.type.core"/>
+ <plugin id="org.eclipse.gmf.runtime.notation"/>
+ <plugin id="org.eclipse.gmf.runtime.notation.edit"/>
+ <plugin id="org.eclipse.help"/>
+ <plugin id="org.eclipse.jdt.compiler.apt" fragment="true"/>
+ <plugin id="org.eclipse.jdt.compiler.tool" fragment="true"/>
+ <plugin id="org.eclipse.jdt.core"/>
+ <plugin id="org.eclipse.jdt.core.manipulation"/>
+ <plugin id="org.eclipse.jdt.debug"/>
+ <plugin id="org.eclipse.jdt.debug.ui"/>
+ <plugin id="org.eclipse.jdt.junit"/>
+ <plugin id="org.eclipse.jdt.junit.core"/>
+ <plugin id="org.eclipse.jdt.junit.runtime"/>
+ <plugin id="org.eclipse.jdt.launching"/>
+ <plugin id="org.eclipse.jdt.ui"/>
+ <plugin id="org.eclipse.jface"/>
+ <plugin id="org.eclipse.jface.databinding"/>
+ <plugin id="org.eclipse.jface.text"/>
+ <plugin id="org.eclipse.ltk.core.refactoring"/>
+ <plugin id="org.eclipse.ltk.ui.refactoring"/>
+ <plugin id="org.eclipse.nebula.widgets.richtext"/>
<plugin id="org.eclipse.osgi"/>
<plugin id="org.eclipse.osgi.compatibility.state" fragment="true"/>
+ <plugin id="org.eclipse.osgi.services"/>
+ <plugin id="org.eclipse.osgi.util"/>
+ <plugin id="org.eclipse.papyrus.emf"/>
+ <plugin id="org.eclipse.papyrus.emf.facet.common.core"/>
+ <plugin id="org.eclipse.papyrus.emf.facet.common.ui"/>
+ <plugin id="org.eclipse.papyrus.emf.facet.custom.core"/>
+ <plugin id="org.eclipse.papyrus.emf.facet.custom.metamodel"/>
+ <plugin id="org.eclipse.papyrus.emf.facet.efacet"/>
+ <plugin id="org.eclipse.papyrus.emf.facet.efacet.catalog"/>
+ <plugin id="org.eclipse.papyrus.emf.facet.efacet.core"/>
+ <plugin id="org.eclipse.papyrus.emf.facet.efacet.metamodel"/>
+ <plugin id="org.eclipse.papyrus.emf.facet.util.core"/>
+ <plugin id="org.eclipse.papyrus.emf.facet.util.emf.catalog"/>
+ <plugin id="org.eclipse.papyrus.emf.facet.util.emf.core"/>
+ <plugin id="org.eclipse.papyrus.emf.facet.util.emf.ui"/>
+ <plugin id="org.eclipse.papyrus.emf.facet.util.pde.core"/>
+ <plugin id="org.eclipse.papyrus.emf.facet.util.swt"/>
+ <plugin id="org.eclipse.papyrus.emf.facet.util.ui"/>
+ <plugin id="org.eclipse.papyrus.infra.constraints"/>
+ <plugin id="org.eclipse.papyrus.infra.core"/>
+ <plugin id="org.eclipse.papyrus.infra.core.architecture"/>
<plugin id="org.eclipse.papyrus.infra.core.log"/>
+ <plugin id="org.eclipse.papyrus.infra.core.sasheditor"/>
+ <plugin id="org.eclipse.papyrus.infra.core.sasheditor.di"/>
+ <plugin id="org.eclipse.papyrus.infra.core.sashwindows.di"/>
+ <plugin id="org.eclipse.papyrus.infra.emf"/>
+ <plugin id="org.eclipse.papyrus.infra.emf.expressions"/>
+ <plugin id="org.eclipse.papyrus.infra.emf.gmf"/>
+ <plugin id="org.eclipse.papyrus.infra.internationalization"/>
+ <plugin id="org.eclipse.papyrus.infra.internationalization.common"/>
+ <plugin id="org.eclipse.papyrus.infra.internationalization.utils"/>
+ <plugin id="org.eclipse.papyrus.infra.nattable.model"/>
+ <plugin id="org.eclipse.papyrus.infra.services.labelprovider"/>
+ <plugin id="org.eclipse.papyrus.infra.tools"/>
+ <plugin id="org.eclipse.papyrus.infra.types"/>
+ <plugin id="org.eclipse.papyrus.infra.ui"/>
+ <plugin id="org.eclipse.papyrus.infra.widgets"/>
+ <plugin id="org.eclipse.papyrus.infra.widgets.toolbox"/>
<plugin id="org.eclipse.papyrus.moka"/>
<plugin id="org.eclipse.papyrus.moka.composites"/>
<plugin id="org.eclipse.papyrus.moka.composites.interfaces"/>
@@ -69,12 +212,54 @@
<plugin id="org.eclipse.papyrus.moka.fuml.statemachines.interfaces"/>
<plugin id="org.eclipse.papyrus.moka.service"/>
<plugin id="org.eclipse.papyrus.moka.timedfuml"/>
+ <plugin id="org.eclipse.papyrus.moka.timedfuml.interfaces"/>
<plugin id="org.eclipse.papyrus.moka.utils"/>
+ <plugin id="org.eclipse.papyrus.uml.extensionpoints"/>
+ <plugin id="org.eclipse.papyrus.uml.internationalization.utils"/>
+ <plugin id="org.eclipse.pde"/>
+ <plugin id="org.eclipse.pde.build"/>
+ <plugin id="org.eclipse.pde.core"/>
+ <plugin id="org.eclipse.pde.launching"/>
+ <plugin id="org.eclipse.pde.ui"/>
+ <plugin id="org.eclipse.search"/>
+ <plugin id="org.eclipse.swt"/>
+ <plugin id="org.eclipse.swt.win32.win32.x86_64" fragment="true"/>
+ <plugin id="org.eclipse.team.core"/>
+ <plugin id="org.eclipse.team.ui"/>
+ <plugin id="org.eclipse.text"/>
+ <plugin id="org.eclipse.ui"/>
+ <plugin id="org.eclipse.ui.cheatsheets"/>
+ <plugin id="org.eclipse.ui.console"/>
+ <plugin id="org.eclipse.ui.editors"/>
+ <plugin id="org.eclipse.ui.externaltools"/>
+ <plugin id="org.eclipse.ui.forms"/>
+ <plugin id="org.eclipse.ui.genericeditor"/>
+ <plugin id="org.eclipse.ui.ide"/>
+ <plugin id="org.eclipse.ui.intro"/>
+ <plugin id="org.eclipse.ui.navigator"/>
+ <plugin id="org.eclipse.ui.navigator.resources"/>
+ <plugin id="org.eclipse.ui.trace"/>
+ <plugin id="org.eclipse.ui.views"/>
+ <plugin id="org.eclipse.ui.views.log"/>
+ <plugin id="org.eclipse.ui.views.properties.tabbed"/>
+ <plugin id="org.eclipse.ui.win32" fragment="true"/>
+ <plugin id="org.eclipse.ui.workbench"/>
+ <plugin id="org.eclipse.ui.workbench.texteditor"/>
<plugin id="org.eclipse.uml2.common"/>
<plugin id="org.eclipse.uml2.types"/>
<plugin id="org.eclipse.uml2.uml"/>
<plugin id="org.eclipse.uml2.uml.profile.standard"/>
<plugin id="org.eclipse.uml2.uml.resources"/>
+ <plugin id="org.eclipse.update.configurator"/>
+ <plugin id="org.hamcrest.core"/>
+ <plugin id="org.junit"/>
+ <plugin id="org.sat4j.core"/>
+ <plugin id="org.sat4j.pb"/>
+ <plugin id="org.tukaani.xz"/>
+ <plugin id="org.w3c.css.sac"/>
+ <plugin id="org.w3c.dom.events"/>
+ <plugin id="org.w3c.dom.smil"/>
+ <plugin id="org.w3c.dom.svg"/>
</plugins>
<configurations>
diff --git a/products/org.eclipse.papyrus.moka.standalone.product/.classpath b/products/org.eclipse.papyrus.moka.standalone.product/.classpath
index dc9b3f5..e226fb2 100644
--- a/products/org.eclipse.papyrus.moka.standalone.product/.classpath
+++ b/products/org.eclipse.papyrus.moka.standalone.product/.classpath
@@ -12,10 +12,5 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/products/org.eclipse.papyrus.moka.standalone.product/META-INF/MANIFEST.MF b/products/org.eclipse.papyrus.moka.standalone.product/META-INF/MANIFEST.MF
index 0de86a5..f573d46 100644
--- a/products/org.eclipse.papyrus.moka.standalone.product/META-INF/MANIFEST.MF
+++ b/products/org.eclipse.papyrus.moka.standalone.product/META-INF/MANIFEST.MF
@@ -5,7 +5,8 @@
Bundle-Version: 2.0.0.qualifier
Bundle-Activator: org.eclipse.papyrus.moka.standalone.product.Activator
Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.core.runtime
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.papyrus.moka.standalone.product
+Automatic-Module-Name: org.eclipse.papyrus.moka.standalone.product
diff --git a/products/org.eclipse.papyrus.moka.standalone.product/build.properties b/products/org.eclipse.papyrus.moka.standalone.product/build.properties
index cc91072..80e0e19 100644
--- a/products/org.eclipse.papyrus.moka.standalone.product/build.properties
+++ b/products/org.eclipse.papyrus.moka.standalone.product/build.properties
@@ -1,4 +1,6 @@
source.. = src/
+output.. = target/classes/
bin.includes = META-INF/,\
.,\
- plugin.xml
+ plugin.xml,\
+ pom.xml
diff --git a/products/org.eclipse.papyrus.moka.standalone.product/org.eclipse.papyrus.moka.standalone.rcp.product b/products/org.eclipse.papyrus.moka.standalone.product/org.eclipse.papyrus.moka.standalone.rcp.product
index 3caec61..e2d5389 100644
--- a/products/org.eclipse.papyrus.moka.standalone.product/org.eclipse.papyrus.moka.standalone.rcp.product
+++ b/products/org.eclipse.papyrus.moka.standalone.product/org.eclipse.papyrus.moka.standalone.rcp.product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="Papyrus Moka Standalone (batch version)" uid="org.eclipse.papyrus.moka.standalone" id="org.eclipse.papyrus.moka.standalone.product.Moka_Standalone_Product" application="org.eclipse.papyrus.moka.standalone.rcp.application" version="2.0.0.qualifier" useFeatures="false" includeLaunchers="true">
+<product name="Papyrus Moka Standalone (batch version)" uid="org.eclipse.papyrus.moka.standalone" application="org.eclipse.papyrus.moka.standalone.rcp.application" version="2.0.0.qualifier" useFeatures="false" includeLaunchers="true">
<configIni use="default">
</configIni>
@@ -18,7 +18,6 @@
<windowImages/>
<launcher>
- <solaris/>
<win useIco="false">
<bmp/>
</win>
diff --git a/releng/org.eclipse.papyrus.moka.configuration/pom.xml b/releng/org.eclipse.papyrus.moka.configuration/pom.xml
index 4dcfa1a..201e58a 100644
--- a/releng/org.eclipse.papyrus.moka.configuration/pom.xml
+++ b/releng/org.eclipse.papyrus.moka.configuration/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.papyrus.components</groupId>
<artifactId>org.eclipse.papyrus.components.parent</artifactId>
- <version>0.0.22</version>
+ <version>0.0.24</version>
<relativePath></relativePath>
</parent>
@@ -22,13 +22,15 @@
<!-- Moka properties -->
<properties>
+ <tycho-version>1.1.0</tycho-version>
+ <tychoExtrasVersion>1.1.0</tychoExtrasVersion>
<component.shortname>moka</component.shortname>
<component.hudson.tabname>Moka</component.hudson.tabname>
<component.fullartifactId>org.eclipse.papyrus.moka</component.fullartifactId>
<component.bugzilla.name>Moka</component.bugzilla.name>
<component.package.rootname>org.eclipse.papyrus.moka</component.package.rootname>
<component.apibaseline.url>http://download.eclipse.org/modeling/mdt/papyrus/components/moka/</component.apibaseline.url>
- <eclipse.targetrelease>oxygen</eclipse.targetrelease>
+ <eclipse.targetrelease>photon</eclipse.targetrelease>
<target.version>3.1.0-SNAPSHOT</target.version>
</properties>
@@ -41,7 +43,6 @@
<!-- Moka Bugzilla -->
<issueManagement>
<url>https://bugs.eclipse.org/bugs/buglist.cgi?product=Papyrus&component=${component.bugzilla.name}</url>
- <system>Bugzilla</system>
</issueManagement>
<!-- Moka Developpers -->
diff --git a/releng/org.eclipse.papyrus.moka.standalone.rcp/META-INF/MANIFEST.MF b/releng/org.eclipse.papyrus.moka.standalone.rcp/META-INF/MANIFEST.MF
index 5c727a7..9253192 100644
--- a/releng/org.eclipse.papyrus.moka.standalone.rcp/META-INF/MANIFEST.MF
+++ b/releng/org.eclipse.papyrus.moka.standalone.rcp/META-INF/MANIFEST.MF
@@ -16,3 +16,4 @@
org.eclipse.debug.core;bundle-version="3.10.100"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.papyrus.moka.standalone.rcp
diff --git a/releng/org.eclipse.papyrus.moka.standalone.rcp/build.properties b/releng/org.eclipse.papyrus.moka.standalone.rcp/build.properties
index d87c40f..fe59bcc 100644
--- a/releng/org.eclipse.papyrus.moka.standalone.rcp/build.properties
+++ b/releng/org.eclipse.papyrus.moka.standalone.rcp/build.properties
@@ -1,4 +1,6 @@
source.. = src/
+output.. = target/classes/
bin.includes = plugin.xml,\
META-INF/,\
- .
+ .,\
+ pom.xml
diff --git a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.neon-papyrusnightly/org.eclipse.papyrus.moka.targetplatform.neon-papyrusnightly.target b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.neon-papyrusnightly/org.eclipse.papyrus.moka.targetplatform.neon-papyrusnightly.target
deleted file mode 100644
index b3d00ab..0000000
--- a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.neon-papyrusnightly/org.eclipse.papyrus.moka.targetplatform.neon-papyrusnightly.target
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde?>
-<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Moka Neon Papyrus Nightly Target Platform" sequenceNumber="1480419201">
- <locations>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
- <repository id="eclipse-neon" location="http://download.eclipse.org/releases/neon/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
- <repository id="eclipse-papyrus-nighlty-neon" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/neon/main/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.papyrus.dev.feature.feature.group" version="0.0.0"/>
- <repository id="papyrus-neon-developper-nightly" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Neon-Developer/lastSuccessfulBuild/artifact/repository/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.aspectj.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.ajdt.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.equinox.weaving.sdk.feature.group" version="0.0.0"/>
- <repository id="aspectj-neon" location="http://download.eclipse.org/tools/ajdt/46/dev/update/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.orbit.category.json" version="1.0.0.7f_e7McLz57EEXeLAn2b0b7y_z-IG"/>
- <unit id="jnr.ffi" version="2.0.1.v201505052040"/>
- <unit id="com.kenai.jffi" version="1.2.7.v201505052040"/>
- <unit id="jnr.constants" version="0.8.6.v201505052040"/>
- <unit id="jnr.enxio" version="0.6.0.v201505052040"/>
- <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.nebula.widgets.xviewer.feature.feature.group" version="1.0.0.201605312033"/>
- <unit id="org.eclipse.nebula.visualization.feature.feature.group" version="1.0.0.201605312033"/>
- <repository id="nebula" location="http://download.eclipse.org/nebula/releases/1.0.0"/>
- </location>
- </locations>
-</target>
diff --git a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.neon-papyrusnightly/org.eclipse.papyrus.moka.targetplatform.neon-papyrusnightly.tpd b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.neon-papyrusnightly/org.eclipse.papyrus.moka.targetplatform.neon-papyrusnightly.tpd
deleted file mode 100644
index 18f6630..0000000
--- a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.neon-papyrusnightly/org.eclipse.papyrus.moka.targetplatform.neon-papyrusnightly.tpd
+++ /dev/null
@@ -1,36 +0,0 @@
-target "Moka Neon Papyrus Nightly Target Platform" with source requirements
-
-location "http://download.eclipse.org/releases/neon/" eclipse-neon {
- org.eclipse.platform.feature.group
- org.eclipse.rcp.feature.group
- org.eclipse.jdt.feature.group
- org.eclipse.equinox.p2.discovery.feature.feature.group
- org.eclipse.equinox.executable.feature.group
-}
-
-location "https://hudson.eclipse.org/papyrus/job/Papyrus-Neon/lastSuccessfulBuild/artifact/repository/" papyrus-neon-lastest {
- org.eclipse.papyrus.sdk.feature.feature.group lazy
-}
-
-location "https://hudson.eclipse.org/papyrus/job/Papyrus-Neon-Developer/lastSuccessfulBuild/artifact/repository/" papyrus-neon-developper-latest {
- org.eclipse.papyrus.dev.feature.feature.group lazy
-}
-
-location "http://download.eclipse.org/tools/ajdt/46/dev/update/" aspectj-neon{
- org.aspectj.feature.group lazy
- org.eclipse.ajdt.feature.group lazy
- org.eclipse.equinox.weaving.sdk.feature.group lazy
-}
-
-location "http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/" orbit{
- org.eclipse.orbit.category.json
- jnr.ffi
- com.kenai.jffi
- jnr.constants
- jnr.enxio
-}
-
-location "http://download.eclipse.org/nebula/releases/1.0.0" nebula{
- org.eclipse.nebula.widgets.xviewer.feature.feature.group
- org.eclipse.nebula.visualization.feature.feature.group
-}
\ No newline at end of file
diff --git a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.neon-papyrusnightly/pom.xml b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.neon-papyrusnightly/pom.xml
deleted file mode 100644
index 315411b..0000000
--- a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.neon-papyrusnightly/pom.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <!-- Parent POM (i.e., the one owned by the releng folder) -->
- <parent>
- <groupId>org.eclipse.papyrus.moka</groupId>
- <artifactId>org.eclipse.papyrus.moka.releng.platforms</artifactId>
- <version>3.1.0-SNAPSHOT</version>
- </parent>
-
- <!-- POM Description -->
- <artifactId>org.eclipse.papyrus.moka.targetplatform.neon-papyrusnightly</artifactId>
- <packaging>pom</packaging>
- <version>2.0.100-SNAPSHOT</version>
- <name>Moka Papyrus Nightly Target Platform (Platforms folder)</name>
-
-</project>
\ No newline at end of file
diff --git a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.neon/org.eclipse.papyrus.moka.targetplatform.neon.target b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.neon/org.eclipse.papyrus.moka.targetplatform.neon.target
deleted file mode 100644
index 50076f1..0000000
--- a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.neon/org.eclipse.papyrus.moka.targetplatform.neon.target
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde?>
-<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Moka Neon Target Platform" sequenceNumber="1480426882">
- <locations>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.platform.feature.group" version="4.6.1.v20160907-1200"/>
- <unit id="org.eclipse.rcp.feature.group" version="4.6.1.v20160907-1200"/>
- <unit id="org.eclipse.jdt.feature.group" version="3.12.1.v20160907-1200"/>
- <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.0.401.v20160901-1335"/>
- <unit id="org.eclipse.equinox.executable.feature.group" version="3.6.300.v20160525-1303"/>
- <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="2.0.1.201609141603"/>
- <repository id="eclipse-neon" location="http://download.eclipse.org/releases/neon/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.aspectj.feature.group" version="1.8.9.201603152119"/>
- <unit id="org.eclipse.ajdt.feature.group" version="2.2.4.201603152119"/>
- <unit id="org.eclipse.equinox.weaving.sdk.feature.group" version="1.2.0.201603152119"/>
- <repository id="aspectj-neon" location="http://download.eclipse.org/tools/ajdt/46/dev/update/ajdt-e46-2.2.4.201603152119/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.orbit.category.json" version="1.0.0.7f_e7McLz57EEXeLAn2b0b7y_z-IG"/>
- <unit id="jnr.ffi" version="2.0.1.v201505052040"/>
- <unit id="com.kenai.jffi" version="1.2.7.v201505052040"/>
- <unit id="jnr.constants" version="0.8.6.v201505052040"/>
- <unit id="jnr.enxio" version="0.6.0.v201505052040"/>
- <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.nebula.widgets.xviewer.feature.feature.group" version="1.0.0.201605312033"/>
- <unit id="org.eclipse.nebula.visualization.feature.feature.group" version="1.0.0.201605312033"/>
- <repository id="nebula" location="http://download.eclipse.org/nebula/releases/1.0.0"/>
- </location>
- </locations>
-</target>
diff --git a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.neon/org.eclipse.papyrus.moka.targetplatform.neon.tpd b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.neon/org.eclipse.papyrus.moka.targetplatform.neon.tpd
deleted file mode 100644
index 736e7f2..0000000
--- a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.neon/org.eclipse.papyrus.moka.targetplatform.neon.tpd
+++ /dev/null
@@ -1,37 +0,0 @@
-target "Moka Neon Target Platform" with source requirements
-
-location "http://download.eclipse.org/releases/neon/" eclipse-neon {
- org.eclipse.platform.feature.group
- org.eclipse.rcp.feature.group
- org.eclipse.jdt.feature.group
- org.eclipse.equinox.p2.discovery.feature.feature.group
- org.eclipse.equinox.executable.feature.group
- org.eclipse.papyrus.sdk.feature.feature.group
-}
-
-/*
- * Not used -- Requires Papyrus test framework to be published.
- *
- * location "https://hudson.eclipse.org/papyrus/job/Papyrus-Neon-Developer/lastSuccessfulBuild/artifact/repository/" papyrus-neon-developper-nightly {
- org.eclipse.papyrus.dev.feature.feature.group lazy
-}
-* */
-
-location "http://download.eclipse.org/tools/ajdt/46/dev/update/ajdt-e46-2.2.4.201603152119/" aspectj-neon{
- org.aspectj.feature.group
- org.eclipse.ajdt.feature.group
- org.eclipse.equinox.weaving.sdk.feature.group
-}
-
-location "http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/" orbit{
- org.eclipse.orbit.category.json
- jnr.ffi
- com.kenai.jffi
- jnr.constants
- jnr.enxio
-}
-
-location "http://download.eclipse.org/nebula/releases/1.0.0" nebula{
- org.eclipse.nebula.widgets.xviewer.feature.feature.group
- org.eclipse.nebula.visualization.feature.feature.group
-}
\ No newline at end of file
diff --git a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.neon/pom.xml b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.neon/pom.xml
deleted file mode 100644
index 1f94c0e..0000000
--- a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.neon/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <!-- Parent POM (i.e., the one owned by the releng folder) -->
- <parent>
- <groupId>org.eclipse.papyrus.moka</groupId>
- <artifactId>org.eclipse.papyrus.moka.releng.platforms</artifactId>
- <version>3.1.0-SNAPSHOT</version>
- </parent>
-
- <!-- POM description -->
- <artifactId>org.eclipse.papyrus.moka.targetplatform.neon</artifactId>
- <packaging>eclipse-target-definition</packaging>
- <version>2.0.100-SNAPSHOT</version>
- <name>Moka Neon Target Platform</name>
-
-</project>
\ No newline at end of file
diff --git a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.oxygen-papyrusnightly/org.eclipse.papyrus.moka.targetplatform.oxygen-papyrusnightly.target b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.oxygen-papyrusnightly/org.eclipse.papyrus.moka.targetplatform.oxygen-papyrusnightly.target
deleted file mode 100644
index dd20ee2..0000000
--- a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.oxygen-papyrusnightly/org.eclipse.papyrus.moka.targetplatform.oxygen-papyrusnightly.target
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde?>
-<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Moka Oxygen Papyrus Nightly Target Platform" sequenceNumber="1519118521">
- <locations>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
- <repository id="eclipse" location="http://download.eclipse.org/releases/oxygen"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
- <repository id="papyrus-nightly" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Master/lastSuccessfulBuild/artifact/repository/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.aspectj.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.ajdt.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.equinox.weaving.sdk.feature.group" version="0.0.0"/>
- <repository id="aspectj" location="http://download.eclipse.org/tools/ajdt/47/dev/update/ajdt-e47-2.2.4.201704242114/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.orbit.category.json" version="1.0.0.7f_e7McLz57EEXeLAn2b0b7y_z-IG"/>
- <unit id="javax.xml" version="1.3.4.v201005080400"/>
- <unit id="com.github.jnr.constants" version="0.9.1.v20161107-2054"/>
- <unit id="com.github.jnr.enxio" version="0.12.0.v20161107-2054"/>
- <unit id="com.github.jnr.ffi" version="2.0.9.v20161107-2054"/>
- <unit id="com.github.jnr.jffi" version="1.2.11.v20170113-1843"/>
- <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.nebula.widgets.xviewer.feature.feature.group" version="1.0.0.201703081533"/>
- <unit id="org.eclipse.nebula.visualization.feature.feature.group" version="1.0.0.201703081533"/>
- <repository id="nebula" location="http://download.eclipse.org/nebula/releases/1.2.0"/>
- </location>
- </locations>
-</target>
diff --git a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.oxygen-papyrusnightly/org.eclipse.papyrus.moka.targetplatform.oxygen-papyrusnightly.tpd b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.oxygen-papyrusnightly/org.eclipse.papyrus.moka.targetplatform.oxygen-papyrusnightly.tpd
deleted file mode 100644
index 356d6dd..0000000
--- a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.oxygen-papyrusnightly/org.eclipse.papyrus.moka.targetplatform.oxygen-papyrusnightly.tpd
+++ /dev/null
@@ -1,33 +0,0 @@
-target "Moka Oxygen Papyrus Nightly Target Platform" with source requirements
-
-location "http://download.eclipse.org/releases/oxygen" eclipse {
- org.eclipse.platform.feature.group lazy
- org.eclipse.rcp.feature.group lazy
- org.eclipse.jdt.feature.group lazy
- org.eclipse.equinox.p2.discovery.feature.feature.group lazy
- org.eclipse.equinox.executable.feature.group lazy
-}
-
-location "https://hudson.eclipse.org/papyrus/job/Papyrus-Master/lastSuccessfulBuild/artifact/repository/" papyrus-nightly {
- org.eclipse.papyrus.sdk.feature.feature.group lazy
-}
-
-location "http://download.eclipse.org/tools/ajdt/47/dev/update/ajdt-e47-2.2.4.201704242114/" aspectj{
- org.aspectj.feature.group lazy
- org.eclipse.ajdt.feature.group lazy
- org.eclipse.equinox.weaving.sdk.feature.group lazy
-}
-
-location "http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository/" orbit{
- org.eclipse.orbit.category.json
- javax.xml
- com.github.jnr.constants
- com.github.jnr.enxio
- com.github.jnr.ffi
- com.github.jnr.jffi
-}
-
-location "http://download.eclipse.org/nebula/releases/1.2.0" nebula{
- org.eclipse.nebula.widgets.xviewer.feature.feature.group
- org.eclipse.nebula.visualization.feature.feature.group
-}
\ No newline at end of file
diff --git a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.oxygen-papyrusnightly/pom.xml b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.oxygen-papyrusnightly/pom.xml
deleted file mode 100644
index da62ac4..0000000
--- a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.oxygen-papyrusnightly/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <!-- Parent POM (i.e., the one owned by the releng folder) -->
- <parent>
- <groupId>org.eclipse.papyrus.moka</groupId>
- <artifactId>org.eclipse.papyrus.moka.releng.platforms</artifactId>
- <version>3.1.0-SNAPSHOT</version>
- </parent>
-
- <!-- POM description -->
- <artifactId>org.eclipse.papyrus.moka.targetplatform.oxygen-papyrusnightly</artifactId>
- <packaging>eclipse-target-definition</packaging>
- <name>Moka Oxygen Target Platform</name>
-
-</project>
\ No newline at end of file
diff --git a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.oxygen/org.eclipse.papyrus.moka.targetplatform.oxygen.target b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/org.eclipse.papyrus.moka.targetplatform.photon.target
similarity index 66%
rename from releng/platforms/org.eclipse.papyrus.moka.targetplatform.oxygen/org.eclipse.papyrus.moka.targetplatform.oxygen.target
rename to releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/org.eclipse.papyrus.moka.targetplatform.photon.target
index 67d470e..1bc75fa 100644
--- a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.oxygen/org.eclipse.papyrus.moka.targetplatform.oxygen.target
+++ b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/org.eclipse.papyrus.moka.targetplatform.photon.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Moka Oxygen Target Platform" sequenceNumber="1519118481">
+<target name="Moka Photon Target Platform" sequenceNumber="1534867261">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
@@ -10,27 +10,27 @@
<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
<unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
- <repository id="eclipse" location="http://download.eclipse.org/releases/oxygen"/>
+ <repository id="eclipse" location="http://download.eclipse.org/releases/photon"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.aspectj.feature.group" version="1.8.10.201704242114"/>
- <unit id="org.eclipse.ajdt.feature.group" version="2.2.4.201704242114"/>
- <unit id="org.eclipse.equinox.weaving.sdk.feature.group" version="1.2.0.201704242114"/>
- <repository id="aspectj" location="http://download.eclipse.org/tools/ajdt/47/dev/update/ajdt-e47-2.2.4.201704242114/"/>
+ <unit id="org.aspectj.feature.group" version="1.9.0.201805281636"/>
+ <unit id="org.eclipse.ajdt.feature.group" version="2.2.4.201805281636"/>
+ <unit id="org.eclipse.equinox.weaving.sdk.feature.group" version="1.2.0.201805281636"/>
+ <repository id="aspectj" location="http://download.eclipse.org/tools/ajdt/48/dev/update/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.orbit.category.json" version="1.0.0.7f_e7McLz57EEXeLAn2b0b7y_z-IG"/>
- <unit id="javax.xml" version="1.3.4.v201005080400"/>
- <unit id="com.github.jnr.constants" version="0.9.1.v20161107-2054"/>
- <unit id="com.github.jnr.enxio" version="0.12.0.v20161107-2054"/>
- <unit id="com.github.jnr.ffi" version="2.0.9.v20161107-2054"/>
- <unit id="com.github.jnr.jffi" version="1.2.11.v20170113-1843"/>
- <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository/"/>
+ <unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.9.2.v20180207-1730"/>
+ <unit id="com.fasterxml.jackson.core.jackson-core" version="2.9.2.v20180207-1730"/>
+ <unit id="com.github.jnr.constants" version="0.9.8.v20180207-1730"/>
+ <unit id="com.github.jnr.enxio" version="0.16.0.v20180207-1730"/>
+ <unit id="com.github.jnr.ffi" version="2.1.4.v20180207-1730"/>
+ <unit id="com.github.jnr.jffi" version="1.2.15.v20180207-1730"/>
+ <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/S20180820175350/repository"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.nebula.widgets.xviewer.feature.feature.group" version="1.0.0.201703081533"/>
- <unit id="org.eclipse.nebula.visualization.feature.feature.group" version="1.0.0.201703081533"/>
- <repository id="nebula" location="http://download.eclipse.org/nebula/releases/1.2.0"/>
+ <unit id="org.eclipse.nebula.widgets.xviewer.feature.feature.group" version="1.1.0.201804281520"/>
+ <unit id="org.eclipse.nebula.visualization.feature.feature.group" version="2.1.0.201804281520"/>
+ <repository id="nebula" location="http://download.eclipse.org/nebula/releases/2.0.1"/>
</location>
</locations>
</target>
diff --git a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.oxygen/org.eclipse.papyrus.moka.targetplatform.oxygen.tpd b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/org.eclipse.papyrus.moka.targetplatform.photon.tpd
similarity index 62%
rename from releng/platforms/org.eclipse.papyrus.moka.targetplatform.oxygen/org.eclipse.papyrus.moka.targetplatform.oxygen.tpd
rename to releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/org.eclipse.papyrus.moka.targetplatform.photon.tpd
index 30ccb5c..7d12ebe 100644
--- a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.oxygen/org.eclipse.papyrus.moka.targetplatform.oxygen.tpd
+++ b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/org.eclipse.papyrus.moka.targetplatform.photon.tpd
@@ -1,6 +1,6 @@
-target "Moka Oxygen Target Platform" with source requirements
+target "Moka Photon Target Platform" with source requirements
-location "http://download.eclipse.org/releases/oxygen" eclipse {
+location "http://download.eclipse.org/releases/photon" eclipse {
org.eclipse.platform.feature.group lazy
org.eclipse.rcp.feature.group lazy
org.eclipse.jdt.feature.group lazy
@@ -9,22 +9,22 @@
org.eclipse.papyrus.sdk.feature.feature.group lazy
}
-location "http://download.eclipse.org/tools/ajdt/47/dev/update/ajdt-e47-2.2.4.201704242114/" aspectj{
+location "http://download.eclipse.org/tools/ajdt/48/dev/update/" aspectj{
org.aspectj.feature.group
org.eclipse.ajdt.feature.group
org.eclipse.equinox.weaving.sdk.feature.group
}
-location "http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository/" orbit{
- org.eclipse.orbit.category.json
- javax.xml
+location "http://download.eclipse.org/tools/orbit/downloads/drops/S20180820175350/repository" orbit{
+ com.fasterxml.jackson.core.jackson-annotations
+ com.fasterxml.jackson.core.jackson-core
com.github.jnr.constants
com.github.jnr.enxio
com.github.jnr.ffi
com.github.jnr.jffi
}
-location "http://download.eclipse.org/nebula/releases/1.2.0" nebula{
+location "http://download.eclipse.org/nebula/releases/2.0.1" nebula{
org.eclipse.nebula.widgets.xviewer.feature.feature.group
org.eclipse.nebula.visualization.feature.feature.group
}
\ No newline at end of file
diff --git a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.oxygen/pom.xml b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/pom.xml
similarity index 85%
rename from releng/platforms/org.eclipse.papyrus.moka.targetplatform.oxygen/pom.xml
rename to releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/pom.xml
index 36785eb..58dadfd 100644
--- a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.oxygen/pom.xml
+++ b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/pom.xml
@@ -10,8 +10,8 @@
</parent>
<!-- POM description -->
- <artifactId>org.eclipse.papyrus.moka.targetplatform.oxygen</artifactId>
+ <artifactId>org.eclipse.papyrus.moka.targetplatform.photon</artifactId>
<packaging>eclipse-target-definition</packaging>
- <name>Moka Oxygen Target Platform</name>
+ <name>Moka Photon Target Platform</name>
</project>
\ No newline at end of file
diff --git a/releng/platforms/pom.xml b/releng/platforms/pom.xml
index c3cd4e9..293275f 100644
--- a/releng/platforms/pom.xml
+++ b/releng/platforms/pom.xml
@@ -17,10 +17,7 @@
<!-- Modules to build -->
<modules>
- <module>org.eclipse.papyrus.moka.targetplatform.neon</module>
- <module>org.eclipse.papyrus.moka.targetplatform.neon-papyrusnightly</module>
- <module>org.eclipse.papyrus.moka.targetplatform.oxygen</module>
- <module>org.eclipse.papyrus.moka.targetplatform.oxygen-papyrusnightly</module>
+ <module>org.eclipse.papyrus.moka.targetplatform.photon</module>
</modules>
</project>
\ No newline at end of file
diff --git a/tests/fmi/org.eclipse.papyrus.moka.fmi.test/.classpath b/tests/fmi/org.eclipse.papyrus.moka.fmi.test/.classpath
index 43b9862..cc5ee2d 100644
--- a/tests/fmi/org.eclipse.papyrus.moka.fmi.test/.classpath
+++ b/tests/fmi/org.eclipse.papyrus.moka.fmi.test/.classpath
@@ -2,6 +2,10 @@
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src/">
+ <attributes>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/tests/fmi/org.eclipse.papyrus.moka.fmi.test/META-INF/MANIFEST.MF b/tests/fmi/org.eclipse.papyrus.moka.fmi.test/META-INF/MANIFEST.MF
index 17f2d78..6b73be3 100644
--- a/tests/fmi/org.eclipse.papyrus.moka.fmi.test/META-INF/MANIFEST.MF
+++ b/tests/fmi/org.eclipse.papyrus.moka.fmi.test/META-INF/MANIFEST.MF
@@ -5,7 +5,11 @@
Bundle-Version: 2.0.100.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.4.0,6.0.0)",
+ org.eclipse.papyrus.moka.fmi;bundle-version="2.0.100",
+ org.eclipse.papyrus.moka.fmi.profile;bundle-version="2.0.100",
org.eclipse.papyrus.moka.fmi.fmi2uml;bundle-version="2.0.100"
Bundle-Activator: org.eclipse.papyrus.moka.fmi.test.Activator
Export-Package: org.eclipse.papyrus.moka.fmi.test
+Automatic-Module-Name: org.eclipse.papyrus.moka.fmi.test
diff --git a/tests/fmi/org.eclipse.papyrus.moka.fmi.test/build.properties b/tests/fmi/org.eclipse.papyrus.moka.fmi.test/build.properties
index 19f676e..820f673 100644
--- a/tests/fmi/org.eclipse.papyrus.moka.fmi.test/build.properties
+++ b/tests/fmi/org.eclipse.papyrus.moka.fmi.test/build.properties
@@ -1,4 +1,6 @@
source.. = src/
+output.. = target/classes/
bin.includes = META-INF/,\
.,\
- resources/
+ resources/,\
+ pom.xml
