Skip to content

Commit

Permalink
Issue #76 - Updated Moka dependencies so "fuml" execution worked.
Browse files Browse the repository at this point in the history
  • Loading branch information
seidewitz committed Oct 23, 2020
1 parent 8d76ecb commit 6b4e08c
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 21 deletions.
6 changes: 3 additions & 3 deletions org.modeldriven.alf.bundle/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
Manifest-Version: 1.0
Automatic-Module-Name: org.modeldriven.alf.bundle
Bnd-LastModified: 1603287345714
Build-Jdk: 1.8.0_171
Bnd-LastModified: 1603405265284
Build-Jdk: 1.8.0_31
Built-By: seidewitz
Bundle-ClassPath: .,jars/org.modeldriven.alf-1.0.0-SNAPSHOT.jar
Bundle-ManifestVersion: 2
Bundle-Name: org.modeldriven.alf.bundle
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-SymbolicName: org.modeldriven.alf.bundle
Bundle-Version: 1.0.0.20201021133513
Bundle-Version: 1.0.0.20201022222050
Created-By: Apache Maven Bundle Plugin
Embed-Dependency: *;scope=compile;groupId=!org.modeldriven
Embed-Directory: jars
Expand Down
8 changes: 6 additions & 2 deletions org.modeldriven.alf.eclipse.moka/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,12 @@ Require-Bundle: org.eclipse.uml2,
org.eclipse.uml2.uml,
org.eclipse.uml2.uml.resources,
org.apache.log4j;bundle-version="1.2.15",
org.modeldriven.alf.eclipse;bundle-version="0.6.0"
org.modeldriven.alf.eclipse;bundle-version="0.6.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.uml.tools.utils;bundle-version="3.1.0",
org.aspectj.runtime;bundle-version="1.8.10"
Import-Package: org.eclipse.papyrus.moka.fuml,
org.eclipse.papyrus.moka.fuml.Semantics.Classes.Kernel,
org.eclipse.papyrus.moka.fuml.Semantics.CommonBehaviors.BasicBehaviors,
Expand All @@ -29,7 +34,6 @@ Import-Package: org.eclipse.papyrus.moka.fuml,
org.eclipse.papyrus.moka.fuml.standardlibrary.library.real,
org.eclipse.papyrus.moka.fuml.standardlibrary.library.string,
org.eclipse.papyrus.moka.fuml.standardlibrary.library.unlimitednatural,
org.eclipse.papyrus.uml.tools.utils,
org.modeldriven.alf.eclipse.uml,
org.modeldriven.alf.eclipse.units,
org.modeldriven.alf.execution,
Expand Down
Binary file modified org.modeldriven.alf.eclipse.moka/dist/fuml-eclipse.jar
Binary file not shown.
4 changes: 4 additions & 0 deletions org.modeldriven.alf.eclipse.moka/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<eclipse.uberJar.dependencies>
${eclipse.uberJar.default.dependencies},
org.eclipse.equinox.common,
org.eclipse.core.runtime,
org.eclipse.core.jobs,
org.eclipse.osgi,
org.modeldriven.alf.eclipse,
Expand All @@ -31,6 +32,9 @@
org.eclipse.papyrus.moka.fuml.standardlibrary,
org.eclipse.papyrus.moka.service,
org.eclipse.papyrus.moka.utils,
org.eclipse.papyrus.infra.core,
org.eclipse.papyrus.infra.core.log,
org.eclipse.papyrus.uml.tools.utils,
org.aspectj.runtime,
</eclipse.uberJar.dependencies>
</properties>
Expand Down
Binary file modified org.modeldriven.alf.eclipse/dist/alf-eclipse.jar
Binary file not shown.
Binary file modified org.modeldriven.alf.eclipse/dist/fuml-eclipse.jar
Binary file not shown.
6 changes: 3 additions & 3 deletions org.modeldriven.alf.fuml.impl.bundle/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
Manifest-Version: 1.0
Automatic-Module-Name: org.modeldriven.alf.fuml.impl.bundle
Bnd-LastModified: 1603287347083
Build-Jdk: 1.8.0_171
Bnd-LastModified: 1603405266256
Build-Jdk: 1.8.0_31
Built-By: seidewitz
Bundle-ClassPath: .,jars/org.modeldriven.alf-1.0.0-SNAPSHOT.jar,jars/org
.modeldriven.alf.fuml.impl-1.0.0-SNAPSHOT.jar
Bundle-ManifestVersion: 2
Bundle-Name: org.modeldriven.alf.fuml.impl.bundle
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-SymbolicName: org.modeldriven.alf.fuml.impl.bundle
Bundle-Version: 1.0.0.20201021133513
Bundle-Version: 1.0.0.20201022222050
Created-By: Apache Maven Bundle Plugin
Embed-Dependency: *;scope=compile;groupId=!org.modeldriven
Embed-Directory: jars
Expand Down
Binary file modified org.modeldriven.alf.fuml.impl/dist/alf.jar
Binary file not shown.
Binary file modified org.modeldriven.alf/dist/alf-base.jar
Binary file not shown.
20 changes: 7 additions & 13 deletions tycho-parent/alf-ri.target
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?>
<?pde version="3.6"?>
<target includeMode="feature" name="alf-ri">
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<?pde version="3.6"?><target includeMode="feature" name="alf-ri">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
Expand All @@ -24,15 +24,9 @@
<unit id="org.eclipse.papyrus.infra.widgets" version="0.0.0"/>
<unit id="org.eclipse.papyrus.infra.ui" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/mdt/papyrus/components/moka/oxygen/3.0.0_papyrus-moka-master_583"/>
<unit id="org.eclipse.papyrus.moka" version="0.0.0"/>
<unit id="org.eclipse.papyrus.moka.fuml" version="0.0.0"/>
<unit id="org.eclipse.papyrus.moka.fuml.interfaces" version="0.0.0"/>
<unit id="org.eclipse.papyrus.moka.fuml.standardlibrary" version="0.0.0"/>
<unit id="org.eclipse.papyrus.moka.service" version="0.0.0"/>
<unit id="org.eclipse.papyrus.moka.utils" version="0.0.0"/>
<unit id="org.aspectj.runtime" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/mdt/papyrus/components/moka/oxygen"/>
<unit id="org.eclipse.papyrus.moka.feature.feature.group" version="3.1.0.201710171318"/>
</location>
</locations>
</target>

0 comments on commit 6b4e08c

Please sign in to comment.