From a73c8c0faed8af1bec2891503e19be7efcbac18a Mon Sep 17 00:00:00 2001 From: Ivan Gomes Date: Wed, 19 Feb 2020 12:11:52 -0800 Subject: [PATCH 1/4] NOMAGIC-1172 Fix Mount#mountedRefId value to be branch id instead of name #resolve --- .../java/gov/nasa/jpl/mbee/mdk/emf/EMFExporter.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/emf/EMFExporter.java b/src/main/java/gov/nasa/jpl/mbee/mdk/emf/EMFExporter.java index 573ae3a13..17ab179af 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/emf/EMFExporter.java +++ b/src/main/java/gov/nasa/jpl/mbee/mdk/emf/EMFExporter.java @@ -209,15 +209,16 @@ private enum Processor { objectNode.put(MDKConstants.TYPE_KEY, "Mount"); objectNode.put(MDKConstants.MOUNTED_ELEMENT_ID_KEY, Converters.getIProjectToIdConverter().apply(attachedProject) + MDKConstants.PRIMARY_MODEL_ID_SUFFIX); objectNode.put(MDKConstants.MOUNTED_ELEMENT_PROJECT_ID_KEY, Converters.getIProjectToIdConverter().apply(attachedProject)); - String branchName; - EsiUtils.EsiBranchInfo esiBranchInfo = null; - if (isRemote && (esiBranchInfo = EsiUtils.getCurrentBranch(attachedProject)) == null) { + EsiUtils.EsiBranchInfo branchInfo = EsiUtils.getCurrentBranch(attachedProject); + if (isRemote && branchInfo == null) { return null; } - if (!isRemote || (branchName = esiBranchInfo.getName()) == null || branchName.equals("trunk")) { + String branchName; + if (!isRemote || (branchName = branchInfo.getName()) == null || "trunk".equals(branchName)) { branchName = "master"; } - objectNode.put(MDKConstants.MOUNTED_REF_ID_KEY, branchName); + String branchId = "master".equals(branchName) ? "master" : branchInfo.getID().toString(); + objectNode.put(MDKConstants.MOUNTED_REF_ID_KEY, branchId); objectNode.put(MDKConstants.TWC_VERSION_KEY, isRemote ? ProjectUtilities.versionToInt(ProjectUtilities.getVersion(attachedProject).getName()) : -1); return objectNode; }, From 1a75fb9ad99478f3ae6c155de8e7b1fe4f688645 Mon Sep 17 00:00:00 2001 From: willard Date: Wed, 11 Mar 2020 10:50:07 -0700 Subject: [PATCH 2/4] NOMAGIC-1176 - Snapshotting for 4.1.5 release --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 295cd9adc..74e0bdcd6 100644 --- a/build.gradle +++ b/build.gradle @@ -142,7 +142,7 @@ dependencies { // Other dependencies we're unable to resolve via standard repositories if (buildAccess == 'internal') { - preCompile group: 'gov.nasa.jpl.cae.nomagic', name: 'cae-cameo-systems-modeler-core', version: '4.1.4', classifier: 'linux', ext: 'zip' + preCompile group: 'gov.nasa.jpl.cae.nomagic', name: 'cae-cameo-systems-modeler-core', version: '4.1.5-SNAPSHOT', classifier: 'linux', ext: 'zip' } else { preCompile group: 'com.nomagic', name: 'demomagicdraw', version: '190sp2', classifier: 'MagicDraw_Demo_190_sp2_no_install', ext: 'zip' From d1ffbe049cb3ba68bfc05bc82ccfcdc3e8665892 Mon Sep 17 00:00:00 2001 From: willard Date: Wed, 11 Mar 2020 10:57:04 -0700 Subject: [PATCH 3/4] NOMAGIC-1176 - Snapshotting for 4.1.5 release --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 24dce54ac..a374d6f4d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=4.1.4 +version=4.1.5 group=org.openmbee.magicdraw.mdk descriptorFile=MDR_Plugin_Model_Development_Kit_91110_descriptor.xml magicdDrawGroupName=gov.nasa.jpl.cae.magicdraw.mdk From ed8b0ff4592b2c09098ebdb29b7b5f8e5ff4d372 Mon Sep 17 00:00:00 2001 From: willard Date: Wed, 11 Mar 2020 14:10:30 -0700 Subject: [PATCH 4/4] NOMAGIC-1176 - 4.1.5 release --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 74e0bdcd6..f4ccda973 100644 --- a/build.gradle +++ b/build.gradle @@ -142,7 +142,7 @@ dependencies { // Other dependencies we're unable to resolve via standard repositories if (buildAccess == 'internal') { - preCompile group: 'gov.nasa.jpl.cae.nomagic', name: 'cae-cameo-systems-modeler-core', version: '4.1.5-SNAPSHOT', classifier: 'linux', ext: 'zip' + preCompile group: 'gov.nasa.jpl.cae.nomagic', name: 'cae-cameo-systems-modeler-core', version: '4.1.5', classifier: 'linux', ext: 'zip' } else { preCompile group: 'com.nomagic', name: 'demomagicdraw', version: '190sp2', classifier: 'MagicDraw_Demo_190_sp2_no_install', ext: 'zip'