Merge pull request #173 from Open-MBEE/release/4.2.0

Release/4.2.0
Open-MBEE · Jan 28, 2020 · f77cda5 · f77cda5
2 parents 6d4df0b + 027ac76
commit f77cda5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 41 deletions.
diff --git a/build.gradle b/build.gradle
@@ -142,12 +142,12 @@ 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.3', classifier: 'linux', ext: 'zip'
+        preCompile group: 'gov.nasa.jpl.cae.nomagic', name: 'cae-cameo-systems-modeler-core', version: '4.2.0', classifier: 'linux', ext: 'zip'
     }
     else {
-        preCompile group: 'com.nomagic', name: 'demomagicdraw', version: '190sp2', classifier: 'MagicDraw_Demo_190_sp2_no_install', ext: 'zip'
-        preCompile group: 'com.nomagic', name: 'sysml', version: '190sp2', classifier: 'SysML_Plugin_190_sp2_bundle', ext: 'zip'
-        preCompile group: 'com.nomagic', name: 'cst', version: '190sp2', classifier: 'Cameo_Simulation_Toolkit_Plugin_190_sp2', ext: 'zip'
+        preCompile group: 'com.nomagic', name: 'demomagicdraw', version: '190sp3', classifier: 'MagicDraw_Demo_190_sp3_no_install', ext: 'zip'
+        preCompile group: 'com.nomagic', name: 'sysml', version: '190sp3', classifier: 'SysML_Plugin_190_sp3_bundle', ext: 'zip'
+        preCompile group: 'com.nomagic', name: 'cst', version: '190sp3', classifier: 'Cameo_Simulation_Toolkit_Plugin_190_sp3', ext: 'zip'
     }
 
     // This ensures classpath load order to match the MagicDraw provided order and then includes extras needed for non-OpenAPI stuff.

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-version=4.1.3
+version=4.2.0
 group=org.openmbee.magicdraw.mdk
 descriptorFile=MDR_Plugin_Model_Development_Kit_91110_descriptor.xml
 magicdDrawGroupName=gov.nasa.jpl.cae.magicdraw.mdk

diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/manual/ManualSyncRunner.java b/src/main/java/gov/nasa/jpl/mbee/mdk/mms/sync/manual/ManualSyncRunner.java
@@ -80,7 +80,7 @@ public void run(ProgressStatus progressStatus) {
         Collection<File> responseFiles = new ArrayList<>(3);
         for (Element element : rootElements) {
             collectClientElementsRecursively(project, element, depth, clientElements);
-            Set<String> clientElementIds = clientElements.stream().map(pair -> pair.getKey().getLocalID()).collect(Collectors.toCollection(LinkedHashSet::new));
+            Set<String> clientElementIds = clientElements.stream().map(pair -> Converters.getElementToIdConverter().apply(pair.getKey())).collect(Collectors.toCollection(LinkedHashSet::new));
             try {
                 File recursiveResponseFile, traversedResponseFile, responseFile;
 

diff --git a/src/test/resources/runtest.sh b/src/test/resources/runtest.sh