From 96f2352f2d089bbf546da8e0b12b0050e993b5a8 Mon Sep 17 00:00:00 2001 From: Enquier Date: Thu, 9 Sep 2021 20:58:03 -0600 Subject: [PATCH 01/28] add dependency fixes --- build.gradle | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 0f91a4d12..a4517765a 100644 --- a/build.gradle +++ b/build.gradle @@ -79,7 +79,7 @@ String[] classpathLibraries = [ 'lib/bundles/io.netty.handler_4.1.21.Final.jar', 'lib/bundles/io.netty.resolver_4.1.21.Final.jar', 'lib/bundles/io.netty.transport_4.1.21.Final.jar', - 'lib/bundles/javax.jmi_1.0.0.201912191136/javax_jmi-1_0-fr.jar', + 'lib/bundles/javax.jmi_1.0.0.202006020804/javax_jmi-1_0-fr.jar', 'lib/bundles/joda-time_2.9.1.jar', 'lib/bundles/lz4-java_1.3.0.jar', 'lib/bundles/org.agrona_0.9.12.jar', @@ -314,13 +314,13 @@ 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.4.3', classifier: 'linux', ext: 'zip' + preCompile group: 'gov.nasa.jpl.cae.nomagic', name: 'cae-cameo-systems-modeler-core', version: '4.4.4', classifier: 'linux', ext: 'zip' } else { 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' - preCompile group: 'org.apache.fop',name: 'fop', version: '1.1', classifier: fopNameVersion + '-bin', ext: 'zip' + preCompile group: 'org.apache.fop', name: 'fop', version: '1.1', classifier: fopNameVersion + '-bin', ext: 'zip' preCompile group: 'net.sourceforge.docbook', name: 'docbook-xsl', version: '1.79.1', classifier: docbookNameVersion, ext:'zip' } @@ -329,7 +329,8 @@ dependencies { compile files(classpathLibraries.collect { 'build/dependency-cache/extracted/magicdraw/' + it }) compile fileTree(dir: 'build/dependency-cache/extracted/magicdraw', include: ['lib/**/*.jar', 'plugins/**/*.jar'], exclude: ([ classpathLibraries, ['plugins/com.nomagic.collaborator.publisher/**/*.jar', 'plugins/com.nomagic.magicdraw.emfuml2xmi*/**/*.jar', 'plugins/com.nomagic.magicdraw.automaton/lib/engines/**/*.jar', 'plugins/tomsawyer/**/*.jar', 'plugins/com.intercax.syndeia.md/**/*.jar'] ]).flatten()) compile fileTree(dir: 'lib', include: ['**/*.jar']) - compile files('build/dependency-cache/extracted/fop/jars/fop-1.1.jar', 'build/dependency-cache/extracted/fop/jars/xmlgraphics-commons-1.5.jar') + compile files('build/dependency-cache/extracted/fop/jars/fop-1.1.jar', 'build/dependency-cache/extracted/fop/jars/xmlgraphics-commons-1.5.jar', 'build/dependency-cache/extracted/magicdraw/jre/lib/ext/jfxrt.jar') + } task extractDependencies { From e49f7a120032b5d048574e922953b2d123489121 Mon Sep 17 00:00:00 2001 From: Enquier Date: Thu, 9 Sep 2021 21:14:47 -0600 Subject: [PATCH 02/28] minor logic tweaks to build.gradle --- build.gradle | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index a4517765a..38e76a825 100644 --- a/build.gradle +++ b/build.gradle @@ -223,18 +223,18 @@ repositories { artifact '/[module][revision]/[classifier].[ext]' } } - ivy { - url 'https://sourceforge.net/projects/docbook/files/docbook-xsl/' - layout 'pattern', { - artifact '[revision]/[classifier].[ext]' - } + } + ivy { + url 'https://sourceforge.net/projects/docbook/files/docbook-xsl/' + layout 'pattern', { + artifact '[revision]/[classifier].[ext]' } - ivy { //downloading apache fop (version is defined in precompile) - url 'https://archive.apache.org/dist/xmlgraphics/fop/binaries/' - //url 'https://mirror.nodesdirect.com/apache/xmlgraphics/fop/binaries/' for newer version - layout 'pattern', { - artifact '[classifier].[ext]' - } + } + ivy { //downloading apache fop (version is defined in precompile) + url 'https://archive.apache.org/dist/xmlgraphics/fop/binaries/' + //url 'https://mirror.nodesdirect.com/apache/xmlgraphics/fop/binaries/' for newer version + layout 'pattern', { + artifact '[classifier].[ext]' } } } @@ -315,15 +315,17 @@ dependencies { if (buildAccess == 'internal') { preCompile group: 'gov.nasa.jpl.cae.nomagic', name: 'cae-cameo-systems-modeler-core', version: '4.4.4', classifier: 'linux', ext: 'zip' + } else { 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' - preCompile group: 'org.apache.fop', name: 'fop', version: '1.1', classifier: fopNameVersion + '-bin', ext: 'zip' - preCompile group: 'net.sourceforge.docbook', name: 'docbook-xsl', version: '1.79.1', classifier: docbookNameVersion, ext:'zip' } + preCompile group: 'org.apache.fop', name: 'fop', version: '1.1', classifier: fopNameVersion + '-bin', ext: 'zip' + preCompile group: 'net.sourceforge.docbook', name: 'docbook-xsl', version: '1.79.1', classifier: docbookNameVersion, ext:'zip' + // This ensures classpath load order to match the MagicDraw provided order and then includes extras needed for non-OpenAPI stuff. // This was necessary because of the Application class stubbing that was done in the chromium libraries. compile files(classpathLibraries.collect { 'build/dependency-cache/extracted/magicdraw/' + it }) From b04f629f525b797b437a72f2e7d8da986112ad2a Mon Sep 17 00:00:00 2001 From: Enquier Date: Thu, 9 Sep 2021 21:21:29 -0600 Subject: [PATCH 03/28] updating outdated classpath entries --- build.gradle | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/build.gradle b/build.gradle index 38e76a825..567d22f02 100644 --- a/build.gradle +++ b/build.gradle @@ -36,29 +36,29 @@ String[] classpathLibraries = [ 'lib/bridj-0.7.0.jar', 'lib/bundles/ch.qos.logback.classic_1.2.3.jar', 'lib/bundles/ch.qos.logback.core_1.2.3.jar', - 'lib/bundles/cmof_1.4.0.201912191136/cmof14.jar', - 'lib/bundles/cmof_1.4.0.201912191136/tas.jar', + 'lib/bundles/cmof_1.4.0.202006020804/cmof14.jar', + 'lib/bundles/cmof_1.4.0.202006020804/tas.jar', 'lib/bundles/com.esotericsoftware.kryo_2.22.0.201401231130.jar', 'lib/bundles/com.google.guava_18.0.0.jar', 'lib/bundles/com.nomagic.annotations_1.0.0/com.nomagic.annotation-1.0.jar', - 'lib/bundles/com.nomagic.ci.binary_17.0.5.v20191219-1130.jar', - 'lib/bundles/com.nomagic.ci.metamodel.project_17.0.5.v20191219-1130.jar', - 'lib/bundles/com.nomagic.ci.persistence.local_17.0.5.v20191219-1130.jar', - 'lib/bundles/com.nomagic.ci.persistence_17.0.5.v20191219-1130.jar', - 'lib/bundles/com.nomagic.ci.services_17.0.5.v20191219-1130.jar', - 'lib/bundles/com.nomagic.ci_17.0.5.v20191219-1130.jar', - 'lib/bundles/com.nomagic.magicdraw.ce_18.1.0.201912191136.jar', - 'lib/bundles/com.nomagic.magicdraw.core.diagram_18.1.0.201912191136.jar', - 'lib/bundles/com.nomagic.magicdraw.core.project.options_18.1.0.201912191136.jar', - 'lib/bundles/com.nomagic.magicdraw.core_1.0.0.201912191136.jar', - 'lib/bundles/com.nomagic.magicdraw.esi.binary.metamodel_18.1.0.201912191136.jar', - 'lib/bundles/com.nomagic.magicdraw.esi.esiproject_18.1.0.201912191136.jar', - 'lib/bundles/com.nomagic.magicdraw.esi.uuidmap_18.1.0.201912191136.jar', - 'lib/bundles/com.nomagic.magicdraw.foundation_2.0.0.201912191136.jar', - 'lib/bundles/com.nomagic.magicdraw.osgi.fragment_1.0.0.201912191136.jar', - 'lib/bundles/com.nomagic.magicdraw.security_18.3.0.201912191136.jar', - 'lib/bundles/com.nomagic.magicdraw.uml2_2.5.1.201912191136.jar', - 'lib/bundles/com.nomagic.magicdraw_17.0.5.201912191136.jar', + 'lib/bundles/com.nomagic.ci.binary_17.0.5.v20200602-0758.jar', + 'lib/bundles/com.nomagic.ci.metamodel.project_17.0.5.v20200602-0758.jar', + 'lib/bundles/com.nomagic.ci.persistence.local_17.0.5.v20200602-0758.jar', + 'lib/bundles/com.nomagic.ci.persistence_17.0.5.v20200602-0758.jar', + 'lib/bundles/com.nomagic.ci.services_17.0.5.v20200602-0758.jar', + 'lib/bundles/com.nomagic.ci_17.0.5.v20200602-0758.jar', + 'lib/bundles/com.nomagic.magicdraw.ce_18.1.0.202006020804.jar', + 'lib/bundles/com.nomagic.magicdraw.core.diagram_18.1.0.202006020804.jar', + 'lib/bundles/com.nomagic.magicdraw.core.project.options_18.1.0.202006020804.jar', + 'lib/bundles/com.nomagic.magicdraw.core_1.0.0.202006020804.jar', + 'lib/bundles/com.nomagic.magicdraw.esi.binary.metamodel_18.1.0.202006020804.jar', + 'lib/bundles/com.nomagic.magicdraw.esi.esiproject_18.1.0.202006020804.jar', + 'lib/bundles/com.nomagic.magicdraw.esi.uuidmap_18.1.0.202006020804.jar', + 'lib/bundles/com.nomagic.magicdraw.foundation_2.0.0.202006020804.jar', + 'lib/bundles/com.nomagic.magicdraw.osgi.fragment_1.0.0.202006020804.jar', + 'lib/bundles/com.nomagic.magicdraw.security_18.3.0.202006020804.jar', + 'lib/bundles/com.nomagic.magicdraw.uml2_2.5.1.202006020804.jar', + 'lib/bundles/com.nomagic.magicdraw_17.0.5.202006020804.jar', 'lib/bundles/com.teamdev.jxbrowser.chromium.internal.linux64_6.24.1.jar', 'lib/bundles/com.teamdev.jxbrowser.chromium.internal.mac_6.24.1.jar', 'lib/bundles/com.teamdev.jxbrowser.chromium.internal.win32_6.24.1.jar', @@ -66,8 +66,8 @@ String[] classpathLibraries = [ 'lib/bundles/com.teamdev.jxbrowser.chromium_6.24.1.jar', 'lib/bundles/com.typesafe.config_1.3.0.jar', 'lib/bundles/com.typesafe.sslconfig_0.2.2.jar', - 'lib/bundles/de.schlichtherle.truezip_7.4.3.v20191219-1130/lib/truezip-driver-zip-7.4.3.jar', - 'lib/bundles/de.schlichtherle.truezip_7.4.3.v20191219-1130/lib/truezip-kernel-7.4.3.jar', + 'lib/bundles/de.schlichtherle.truezip_7.4.3.v20200602-0758/lib/truezip-driver-zip-7.4.3.jar', + 'lib/bundles/de.schlichtherle.truezip_7.4.3.v20200602-0758/lib/truezip-kernel-7.4.3.jar', 'lib/bundles/gnu.trove_3.0.3/lib/trove-3.0.3.jar', 'lib/bundles/io.aeron.client_1.7.0.jar', 'lib/bundles/io.aeron.driver_1.7.0.jar', @@ -172,7 +172,7 @@ String[] classpathLibraries = [ 'lib/webservice/wsdl4j-1.5.1.jar', 'lib/xalan.jar', 'lib/xmlbeans-2.6.0.jar', - 'lib/y.jar', + 'lib/y.jar' ] String docbookNameVersion = 'docbook-xsl-1.79.1' String fopNameVersion = 'fop-1.1' From 50ece0f3797b936115581723f2b3906ddeb814c4 Mon Sep 17 00:00:00 2001 From: Enquier Date: Tue, 14 Sep 2021 14:51:40 -0600 Subject: [PATCH 04/28] Add runJava and JVM compatibility statements --- build.gradle | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 567d22f02..e765ad999 100644 --- a/build.gradle +++ b/build.gradle @@ -194,6 +194,12 @@ apply plugin: 'eclipse' apply plugin: 'java' apply plugin: 'distribution' +java { + sourceCompatibility = 'VERSION_1_8' + targetCompatibility = 'VERSION_1_8' +} + + // In this section you declare where to find the dependencies of your project repositories { mavenCentral() @@ -665,11 +671,11 @@ task runJava(type: JavaExec) { standardOutput = System.out errorOutput = System.err - + executable = buildDir.toString() + '/dependency-cache/extracted/magicdraw/jre/bin/java' main = 'com.nomagic.osgi.launcher.ProductionFrameworkLauncher' jvmArgs = ['-Xmx8192M', '-Xss512M', '-DLOCALCONFIG=true', '-DWINCONFIG=true', '-Djsse.enableSNIExtension=false', '-Djava.net.preferIPv4Stack=true', '-Dcom.sun.media.imageio.disableCodecLib=true', '-noverify', '-Dlocal.config.dir.ext=-dev', '-splash:data/splash.png', '-Dmd.class.path=$java.class.path', '-Dcom.nomagic.osgi.config.dir=configuration', '-Desi.system.config=data/application.conf', '-Dlogback.configurationFile=data/logback.xml', '-Dsun.locale.formatasdefault=true', '-Dorg.osgi.framework.bundle.parent=ext'] // arguments to pass to the application - args 'DEVELOPER' + args 'DEVELOPER DIEVAS' } runJava.dependsOn installDist From a9003c1f3f1baf0abf6e23870c5170ab35cf5d23 Mon Sep 17 00:00:00 2001 From: Enquier Date: Wed, 15 Sep 2021 08:35:54 -0600 Subject: [PATCH 05/28] Fix SNI issue for container installations; Fix Artifact export --- build.gradle | 10 +++++----- src/main/java/gov/nasa/jpl/mbee/mdk/MDKPlugin.java | 1 - .../mdk/mms/actions/CommitDiagramArtifactsAction.java | 4 +++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index e765ad999..6cdc17a9e 100644 --- a/build.gradle +++ b/build.gradle @@ -671,11 +671,11 @@ task runJava(type: JavaExec) { standardOutput = System.out errorOutput = System.err - executable = buildDir.toString() + '/dependency-cache/extracted/magicdraw/jre/bin/java' + executable = '/Applications/MagicDraw/cae-cameo-systems-modeler-5.0.0-SNAPSHOT-macos/jre/Contents/Home/bin/java' main = 'com.nomagic.osgi.launcher.ProductionFrameworkLauncher' - jvmArgs = ['-Xmx8192M', '-Xss512M', '-DLOCALCONFIG=true', '-DWINCONFIG=true', '-Djsse.enableSNIExtension=false', '-Djava.net.preferIPv4Stack=true', '-Dcom.sun.media.imageio.disableCodecLib=true', '-noverify', '-Dlocal.config.dir.ext=-dev', '-splash:data/splash.png', '-Dmd.class.path=$java.class.path', '-Dcom.nomagic.osgi.config.dir=configuration', '-Desi.system.config=data/application.conf', '-Dlogback.configurationFile=data/logback.xml', '-Dsun.locale.formatasdefault=true', '-Dorg.osgi.framework.bundle.parent=ext'] + jvmArgs = ['-Xmx8192M', '-Xss512M', '-DLOCALCONFIG=true', '-DWINCONFIG=true', '-Djsse.enableSNIExtension=true', '-Djava.net.preferIPv4Stack=true', '-Dcom.sun.media.imageio.disableCodecLib=true', '-noverify', '-Dlocal.config.dir.ext=-dev', '-splash:data/splash.png', '-Dmd.class.path=$java.class.path', '-Dcom.nomagic.osgi.config.dir=configuration', '-Desi.system.config=data/application.conf', '-Dlogback.configurationFile=data/logback.xml', '-Dsun.locale.formatasdefault=true', '-Dorg.osgi.framework.bundle.parent=ext'] // arguments to pass to the application - args 'DEVELOPER DIEVAS' + args 'DEVELOPER' } runJava.dependsOn installDist @@ -691,7 +691,7 @@ task testAVG(type: JavaExec) { errorOutput = System.err main = 'com.nomagic.osgi.launcher.ProductionFrameworkLauncher' - jvmArgs = ['-Xmx8192M', '-Xss512M', '-DLOCALCONFIG=true', '-DWINCONFIG=true', '-Djsse.enableSNIExtension=false', '-Djava.net.preferIPv4Stack=true', '-Dcom.sun.media.imageio.disableCodecLib=true', '-noverify', '-Dlocal.config.dir.ext=-dev', '-splash:data/splash.png', '-Dmd.class.path=$java.class.path', '-Dcom.nomagic.osgi.config.dir=configuration', '-Desi.system.config=data/application.conf', '-Dlogback.configurationFile=data/logback.xml', '-Dsun.locale.formatasdefault=true', '-Dorg.osgi.framework.bundle.parent=ext', '-Dcom.nomagic.magicdraw.launcher=com.nomagic.magicdraw.commandline.CommandLineActionLauncher', '-Dcom.nomagic.magicdraw.commandline.action=gov.nasa.jpl.mbee.pma.cli.AutomatedViewGenerator'] + jvmArgs = ['-Xmx8192M', '-Xss512M', '-DLOCALCONFIG=true', '-DWINCONFIG=true', '-Djsse.enableSNIExtension=true', '-Djava.net.preferIPv4Stack=true', '-Dcom.sun.media.imageio.disableCodecLib=true', '-noverify', '-Dlocal.config.dir.ext=-dev', '-splash:data/splash.png', '-Dmd.class.path=$java.class.path', '-Dcom.nomagic.osgi.config.dir=configuration', '-Desi.system.config=data/application.conf', '-Dlogback.configurationFile=data/logback.xml', '-Dsun.locale.formatasdefault=true', '-Dorg.osgi.framework.bundle.parent=ext', '-Dcom.nomagic.magicdraw.launcher=com.nomagic.magicdraw.commandline.CommandLineActionLauncher', '-Dcom.nomagic.magicdraw.commandline.action=gov.nasa.jpl.mbee.pma.cli.AutomatedViewGenerator'] } testAVG.dependsOn installDist @@ -749,7 +749,7 @@ test { /*fileTree(dir: 'build/install', include: ['plugins/** /*.jar']).asPath + */ files(classpathLibraries.collect { 'build/install/' + it }).getFiles().stream().map { i -> i.getAbsolutePath() }.collect(Collectors.joining(File.pathSeparator)) + File.pathSeparator + configurations.testCompile.resolvedConfiguration.resolvedArtifacts.stream().map { i -> i.getFile().getAbsolutePath() }.collect(Collectors.joining(File.pathSeparator)) + File.pathSeparator + - testsJar.outputs.files.singleFile, '-DLOCALCONFIG=true', '-DWINCONFIG=true', '-Djsse.enableSNIExtension=false', '-Djava.net.preferIPv4Stack=true', '-Dcom.sun.media.imageio.disableCodecLib=true', '-noverify', '-Dlocal.config.dir.ext=-test', '-splash:data/splash.png', '-Dmd.class.path=$java.class.path', '-Dcom.nomagic.osgi.config.dir=configuration', '-Desi.system.config=data/application.conf', '-Dlogback.configurationFile=data/logback.xml', '-Dsun.locale.formatasdefault=true', '-Dorg.osgi.framework.bundle.parent=ext'] + testsJar.outputs.files.singleFile, '-DLOCALCONFIG=true', '-DWINCONFIG=true', '-Djsse.enableSNIExtension=true', '-Djava.net.preferIPv4Stack=true', '-Dcom.sun.media.imageio.disableCodecLib=true', '-noverify', '-Dlocal.config.dir.ext=-test', '-splash:data/splash.png', '-Dmd.class.path=$java.class.path', '-Dcom.nomagic.osgi.config.dir=configuration', '-Desi.system.config=data/application.conf', '-Dlogback.configurationFile=data/logback.xml', '-Dsun.locale.formatasdefault=true', '-Dorg.osgi.framework.bundle.parent=ext'] String magicDrawLicense = project.getProperties().get('magicDrawLicense') if (magicDrawLicense != null && !magicDrawLicense.isEmpty()) { new File('build/install/mdlicense.tmp').write(new String(magicDrawLicense.decodeBase64())) diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/MDKPlugin.java b/src/main/java/gov/nasa/jpl/mbee/mdk/MDKPlugin.java index 9aeebf655..49a6d3b20 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/MDKPlugin.java +++ b/src/main/java/gov/nasa/jpl/mbee/mdk/MDKPlugin.java @@ -83,7 +83,6 @@ public boolean close() { @Override public void init() { ActionsConfiguratorsManager acm = ActionsConfiguratorsManager.getInstance(); - System.setProperty("jsse.enableSNIExtension", "false"); if (MDUtils.isDeveloperMode()) { System.setProperty("org.apache.commons.logging.Log", "org.apache.commons.logging.impl.SimpleLog"); System.setProperty("org.apache.commons.logging.simplelog.showdatetime", "true"); diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/CommitDiagramArtifactsAction.java b/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/CommitDiagramArtifactsAction.java index e8ce9fc66..624b1a79f 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/CommitDiagramArtifactsAction.java +++ b/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/CommitDiagramArtifactsAction.java @@ -32,6 +32,7 @@ import javax.annotation.CheckForNull; import java.awt.event.ActionEvent; import java.io.File; +import java.io.FileOutputStream; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; @@ -68,7 +69,8 @@ public void actionPerformed(@CheckForNull ActionEvent actionEvent) { for (MMSArtifact artifact : artifacts) { HttpEntity entity = MultipartEntityBuilder.create().addTextBody(MDKConstants.ID_KEY, artifact.getId()).addTextBody(MDKConstants.CHECKSUM_KEY, artifact.getChecksum()).addTextBody("source", "magicdraw").addBinaryBody("file", artifact.getInputStream(), artifact.getContentType(), artifact.getId() + ".tmp").build(); File file = File.createTempFile(this.getClass().getSimpleName() + "-" + artifact.getContentType().getMimeType().replace('/', '-') + "-", null); - FileUtils.copyInputStreamToFile(entity.getContent(), file); // if we use the entity's content in the file do we need to pass the entity + FileOutputStream fileos = new FileOutputStream(file); + entity.writeTo(fileos); // if we use the entity's content in the file do we need to pass the entity HttpRequestBase artifactRequest = MMSUtils.prepareEndpointBuilderBasicJsonPostRequest(MMSElementEndpoint.builder(), project, file) .addParam(MMSEndpointBuilderConstants.URI_PROJECT_SUFFIX, projectId) .addParam(MMSEndpointBuilderConstants.URI_REF_SUFFIX, refId) From 46d16c0c05a90ac8e9ae36fdd47569bada1296d7 Mon Sep 17 00:00:00 2001 From: Enquier Date: Mon, 27 Sep 2021 11:13:17 -0600 Subject: [PATCH 06/28] Incremental work on Artifacts --- .../mbee/mdk/api/incubating/MDKConstants.java | 4 +- .../nasa/jpl/mbee/mdk/mms/MMSArtifact.java | 1 + .../gov/nasa/jpl/mbee/mdk/mms/MMSUtils.java | 29 +++++---- .../actions/CommitDiagramArtifactsAction.java | 28 +++++---- .../mdk/mms/endpoints/MMSElementEndpoint.java | 2 +- .../mdk/mms/validation/DiagramValidator.java | 63 +++++++------------ 6 files changed, 58 insertions(+), 69 deletions(-) diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/api/incubating/MDKConstants.java b/src/main/java/gov/nasa/jpl/mbee/mdk/api/incubating/MDKConstants.java index 9b6328eec..c698351fb 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/api/incubating/MDKConstants.java +++ b/src/main/java/gov/nasa/jpl/mbee/mdk/api/incubating/MDKConstants.java @@ -44,9 +44,9 @@ public class MDKConstants { ORG_ID_KEY = ORG_KEY + ID_KEY_SUFFIX, TWC_ID_KEY = "twc" + ID_KEY_SUFFIX, TWC_VERSION_KEY = "twcVersion", - ARTIFACT_IDS_KEY = "_artifactIds", + ARTIFACTS_KEY = "_artifacts", CHECKSUM_KEY = "checksum", - CONTENT_TYPE_KEY = "contentType", + CONTENT_TYPE_KEY = "mimetype", PROJECT_TYPE_KEY = "schema", PROJECT_TYPE_VALUE = "cameo", SYSML_PROFILE_ID = "_11_5EAPbeta_be00301_1147434586638_637562_1900", diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/MMSArtifact.java b/src/main/java/gov/nasa/jpl/mbee/mdk/mms/MMSArtifact.java index 3fb508d94..0d7477598 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/MMSArtifact.java +++ b/src/main/java/gov/nasa/jpl/mbee/mdk/mms/MMSArtifact.java @@ -9,4 +9,5 @@ public interface MMSArtifact { String getChecksum(); InputStream getInputStream(); ContentType getContentType(); + String getExtension(); } diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/MMSUtils.java b/src/main/java/gov/nasa/jpl/mbee/mdk/mms/MMSUtils.java index 11b0e13fe..db1aeda4d 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/MMSUtils.java +++ b/src/main/java/gov/nasa/jpl/mbee/mdk/mms/MMSUtils.java @@ -105,16 +105,17 @@ public static File getElementsRecursively(Project project, Collection el return sendMMSRequest(project, elementPutRequest, progressStatus); } - public static File getArtifacts(Project project, Collection artifactIds, ProgressStatus progressStatus) throws ServerException, IOException, URISyntaxException, GeneralSecurityException { - if (artifactIds == null || artifactIds.isEmpty()) { - return null; - } - File sendData = createEntityFile(MMSUtils.class, ContentType.APPLICATION_JSON, artifactIds, JsonBlobType.ARTIFACT_ID); - HttpRequestBase artifactGetRequest = prepareEndpointBuilderBasicJsonPutRequest(MMSElementsEndpoint.builder(), project, sendData) - .addParam(MMSEndpointBuilderConstants.URI_PROJECT_SUFFIX, Converters.getIProjectToIdConverter().apply(project.getPrimaryProject())) - .addParam(MMSEndpointBuilderConstants.URI_REF_SUFFIX, MDUtils.getBranchId(project)).build(); - return sendMMSRequest(project, artifactGetRequest, progressStatus); - } + // REPLACED IN MMS4 with ELEMENTS ENDPOINT +// public static File getArtifacts(Project project, Collection artifactIds, ProgressStatus progressStatus) throws ServerException, IOException, URISyntaxException, GeneralSecurityException { +// if (artifactIds == null || artifactIds.isEmpty()) { +// return null; +// } +// File sendData = createEntityFile(MMSUtils.class, ContentType.APPLICATION_JSON, artifactIds, JsonBlobType.ARTIFACT_ID); +// HttpRequestBase artifactGetRequest = prepareEndpointBuilderBasicJsonPutRequest(MMSElementsEndpoint.builder(), project, sendData) +// .addParam(MMSEndpointBuilderConstants.URI_PROJECT_SUFFIX, Converters.getIProjectToIdConverter().apply(project.getPrimaryProject())) +// .addParam(MMSEndpointBuilderConstants.URI_REF_SUFFIX, MDUtils.getBranchId(project)).build(); +// return sendMMSRequest(project, artifactGetRequest, progressStatus); +// } public static boolean validateJwtToken(Project project, ProgressStatus progressStatus) throws ServerException, IOException, URISyntaxException, GeneralSecurityException { @@ -163,11 +164,9 @@ public static File createEntityFile(Class clazz, ContentType contentType, Col switch (jsonBlobType) { case ELEMENT_ID: case ELEMENT_JSON: - arrayName = "elements"; - break; case ARTIFACT_ID: case ARTIFACT_JSON: - arrayName = "artifacts"; + arrayName = "elements"; break; case ORG: arrayName = "orgs"; @@ -494,6 +493,10 @@ public static MMSEndpoint.Builder prepareEndpointBuilderBasicJsonPostRequest(MMS return prepareEndpointBuilderBasicRequest(builder, project, HttpRequestType.POST, ContentType.APPLICATION_JSON, file); } + public static MMSEndpoint.Builder prepareEndpointBuilderBasicBinaryPostRequest(MMSEndpoint.Builder builder, Project project, File file) { + return prepareEndpointBuilderBasicRequest(builder, project, HttpRequestType.POST, ContentType.MULTIPART_FORM_DATA, file); + } + public static MMSEndpoint.Builder prepareEndpointBuilderBasicJsonPutRequest(MMSEndpoint.Builder builder, Project project, File file) { return prepareEndpointBuilderBasicRequest(builder, project, HttpRequestType.PUT, ContentType.APPLICATION_JSON, file); } diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/CommitDiagramArtifactsAction.java b/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/CommitDiagramArtifactsAction.java index 624b1a79f..63f771f94 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/CommitDiagramArtifactsAction.java +++ b/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/CommitDiagramArtifactsAction.java @@ -67,11 +67,15 @@ public void actionPerformed(@CheckForNull ActionEvent actionEvent) { String projectId = Converters.getIProjectToIdConverter().apply(project.getPrimaryProject()); String refId = MDUtils.getBranchId(project); for (MMSArtifact artifact : artifacts) { - HttpEntity entity = MultipartEntityBuilder.create().addTextBody(MDKConstants.ID_KEY, artifact.getId()).addTextBody(MDKConstants.CHECKSUM_KEY, artifact.getChecksum()).addTextBody("source", "magicdraw").addBinaryBody("file", artifact.getInputStream(), artifact.getContentType(), artifact.getId() + ".tmp").build(); + HttpEntity entity = MultipartEntityBuilder.create() +// .addTextBody(MDKConstants.ID_KEY, artifact.getId()) +// .addTextBody(MDKConstants.CHECKSUM_KEY, artifact.getChecksum()) +// .addTextBody("source", "magicdraw") + .addBinaryBody("file", artifact.getInputStream(), artifact.getContentType(), artifact.getId() + "_" + artifact.getExtension() + ".tmp").build(); File file = File.createTempFile(this.getClass().getSimpleName() + "-" + artifact.getContentType().getMimeType().replace('/', '-') + "-", null); FileOutputStream fileos = new FileOutputStream(file); entity.writeTo(fileos); // if we use the entity's content in the file do we need to pass the entity - HttpRequestBase artifactRequest = MMSUtils.prepareEndpointBuilderBasicJsonPostRequest(MMSElementEndpoint.builder(), project, file) + HttpRequestBase artifactRequest = MMSUtils.prepareEndpointBuilderBasicBinaryPostRequest(MMSElementEndpoint.builder(), project, file) .addParam(MMSEndpointBuilderConstants.URI_PROJECT_SUFFIX, projectId) .addParam(MMSEndpointBuilderConstants.URI_REF_SUFFIX, refId) .addParam(MMSEndpointBuilderConstants.URI_ELEMENT_SUFFIX, artifact.getId()).build(); @@ -80,16 +84,16 @@ public void actionPerformed(@CheckForNull ActionEvent actionEvent) { file.deleteOnExit(); } } - ObjectNode objectNode = JacksonUtils.getObjectMapper().createObjectNode(); - objectNode.put(MDKConstants.ID_KEY, Converters.getElementToIdConverter().apply(diagram)); - ArrayNode updatedArtifactIdsNode = objectNode.putArray(MDKConstants.ARTIFACT_IDS_KEY); - initialArtifactIds.forEach(updatedArtifactIdsNode::add); - artifacts.stream().map(MMSArtifact::getId).forEachOrdered(updatedArtifactIdsNode::add); - File file = MMSUtils.createEntityFile(CommitClientElementAction.class, ContentType.APPLICATION_JSON, Collections.singleton(objectNode), MMSUtils.JsonBlobType.ELEMENT_JSON); - HttpRequestBase elementPostRequest = MMSUtils.prepareEndpointBuilderBasicJsonPostRequest(MMSElementsEndpoint.builder(), project, file) - .addParam(MMSEndpointBuilderConstants.URI_PROJECT_SUFFIX, projectId) - .addParam(MMSEndpointBuilderConstants.URI_REF_SUFFIX, refId).build(); - MMSUtils.sendMMSRequest(project, elementPostRequest, progressStatus); +// ObjectNode objectNode = JacksonUtils.getObjectMapper().createObjectNode(); +// objectNode.put(MDKConstants.ID_KEY, Converters.getElementToIdConverter().apply(diagram)); +// ArrayNode updatedArtifactIdsNode = objectNode.putArray(MDKConstants.ARTIFACT_IDS_KEY); +// initialArtifactIds.forEach(updatedArtifactIdsNode::add); +// artifacts.stream().map(MMSArtifact::getId).forEachOrdered(updatedArtifactIdsNode::add); +// File file = MMSUtils.createEntityFile(CommitClientElementAction.class, ContentType.APPLICATION_JSON, Collections.singleton(objectNode), MMSUtils.JsonBlobType.ELEMENT_JSON); +// HttpRequestBase elementPostRequest = MMSUtils.prepareEndpointBuilderBasicJsonPostRequest(MMSElementsEndpoint.builder(), project, file) +// .addParam(MMSEndpointBuilderConstants.URI_PROJECT_SUFFIX, projectId) +// .addParam(MMSEndpointBuilderConstants.URI_REF_SUFFIX, refId).build(); +// MMSUtils.sendMMSRequest(project, elementPostRequest, progressStatus); } catch (IOException | ServerException | URISyntaxException | GeneralSecurityException e) { e.printStackTrace(); Application.getInstance().getGUILog().log("[ERROR] Failed to commit diagram artifacts for " + Converters.getElementToHumanNameConverter().apply(diagram) + ". Reason: " + e.getMessage()); diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSElementEndpoint.java b/src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSElementEndpoint.java index cf1efb0d4..8d37e0656 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSElementEndpoint.java +++ b/src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSElementEndpoint.java @@ -11,7 +11,7 @@ public static Builder builder() { return new MMSElementEndpoint.ElementBuilder(); } - public static class ElementBuilder extends RefBuilder { + public static class ElementBuilder extends ElementsBuilder { @Override public void prepareUriPath() { String suffix = getStringParam(MMSEndpointBuilderConstants.URI_ELEMENT_SUFFIX); diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/validation/DiagramValidator.java b/src/main/java/gov/nasa/jpl/mbee/mdk/mms/validation/DiagramValidator.java index 031f9722e..9afc032f1 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/validation/DiagramValidator.java +++ b/src/main/java/gov/nasa/jpl/mbee/mdk/mms/validation/DiagramValidator.java @@ -2,6 +2,8 @@ import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.BaseJsonNode; +import com.fasterxml.jackson.databind.node.NullNode; import com.fasterxml.jackson.databind.node.ObjectNode; import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.core.Project; @@ -73,9 +75,11 @@ public void run(ProgressStatus progressStatus) { Application.getInstance().getEnvironmentOptions().getGeneralOptions().setUseSVGTextTag(true); try { Set diagramIds = diagrams.stream().map(Converters.getElementToIdConverter()).filter(Objects::nonNull).collect(Collectors.toSet()); - Map diagramElementsMap = new LinkedHashMap<>(); + //Map> diagramElementsMap = new LinkedHashMap<>(); + Map artifactsMap = new LinkedHashMap<>(); Map> elementArtifactMap = new LinkedHashMap<>(); + //Get and/or check for existing diagram objects, collect their associated artifactIDs if (!diagramIds.isEmpty()) { ObjectNode diagramElementsResponse; try { @@ -103,53 +107,26 @@ public void run(ProgressStatus progressStatus) { if ((idNode = jsonNode.get(MDKConstants.ID_KEY)) == null || !idNode.isTextual()) { continue; } - diagramElementsMap.put(idNode.asText(), (ObjectNode) jsonNode); - Set artifactIds = elementArtifactMap.computeIfAbsent(idNode.asText(), o -> new LinkedHashSet<>()); - JsonNode artifactsNode; - if ((artifactsNode = jsonNode.get(MDKConstants.ARTIFACT_IDS_KEY)) != null && artifactsNode.isArray()) { - artifactsNode.forEach(node -> artifactIds.add(node.asText())); + Set artifactExtensions = elementArtifactMap.computeIfAbsent(idNode.asText(), o -> new LinkedHashSet<>()); + JsonNode artifactsArray; + if ((artifactsArray = jsonNode.get(MDKConstants.ARTIFACTS_KEY)) != null && artifactsArray.isArray()) { + artifactsArray.forEach(node -> { + artifactExtensions.add(idNode.asText() + '_' + node.get("extension").asText()); + artifactsMap.put(idNode.asText() + '_' + node.get("extension").asText(), (ObjectNode) node); + }); } } - } - Set artifactIds = elementArtifactMap.values().stream().flatMap(Collection::stream).collect(Collectors.toSet()); - Map artifactsMap = new LinkedHashMap<>(); - - if (!artifactIds.isEmpty()) { - ObjectNode artifactsResponse; - try { - File responseFile = MMSUtils.getArtifacts(project, artifactIds, progressStatus); - try (JsonParser jsonParser = JacksonUtils.getJsonFactory().createParser(responseFile)) { - artifactsResponse = JacksonUtils.parseJsonObject(jsonParser); - } - } catch (IOException | ServerException | URISyntaxException | GeneralSecurityException e) { - e.printStackTrace(); - Application.getInstance().getGUILog().log("[ERROR] An unexpected error occurred while generating diagrams. Skipping image validation. Reason: " + e.getMessage()); - return; - } - JsonNode artifactsArray; - if (artifactsResponse == null || (artifactsArray = artifactsResponse.get("artifacts")) == null || !artifactsArray.isArray()) { - Application.getInstance().getGUILog().log("[ERROR] Response of request to get artifacts is malformed. Skipping image validation."); - return; - } - for (JsonNode jsonNode : artifactsArray) { - JsonNode idNode; - if (!jsonNode.isObject()) { - continue; - } - if ((idNode = jsonNode.get(MDKConstants.ID_KEY)) == null || !idNode.isTextual()) { - continue; - } - artifactsMap.put(idNode.asText(), (ObjectNode) jsonNode); - } } + //Set artifactExtensions = elementArtifactMap.values().stream().flatMap(Collection::stream).collect(Collectors.toSet()); + for (Diagram diagram : diagrams) { String diagramId = Converters.getElementToIdConverter().apply(diagram); if (diagramId == null) { continue; } - if (!diagramElementsMap.containsKey(diagramId)) { + if (!elementArtifactMap.containsKey(diagramId)) { ValidationRuleViolation vrv = new ValidationRuleViolation(diagram, diagramExistenceRule.getDescription()); vrv.addAction(new ValidateElementAction(Collections.singleton(diagram), "Validate")); diagramExistenceRule.addViolation(vrv); @@ -182,14 +159,15 @@ public void run(ProgressStatus progressStatus) { Application.getInstance().getGUILog().log("[ERROR] An unexpected error occurred while generating diagrams. Skipping image validation for " + Converters.getElementToHumanNameConverter().apply(diagram) + ". Reason: " + e.getMessage()); break; } - ObjectNode existingArtifact = elementArtifactMap.getOrDefault(diagramId, Collections.emptySet()).stream().map(artifactsMap::get).filter(Objects::nonNull).filter(node -> { + ObjectNode existingBinary = elementArtifactMap.getOrDefault(diagramId, Collections.emptySet()).stream().map(artifactsMap::get).filter(Objects::nonNull).filter(node -> { JsonNode contentTypeNode = node.get(MDKConstants.CONTENT_TYPE_KEY); return contentTypeNode != null && contentTypeNode.isTextual() && contentTypeNode.asText().equals(entry.getValue().getValue().getMimeType()); }).findFirst().orElse(null); + JsonNode checksumNode; - if (existingArtifact == null || (checksumNode = existingArtifact.get(MDKConstants.CHECKSUM_KEY)) == null || !checksumNode.isTextual() || !checksumNode.asText().equals(checksum)) { + if (existingBinary == null || (checksumNode = existingBinary.get(MDKConstants.CHECKSUM_KEY)) == null || !checksumNode.isTextual() || !checksumNode.asText().equals(checksum)) { disparateArtifacts.add(new MMSArtifact() { - private final String id = existingArtifact != null ? existingArtifact.get(MDKConstants.ID_KEY).asText() : UUID.randomUUID().toString(); + private final String id = diagramId; @Override public String getId() { @@ -214,6 +192,9 @@ public InputStream getInputStream() { public ContentType getContentType() { return entry.getValue().getValue(); } + + @Override + public String getExtension() { return entry.getKey(); } }); } } From b0d842e5d32d06f35b70e652f3ca3db734d03f9a Mon Sep 17 00:00:00 2001 From: Enquier Date: Tue, 28 Sep 2021 13:40:58 -0600 Subject: [PATCH 07/28] Continue to rework upload of MultiPartFormEntry for Artifacts --- .../nasa/jpl/mbee/mdk/mms/MMSArtifact.java | 12 ++++- .../gov/nasa/jpl/mbee/mdk/mms/MMSUtils.java | 12 ++++- .../actions/CommitDiagramArtifactsAction.java | 13 +++--- .../mbee/mdk/mms/endpoints/MMSEndpoint.java | 44 +++++++++++++++---- .../MMSEndpointBuilderConstants.java | 2 + .../mdk/mms/validation/DiagramValidator.java | 8 +--- 6 files changed, 65 insertions(+), 26 deletions(-) diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/MMSArtifact.java b/src/main/java/gov/nasa/jpl/mbee/mdk/mms/MMSArtifact.java index 0d7477598..4b9316097 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/MMSArtifact.java +++ b/src/main/java/gov/nasa/jpl/mbee/mdk/mms/MMSArtifact.java @@ -2,12 +2,22 @@ import org.apache.http.entity.ContentType; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; import java.io.InputStream; public interface MMSArtifact { String getId(); String getChecksum(); - InputStream getInputStream(); + default InputStream getInputStream() { + try { + return new FileInputStream(getFile()); + } catch (FileNotFoundException e) { + return null; + } + } + File getFile() throws FileNotFoundException; ContentType getContentType(); String getExtension(); } diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/MMSUtils.java b/src/main/java/gov/nasa/jpl/mbee/mdk/mms/MMSUtils.java index db1aeda4d..aa49e440e 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/MMSUtils.java +++ b/src/main/java/gov/nasa/jpl/mbee/mdk/mms/MMSUtils.java @@ -26,6 +26,7 @@ import gov.nasa.jpl.mbee.mdk.options.MDKOptionsGroup; import gov.nasa.jpl.mbee.mdk.util.*; import org.apache.commons.io.IOUtils; +import org.apache.http.HttpEntity; import org.apache.http.client.methods.*; import org.apache.http.client.utils.URIBuilder; import org.apache.http.entity.ContentType; @@ -493,8 +494,8 @@ public static MMSEndpoint.Builder prepareEndpointBuilderBasicJsonPostRequest(MMS return prepareEndpointBuilderBasicRequest(builder, project, HttpRequestType.POST, ContentType.APPLICATION_JSON, file); } - public static MMSEndpoint.Builder prepareEndpointBuilderBasicBinaryPostRequest(MMSEndpoint.Builder builder, Project project, File file) { - return prepareEndpointBuilderBasicRequest(builder, project, HttpRequestType.POST, ContentType.MULTIPART_FORM_DATA, file); + public static MMSEndpoint.Builder prepareEndpointBuilderMultipartPostRequest(MMSEndpoint.Builder builder, Project project, HttpEntity entity) { + return prepareEndpointBuilderEntityRequest(builder, project, HttpRequestType.POST, entity); } public static MMSEndpoint.Builder prepareEndpointBuilderBasicJsonPutRequest(MMSEndpoint.Builder builder, Project project, File file) { @@ -516,4 +517,11 @@ public static MMSEndpoint.Builder prepareEndpointBuilderGenericRequest(MMSEndpoi .addParam(MMSEndpointBuilderConstants.REST_CONTENT_TYPE, contentType) .addParam(MMSEndpointBuilderConstants.REST_DATA_FILE, file); } + + public static MMSEndpoint.Builder prepareEndpointBuilderEntityRequest(MMSEndpoint.Builder builder, Project project, HttpRequestType requestType, HttpEntity entity) { + return builder.addParam(MMSEndpointBuilderConstants.HTTP_ENTITY, entity) + .addParam(MMSEndpointBuilderConstants.URI_BASE_PATH, MMSUtils.getServerUrl(project)) + .addParam(MMSEndpointBuilderConstants.HTTP_REQUEST_TYPE, requestType) + .addParam(MMSEndpointBuilderConstants.MAGICDRAW_PROJECT, project); + } } diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/CommitDiagramArtifactsAction.java b/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/CommitDiagramArtifactsAction.java index 63f771f94..e3cd805f1 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/CommitDiagramArtifactsAction.java +++ b/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/CommitDiagramArtifactsAction.java @@ -71,18 +71,15 @@ public void actionPerformed(@CheckForNull ActionEvent actionEvent) { // .addTextBody(MDKConstants.ID_KEY, artifact.getId()) // .addTextBody(MDKConstants.CHECKSUM_KEY, artifact.getChecksum()) // .addTextBody("source", "magicdraw") - .addBinaryBody("file", artifact.getInputStream(), artifact.getContentType(), artifact.getId() + "_" + artifact.getExtension() + ".tmp").build(); - File file = File.createTempFile(this.getClass().getSimpleName() + "-" + artifact.getContentType().getMimeType().replace('/', '-') + "-", null); - FileOutputStream fileos = new FileOutputStream(file); - entity.writeTo(fileos); // if we use the entity's content in the file do we need to pass the entity - HttpRequestBase artifactRequest = MMSUtils.prepareEndpointBuilderBasicBinaryPostRequest(MMSElementEndpoint.builder(), project, file) + .addBinaryBody("file", artifact.getFile(), artifact.getContentType(), artifact.getId() + "_" + artifact.getExtension() + ".tmp").build(); + HttpRequestBase artifactRequest = MMSUtils.prepareEndpointBuilderMultipartPostRequest(MMSElementEndpoint.builder(), project, entity) .addParam(MMSEndpointBuilderConstants.URI_PROJECT_SUFFIX, projectId) .addParam(MMSEndpointBuilderConstants.URI_REF_SUFFIX, refId) .addParam(MMSEndpointBuilderConstants.URI_ELEMENT_SUFFIX, artifact.getId()).build(); MMSUtils.sendMMSRequest(project, artifactRequest, progressStatus); - if(!file.delete()) { // if we cannot immediately delete we'll get it later - file.deleteOnExit(); - } + //if(!file.delete()) { // if we cannot immediately delete we'll get it later + // file.deleteOnExit(); + //} } // ObjectNode objectNode = JacksonUtils.getObjectMapper().createObjectNode(); // objectNode.put(MDKConstants.ID_KEY, Converters.getElementToIdConverter().apply(diagram)); diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSEndpoint.java b/src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSEndpoint.java index 8036a5692..bdc1f8f55 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSEndpoint.java +++ b/src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSEndpoint.java @@ -5,6 +5,7 @@ import gov.nasa.jpl.mbee.mdk.mms.MMSUtils; import gov.nasa.jpl.mbee.mdk.util.TicketUtils; import org.apache.http.Consts; +import org.apache.http.HttpEntity; import org.apache.http.HttpEntityEnclosingRequest; import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpPost; @@ -61,6 +62,11 @@ protected String getStringParam(String key) { return value instanceof String ? (String) value : ""; } + protected Boolean getBooleanParam(String key) { + Object value = buildParams.get(key); + return value instanceof Boolean ? (Boolean) value : false; + } + protected MMSUtils.HttpRequestType getHttpTypeParam() { Object value = buildParams.get(MMSEndpointBuilderConstants.HTTP_REQUEST_TYPE); return value instanceof MMSUtils.HttpRequestType ? (MMSUtils.HttpRequestType) value : null; @@ -81,6 +87,11 @@ protected Project getProjectParam() { return value instanceof Project ? (Project) value : null; } + protected HttpEntity getEntity() { + Object value = buildParams.get(MMSEndpointBuilderConstants.HTTP_ENTITY); + return value instanceof HttpEntity ? (HttpEntity) value : null; + } + private Map getUriBuilderParams() { Object value = buildParams.get(MMSEndpointBuilderConstants.URI_BUILDER_PARAMETERS); return value instanceof Map ? (Map) value : null; @@ -109,6 +120,7 @@ public HttpRequestBase build() throws IOException, URISyntaxException { URI requestDest = uriBuilder.build(); final HttpRequestBase request; MMSUtils.HttpRequestType type = getHttpTypeParam(); + HttpEntity entity = getEntity(); File sendData = getFileParam(); ContentType contentType = getContentTypeParam(); Project project = getProjectParam(); @@ -131,16 +143,32 @@ public HttpRequestBase build() throws IOException, URISyntaxException { request = new HttpPut(requestDest); break; } - request.addHeader("Authorization", "Bearer " + TicketUtils.getTicket(project)); - request.addHeader("charset", (contentType != null ? contentType.getCharset() : Consts.UTF_8).displayName()); - if (sendData != null) { - if (contentType != null) { - request.addHeader(HTTP.CONTENT_TYPE, contentType.getMimeType()); + // Add body to request + if (sendData != null || entity != null) { + // Unless the body is a MultipartFormEntity, we will construct the put/post body from the sendData file + if (entity == null) { + FileEntity reqEntity = new FileEntity(sendData, contentType); + entity = reqEntity; } - FileEntity reqEntity = new FileEntity(sendData, contentType); - reqEntity.setChunked(true); - ((HttpEntityEnclosingRequest) request).setEntity(reqEntity); + //If using an Entity from the constructor, no headers should be set as they will be constructed + //automatically unless they were generated from a file + if (entity instanceof FileEntity) { + if (contentType != null) { + request.addHeader(HTTP.CONTENT_TYPE, contentType.getMimeType()); + } + request.addHeader("charset", (contentType != null ? contentType.getCharset() : Consts.UTF_8).displayName()); + ((FileEntity) entity).setChunked(true); + } + //Add the entity created from the file above or the one passed from the constructor + ((HttpEntityEnclosingRequest) request).setEntity(entity); + } + else { + request.addHeader("charset", (contentType != null ? contentType.getCharset() : Consts.UTF_8).displayName()); } + + request.addHeader("Authorization", "Bearer " + TicketUtils.getTicket(project)); + + uriBuilder = null; return request; } diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSEndpointBuilderConstants.java b/src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSEndpointBuilderConstants.java index 22c99f152..0a3169133 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSEndpointBuilderConstants.java +++ b/src/main/java/gov/nasa/jpl/mbee/mdk/mms/endpoints/MMSEndpointBuilderConstants.java @@ -4,6 +4,7 @@ public class MMSEndpointBuilderConstants { // core parameters public static final String URI_BASE_PATH = "uriBasePath"; public static final String HTTP_REQUEST_TYPE = "httpRequestType"; + public static final String HTTP_ENTITY = "httpEntity"; public static final String REST_DATA_FILE = "restDataFile"; public static final String REST_CONTENT_TYPE = "restContentType"; public static final String MAGICDRAW_PROJECT = "magicdrawProject"; @@ -14,4 +15,5 @@ public class MMSEndpointBuilderConstants { public static final String URI_ELEMENT_SUFFIX = "uriElementSuffix"; // extra parameter list public static final String URI_BUILDER_PARAMETERS = "uriBuilderParameters"; + } diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/validation/DiagramValidator.java b/src/main/java/gov/nasa/jpl/mbee/mdk/mms/validation/DiagramValidator.java index 9afc032f1..29e5d2a0e 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/validation/DiagramValidator.java +++ b/src/main/java/gov/nasa/jpl/mbee/mdk/mms/validation/DiagramValidator.java @@ -180,13 +180,7 @@ public String getChecksum() { } @Override - public InputStream getInputStream() { - try { - return new FileInputStream(path.toFile()); - } catch (FileNotFoundException e) { - return null; - } - } + public File getFile() throws FileNotFoundException { return path.toFile(); } @Override public ContentType getContentType() { From 9508e3793c46654e10ea1b8915d35ec1ee17d609 Mon Sep 17 00:00:00 2001 From: Enquier Date: Tue, 28 Sep 2021 16:31:52 -0600 Subject: [PATCH 08/28] Artifact deployment ready for merge --- .../actions/CommitDiagramArtifactsAction.java | 83 +------------------ 1 file changed, 2 insertions(+), 81 deletions(-) diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/CommitDiagramArtifactsAction.java b/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/CommitDiagramArtifactsAction.java index e3cd805f1..6d9c4f295 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/CommitDiagramArtifactsAction.java +++ b/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/CommitDiagramArtifactsAction.java @@ -68,29 +68,14 @@ public void actionPerformed(@CheckForNull ActionEvent actionEvent) { String refId = MDUtils.getBranchId(project); for (MMSArtifact artifact : artifacts) { HttpEntity entity = MultipartEntityBuilder.create() -// .addTextBody(MDKConstants.ID_KEY, artifact.getId()) -// .addTextBody(MDKConstants.CHECKSUM_KEY, artifact.getChecksum()) -// .addTextBody("source", "magicdraw") - .addBinaryBody("file", artifact.getFile(), artifact.getContentType(), artifact.getId() + "_" + artifact.getExtension() + ".tmp").build(); + .addTextBody("source", "magicdraw") + .addBinaryBody("file", artifact.getFile(), artifact.getContentType(), artifact.getId() + "." + artifact.getExtension()).build(); HttpRequestBase artifactRequest = MMSUtils.prepareEndpointBuilderMultipartPostRequest(MMSElementEndpoint.builder(), project, entity) .addParam(MMSEndpointBuilderConstants.URI_PROJECT_SUFFIX, projectId) .addParam(MMSEndpointBuilderConstants.URI_REF_SUFFIX, refId) .addParam(MMSEndpointBuilderConstants.URI_ELEMENT_SUFFIX, artifact.getId()).build(); MMSUtils.sendMMSRequest(project, artifactRequest, progressStatus); - //if(!file.delete()) { // if we cannot immediately delete we'll get it later - // file.deleteOnExit(); - //} } -// ObjectNode objectNode = JacksonUtils.getObjectMapper().createObjectNode(); -// objectNode.put(MDKConstants.ID_KEY, Converters.getElementToIdConverter().apply(diagram)); -// ArrayNode updatedArtifactIdsNode = objectNode.putArray(MDKConstants.ARTIFACT_IDS_KEY); -// initialArtifactIds.forEach(updatedArtifactIdsNode::add); -// artifacts.stream().map(MMSArtifact::getId).forEachOrdered(updatedArtifactIdsNode::add); -// File file = MMSUtils.createEntityFile(CommitClientElementAction.class, ContentType.APPLICATION_JSON, Collections.singleton(objectNode), MMSUtils.JsonBlobType.ELEMENT_JSON); -// HttpRequestBase elementPostRequest = MMSUtils.prepareEndpointBuilderBasicJsonPostRequest(MMSElementsEndpoint.builder(), project, file) -// .addParam(MMSEndpointBuilderConstants.URI_PROJECT_SUFFIX, projectId) -// .addParam(MMSEndpointBuilderConstants.URI_REF_SUFFIX, refId).build(); -// MMSUtils.sendMMSRequest(project, elementPostRequest, progressStatus); } catch (IOException | ServerException | URISyntaxException | GeneralSecurityException e) { e.printStackTrace(); Application.getInstance().getGUILog().log("[ERROR] Failed to commit diagram artifacts for " + Converters.getElementToHumanNameConverter().apply(diagram) + ". Reason: " + e.getMessage()); @@ -102,68 +87,4 @@ public void actionPerformed(@CheckForNull ActionEvent actionEvent) { public boolean canExecute(Collection collection) { return true; } - - /* - ObjectNode imageEntry = JacksonUtils.getObjectMapper().createObjectNode(); - //for (Element e: Project.getProject(image.getImage()).getDiagram(image.getImage()).getUsedModelElements(false)) { - // addToElements(e); - //} - // export image - also keep track of exported images - DiagramPresentationElement diagram = Application.getInstance().getProject().getDiagram(image.getImage()); - String svgFilename = Converters.getElementToIdConverter().apply(image.getImage()); - - // create image file - String userhome = System.getProperty("user.home"); - File directory; - if (userhome != null) { - directory = new File(userhome + File.separator + "mdkimages"); - } - else { - directory = new File("mdkimages"); - } - if (!directory.exists()) { - directory.mkdirs(); - } - - // export the image file - File svgDiagramFile = new File(directory, svgFilename); - boolean initialUseSVGTestTag = Application.getInstance().getEnvironmentOptions().getGeneralOptions().isUseSVGTextTag(); - Application.getInstance().getEnvironmentOptions().getGeneralOptions().setUseSVGTextTag(true); - try { - ImageExporter.export(diagram, ImageExporter.SVG, svgDiagramFile); - } catch (IOException e) { - e.printStackTrace(); - } finally { - Application.getInstance().getEnvironmentOptions().getGeneralOptions().setUseSVGTextTag(initialUseSVGTestTag); - } - - // calculate the checksum - long cs = 0; - try { - RandomAccessFile f = new RandomAccessFile(svgDiagramFile.getAbsolutePath(), "r"); - byte[] data = new byte[(int) f.length()]; - f.read(data); - f.close(); - Checksum checksum = new CRC32(); - checksum.update(data, 0, data.length); - cs = checksum.getValue(); - } catch (IOException e) { - gl.log("Could not calculate checksum: " + e.getMessage()); - e.printStackTrace(); - } - - // Lets rename the file to have the hash code - // make sure this matches what's in the View Editor ImageResource.java - String FILE_EXTENSION = "svg"; - //gl.log("Exporting diagram to: " + svgDiagramFile.getAbsolutePath()); - - // keep record of all images found - imageEntry.put("cs", String.valueOf(cs)); - imageEntry.put("abspath", svgDiagramFile.getAbsolutePath()); - imageEntry.put("extension", FILE_EXTENSION); - images.put(svgFilename, imageEntry); - - //MDEV #674 -- Update the type and id: was hard coded. - // - */ } From 44ba7f07b5bd3e28256ef09e90cc6085f98a9908 Mon Sep 17 00:00:00 2001 From: Enquier Date: Thu, 7 Oct 2021 14:43:32 -0600 Subject: [PATCH 09/28] Requested changes --- .../java/gov/nasa/jpl/mbee/mdk/mms/MMSUtils.java | 12 ------------ .../mbee/mdk/mms/validation/DiagramValidator.java | 2 -- 2 files changed, 14 deletions(-) diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/MMSUtils.java b/src/main/java/gov/nasa/jpl/mbee/mdk/mms/MMSUtils.java index aa49e440e..58f840c6b 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/MMSUtils.java +++ b/src/main/java/gov/nasa/jpl/mbee/mdk/mms/MMSUtils.java @@ -106,18 +106,6 @@ public static File getElementsRecursively(Project project, Collection el return sendMMSRequest(project, elementPutRequest, progressStatus); } - // REPLACED IN MMS4 with ELEMENTS ENDPOINT -// public static File getArtifacts(Project project, Collection artifactIds, ProgressStatus progressStatus) throws ServerException, IOException, URISyntaxException, GeneralSecurityException { -// if (artifactIds == null || artifactIds.isEmpty()) { -// return null; -// } -// File sendData = createEntityFile(MMSUtils.class, ContentType.APPLICATION_JSON, artifactIds, JsonBlobType.ARTIFACT_ID); -// HttpRequestBase artifactGetRequest = prepareEndpointBuilderBasicJsonPutRequest(MMSElementsEndpoint.builder(), project, sendData) -// .addParam(MMSEndpointBuilderConstants.URI_PROJECT_SUFFIX, Converters.getIProjectToIdConverter().apply(project.getPrimaryProject())) -// .addParam(MMSEndpointBuilderConstants.URI_REF_SUFFIX, MDUtils.getBranchId(project)).build(); -// return sendMMSRequest(project, artifactGetRequest, progressStatus); -// } - public static boolean validateJwtToken(Project project, ProgressStatus progressStatus) throws ServerException, IOException, URISyntaxException, GeneralSecurityException { // build request diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/validation/DiagramValidator.java b/src/main/java/gov/nasa/jpl/mbee/mdk/mms/validation/DiagramValidator.java index 29e5d2a0e..0b487c216 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/validation/DiagramValidator.java +++ b/src/main/java/gov/nasa/jpl/mbee/mdk/mms/validation/DiagramValidator.java @@ -119,8 +119,6 @@ public void run(ProgressStatus progressStatus) { } - //Set artifactExtensions = elementArtifactMap.values().stream().flatMap(Collection::stream).collect(Collectors.toSet()); - for (Diagram diagram : diagrams) { String diagramId = Converters.getElementToIdConverter().apply(diagram); if (diagramId == null) { From c39c442a9c6a6978053ba854b881aa0294d02b1e Mon Sep 17 00:00:00 2001 From: Ivan Date: Sat, 9 Oct 2021 13:17:34 -0500 Subject: [PATCH 10/28] Update quickstart download link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 942c0d960..0b939afcb 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Cameo MDK is a plugin for [Cameo Systems Modeler](https://www.nomagic.com/produc ## Installation -1. [Download](https://bintray.com/openmbee/maven/mdk/_latestVersion) the Cameo MDK plugin, e.g. `mdk-*-plugin.zip`. +1. [Download](https://github.com/Open-MBEE/mdk/releases/latest) the Cameo MDK plugin, e.g. `mdk-*-plugin.zip`. 2. Run CSM. From the main menu, select "Help" > "Resource/Plugin Manager". ![Resource/Plugin Manager](doc/images/resource-plugin-manager.png) From aa6ed22ca241234d12062e5d1e8fb79f928e1fdf Mon Sep 17 00:00:00 2001 From: Enquier Date: Tue, 19 Oct 2021 09:50:31 -0600 Subject: [PATCH 11/28] Adding fixes based on review --- .../gov/nasa/jpl/mbee/mdk/api/incubating/MDKConstants.java | 6 +++++- .../nasa/jpl/mbee/mdk/mms/validation/DiagramValidator.java | 7 ++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/api/incubating/MDKConstants.java b/src/main/java/gov/nasa/jpl/mbee/mdk/api/incubating/MDKConstants.java index c698351fb..9ec68452d 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/api/incubating/MDKConstants.java +++ b/src/main/java/gov/nasa/jpl/mbee/mdk/api/incubating/MDKConstants.java @@ -46,7 +46,7 @@ public class MDKConstants { TWC_VERSION_KEY = "twcVersion", ARTIFACTS_KEY = "_artifacts", CHECKSUM_KEY = "checksum", - CONTENT_TYPE_KEY = "mimetype", + MIMETYPE_KEY = "mimetype", PROJECT_TYPE_KEY = "schema", PROJECT_TYPE_VALUE = "cameo", SYSML_PROFILE_ID = "_11_5EAPbeta_be00301_1147434586638_637562_1900", @@ -68,4 +68,8 @@ public class MDKConstants { DELETED_FIELD = "deleted", MAGICDRAW_SOURCE_VALUE = "magicdraw", ELEMENT_TYPE_VALUE = "Element"; + + @Deprecated + public static final String + CONTENT_TYPE_KEY = MIMETYPE_KEY; } diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/validation/DiagramValidator.java b/src/main/java/gov/nasa/jpl/mbee/mdk/mms/validation/DiagramValidator.java index 0b487c216..1f5759235 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/validation/DiagramValidator.java +++ b/src/main/java/gov/nasa/jpl/mbee/mdk/mms/validation/DiagramValidator.java @@ -75,7 +75,6 @@ public void run(ProgressStatus progressStatus) { Application.getInstance().getEnvironmentOptions().getGeneralOptions().setUseSVGTextTag(true); try { Set diagramIds = diagrams.stream().map(Converters.getElementToIdConverter()).filter(Objects::nonNull).collect(Collectors.toSet()); - //Map> diagramElementsMap = new LinkedHashMap<>(); Map artifactsMap = new LinkedHashMap<>(); Map> elementArtifactMap = new LinkedHashMap<>(); @@ -112,7 +111,9 @@ public void run(ProgressStatus progressStatus) { if ((artifactsArray = jsonNode.get(MDKConstants.ARTIFACTS_KEY)) != null && artifactsArray.isArray()) { artifactsArray.forEach(node -> { artifactExtensions.add(idNode.asText() + '_' + node.get("extension").asText()); - artifactsMap.put(idNode.asText() + '_' + node.get("extension").asText(), (ObjectNode) node); + if (node instanceof ObjectNode) { + artifactsMap.put(idNode.asText() + '_' + node.get("extension").asText(), (ObjectNode) node); + } }); } } @@ -158,7 +159,7 @@ public void run(ProgressStatus progressStatus) { break; } ObjectNode existingBinary = elementArtifactMap.getOrDefault(diagramId, Collections.emptySet()).stream().map(artifactsMap::get).filter(Objects::nonNull).filter(node -> { - JsonNode contentTypeNode = node.get(MDKConstants.CONTENT_TYPE_KEY); + JsonNode contentTypeNode = node.get(MDKConstants.MIMETYPE_KEY); return contentTypeNode != null && contentTypeNode.isTextual() && contentTypeNode.asText().equals(entry.getValue().getValue().getMimeType()); }).findFirst().orElse(null); From 19b688de830f67d5a6b88a1e6ed1200d0de7122e Mon Sep 17 00:00:00 2001 From: Ivan Gomes Date: Tue, 26 Oct 2021 11:27:32 -0500 Subject: [PATCH 12/28] MDK-67 refactor: revert file dependence on artifacts --- .../gov/nasa/jpl/mbee/mdk/mms/MMSArtifact.java | 11 ++--------- .../actions/CommitDiagramArtifactsAction.java | 18 +++--------------- .../mdk/mms/validation/DiagramValidator.java | 10 ++++++++-- 3 files changed, 13 insertions(+), 26 deletions(-) diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/MMSArtifact.java b/src/main/java/gov/nasa/jpl/mbee/mdk/mms/MMSArtifact.java index 4b9316097..f388fe0d8 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/MMSArtifact.java +++ b/src/main/java/gov/nasa/jpl/mbee/mdk/mms/MMSArtifact.java @@ -10,14 +10,7 @@ public interface MMSArtifact { String getId(); String getChecksum(); - default InputStream getInputStream() { - try { - return new FileInputStream(getFile()); - } catch (FileNotFoundException e) { - return null; - } - } - File getFile() throws FileNotFoundException; + InputStream getInputStream(); ContentType getContentType(); - String getExtension(); + String getFileExtension(); } diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/CommitDiagramArtifactsAction.java b/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/CommitDiagramArtifactsAction.java index 6d9c4f295..9d5344ba8 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/CommitDiagramArtifactsAction.java +++ b/src/main/java/gov/nasa/jpl/mbee/mdk/mms/actions/CommitDiagramArtifactsAction.java @@ -1,44 +1,31 @@ package gov.nasa.jpl.mbee.mdk.mms.actions; -import com.fasterxml.jackson.databind.node.ArrayNode; -import com.fasterxml.jackson.databind.node.ObjectNode; import com.nomagic.magicdraw.annotation.Annotation; import com.nomagic.magicdraw.annotation.AnnotationAction; import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.core.Project; import com.nomagic.uml2.ext.magicdraw.classes.mdkernel.Diagram; -import gov.nasa.jpl.mbee.mdk.api.incubating.MDKConstants; import gov.nasa.jpl.mbee.mdk.api.incubating.convert.Converters; import gov.nasa.jpl.mbee.mdk.http.ServerException; -import gov.nasa.jpl.mbee.mdk.json.JacksonUtils; import gov.nasa.jpl.mbee.mdk.mms.MMSArtifact; import gov.nasa.jpl.mbee.mdk.mms.MMSUtils; import gov.nasa.jpl.mbee.mdk.mms.endpoints.MMSElementEndpoint; -import gov.nasa.jpl.mbee.mdk.mms.endpoints.MMSElementsEndpoint; -import gov.nasa.jpl.mbee.mdk.mms.endpoints.MMSEndpoint; import gov.nasa.jpl.mbee.mdk.mms.endpoints.MMSEndpointBuilderConstants; import gov.nasa.jpl.mbee.mdk.util.MDUtils; import gov.nasa.jpl.mbee.mdk.util.TaskRunner; import gov.nasa.jpl.mbee.mdk.validation.IRuleViolationAction; import gov.nasa.jpl.mbee.mdk.validation.RuleViolationAction; -import org.apache.commons.io.FileUtils; import org.apache.http.HttpEntity; -import org.apache.http.client.methods.HttpPost; import org.apache.http.client.methods.HttpRequestBase; -import org.apache.http.client.utils.URIBuilder; -import org.apache.http.entity.ContentType; import org.apache.http.entity.mime.MultipartEntityBuilder; +import org.apache.http.entity.mime.content.InputStreamBody; import javax.annotation.CheckForNull; import java.awt.event.ActionEvent; -import java.io.File; -import java.io.FileOutputStream; import java.io.IOException; -import java.net.URI; import java.net.URISyntaxException; import java.security.GeneralSecurityException; import java.util.Collection; -import java.util.Collections; import java.util.Set; public class CommitDiagramArtifactsAction extends RuleViolationAction implements AnnotationAction, IRuleViolationAction { @@ -69,7 +56,8 @@ public void actionPerformed(@CheckForNull ActionEvent actionEvent) { for (MMSArtifact artifact : artifacts) { HttpEntity entity = MultipartEntityBuilder.create() .addTextBody("source", "magicdraw") - .addBinaryBody("file", artifact.getFile(), artifact.getContentType(), artifact.getId() + "." + artifact.getExtension()).build(); + .addBinaryBody("file", artifact.getInputStream(), artifact.getContentType(), artifact.getId() + "." + artifact.getFileExtension()) + .build(); HttpRequestBase artifactRequest = MMSUtils.prepareEndpointBuilderMultipartPostRequest(MMSElementEndpoint.builder(), project, entity) .addParam(MMSEndpointBuilderConstants.URI_PROJECT_SUFFIX, projectId) .addParam(MMSEndpointBuilderConstants.URI_REF_SUFFIX, refId) diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/validation/DiagramValidator.java b/src/main/java/gov/nasa/jpl/mbee/mdk/mms/validation/DiagramValidator.java index 1f5759235..77faff224 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/validation/DiagramValidator.java +++ b/src/main/java/gov/nasa/jpl/mbee/mdk/mms/validation/DiagramValidator.java @@ -179,7 +179,13 @@ public String getChecksum() { } @Override - public File getFile() throws FileNotFoundException { return path.toFile(); } + public InputStream getInputStream() { + try { + return new FileInputStream(path.toFile()); + } catch (FileNotFoundException e) { + return null; + } + } @Override public ContentType getContentType() { @@ -187,7 +193,7 @@ public ContentType getContentType() { } @Override - public String getExtension() { return entry.getKey(); } + public String getFileExtension() { return entry.getKey(); } }); } } From 0fcf28e08de9ac0dbe6cefb597402702337c5cb4 Mon Sep 17 00:00:00 2001 From: Ivan Gomes Date: Tue, 26 Oct 2021 11:31:13 -0500 Subject: [PATCH 13/28] MDK-67 refactor: rename MIME_TYPE_KEY constant --- .../gov/nasa/jpl/mbee/mdk/api/incubating/MDKConstants.java | 4 ++-- .../nasa/jpl/mbee/mdk/mms/validation/DiagramValidator.java | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/api/incubating/MDKConstants.java b/src/main/java/gov/nasa/jpl/mbee/mdk/api/incubating/MDKConstants.java index 9ec68452d..6c2d5fe1a 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/api/incubating/MDKConstants.java +++ b/src/main/java/gov/nasa/jpl/mbee/mdk/api/incubating/MDKConstants.java @@ -46,7 +46,7 @@ public class MDKConstants { TWC_VERSION_KEY = "twcVersion", ARTIFACTS_KEY = "_artifacts", CHECKSUM_KEY = "checksum", - MIMETYPE_KEY = "mimetype", + MIME_TYPE_KEY = "mimetype", PROJECT_TYPE_KEY = "schema", PROJECT_TYPE_VALUE = "cameo", SYSML_PROFILE_ID = "_11_5EAPbeta_be00301_1147434586638_637562_1900", @@ -71,5 +71,5 @@ public class MDKConstants { @Deprecated public static final String - CONTENT_TYPE_KEY = MIMETYPE_KEY; + CONTENT_TYPE_KEY = MIME_TYPE_KEY; } diff --git a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/validation/DiagramValidator.java b/src/main/java/gov/nasa/jpl/mbee/mdk/mms/validation/DiagramValidator.java index 77faff224..9e5f9a606 100644 --- a/src/main/java/gov/nasa/jpl/mbee/mdk/mms/validation/DiagramValidator.java +++ b/src/main/java/gov/nasa/jpl/mbee/mdk/mms/validation/DiagramValidator.java @@ -2,8 +2,6 @@ import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.node.BaseJsonNode; -import com.fasterxml.jackson.databind.node.NullNode; import com.fasterxml.jackson.databind.node.ObjectNode; import com.nomagic.magicdraw.core.Application; import com.nomagic.magicdraw.core.Project; @@ -159,7 +157,7 @@ public void run(ProgressStatus progressStatus) { break; } ObjectNode existingBinary = elementArtifactMap.getOrDefault(diagramId, Collections.emptySet()).stream().map(artifactsMap::get).filter(Objects::nonNull).filter(node -> { - JsonNode contentTypeNode = node.get(MDKConstants.MIMETYPE_KEY); + JsonNode contentTypeNode = node.get(MDKConstants.MIME_TYPE_KEY); return contentTypeNode != null && contentTypeNode.isTextual() && contentTypeNode.asText().equals(entry.getValue().getValue().getMimeType()); }).findFirst().orElse(null); From 7e205eec2be024d7b979f463b75eccb80843e0a9 Mon Sep 17 00:00:00 2001 From: Enquier Date: Thu, 28 Oct 2021 10:59:31 -0600 Subject: [PATCH 14/28] fixing build.gradle adding profiles --- build.gradle | 179 ++++------------------------- buildProfiles/internal.properties | 1 + buildProfiles/opesource.properties | 1 + 3 files changed, 22 insertions(+), 159 deletions(-) create mode 100644 buildProfiles/internal.properties create mode 100644 buildProfiles/opesource.properties diff --git a/build.gradle b/build.gradle index 6cdc17a9e..0f45e7fa5 100644 --- a/build.gradle +++ b/build.gradle @@ -17,163 +17,17 @@ if (buildAccess == 'internal') { } String buildNumber = project.hasProperty('buildNumber') ? project.getProperty('buildNumber') : System.currentTimeSeconds() String timestamp = DateTimeFormatter.ofPattern("yyyy-MM-dd-HH:mm").format(LocalDateTime.now()) -// classpathLibraries as defined in bin/[magicdraw|csm].properties#CLASSPATH -String[] classpathLibraries = [ - 'lib/patch.jar', - 'lib/brand.jar', - 'lib/brand_api.jar', - 'lib/md.jar', - 'lib/md_api.jar', - 'lib/md_common.jar', - 'lib/md_common_api.jar', - 'lib/md_common_test.jar', - 'lib/tw_common.jar', - 'lib/tw_common_api.jar', - 'lib/launcher.jar', - 'lib/activation.jar', - 'lib/annotation.jar', - 'lib/batik.jar', - 'lib/bridj-0.7.0.jar', - 'lib/bundles/ch.qos.logback.classic_1.2.3.jar', - 'lib/bundles/ch.qos.logback.core_1.2.3.jar', - 'lib/bundles/cmof_1.4.0.202006020804/cmof14.jar', - 'lib/bundles/cmof_1.4.0.202006020804/tas.jar', - 'lib/bundles/com.esotericsoftware.kryo_2.22.0.201401231130.jar', - 'lib/bundles/com.google.guava_18.0.0.jar', - 'lib/bundles/com.nomagic.annotations_1.0.0/com.nomagic.annotation-1.0.jar', - 'lib/bundles/com.nomagic.ci.binary_17.0.5.v20200602-0758.jar', - 'lib/bundles/com.nomagic.ci.metamodel.project_17.0.5.v20200602-0758.jar', - 'lib/bundles/com.nomagic.ci.persistence.local_17.0.5.v20200602-0758.jar', - 'lib/bundles/com.nomagic.ci.persistence_17.0.5.v20200602-0758.jar', - 'lib/bundles/com.nomagic.ci.services_17.0.5.v20200602-0758.jar', - 'lib/bundles/com.nomagic.ci_17.0.5.v20200602-0758.jar', - 'lib/bundles/com.nomagic.magicdraw.ce_18.1.0.202006020804.jar', - 'lib/bundles/com.nomagic.magicdraw.core.diagram_18.1.0.202006020804.jar', - 'lib/bundles/com.nomagic.magicdraw.core.project.options_18.1.0.202006020804.jar', - 'lib/bundles/com.nomagic.magicdraw.core_1.0.0.202006020804.jar', - 'lib/bundles/com.nomagic.magicdraw.esi.binary.metamodel_18.1.0.202006020804.jar', - 'lib/bundles/com.nomagic.magicdraw.esi.esiproject_18.1.0.202006020804.jar', - 'lib/bundles/com.nomagic.magicdraw.esi.uuidmap_18.1.0.202006020804.jar', - 'lib/bundles/com.nomagic.magicdraw.foundation_2.0.0.202006020804.jar', - 'lib/bundles/com.nomagic.magicdraw.osgi.fragment_1.0.0.202006020804.jar', - 'lib/bundles/com.nomagic.magicdraw.security_18.3.0.202006020804.jar', - 'lib/bundles/com.nomagic.magicdraw.uml2_2.5.1.202006020804.jar', - 'lib/bundles/com.nomagic.magicdraw_17.0.5.202006020804.jar', - 'lib/bundles/com.teamdev.jxbrowser.chromium.internal.linux64_6.24.1.jar', - 'lib/bundles/com.teamdev.jxbrowser.chromium.internal.mac_6.24.1.jar', - 'lib/bundles/com.teamdev.jxbrowser.chromium.internal.win32_6.24.1.jar', - 'lib/bundles/com.teamdev.jxbrowser.chromium.internal.win64_6.24.1.jar', - 'lib/bundles/com.teamdev.jxbrowser.chromium_6.24.1.jar', - 'lib/bundles/com.typesafe.config_1.3.0.jar', - 'lib/bundles/com.typesafe.sslconfig_0.2.2.jar', - 'lib/bundles/de.schlichtherle.truezip_7.4.3.v20200602-0758/lib/truezip-driver-zip-7.4.3.jar', - 'lib/bundles/de.schlichtherle.truezip_7.4.3.v20200602-0758/lib/truezip-kernel-7.4.3.jar', - 'lib/bundles/gnu.trove_3.0.3/lib/trove-3.0.3.jar', - 'lib/bundles/io.aeron.client_1.7.0.jar', - 'lib/bundles/io.aeron.driver_1.7.0.jar', - 'lib/bundles/io.dropwizard.metrics.core_3.1.2.jar', - 'lib/bundles/io.dropwizard.metrics.graphite_3.1.2.jar', - 'lib/bundles/io.netty.buffer_4.1.21.Final.jar', - 'lib/bundles/io.netty.codec_4.1.21.Final.jar', - 'lib/bundles/io.netty.common_4.1.21.Final.jar', - 'lib/bundles/io.netty.handler_4.1.21.Final.jar', - 'lib/bundles/io.netty.resolver_4.1.21.Final.jar', - 'lib/bundles/io.netty.transport_4.1.21.Final.jar', - 'lib/bundles/javax.jmi_1.0.0.202006020804/javax_jmi-1_0-fr.jar', - 'lib/bundles/joda-time_2.9.1.jar', - 'lib/bundles/lz4-java_1.3.0.jar', - 'lib/bundles/org.agrona_0.9.12.jar', - 'lib/bundles/org.apache.commons.codec_1.9.0.v20170208-1614.jar', - 'lib/bundles/org.apache.commons.collections_3.2.1.jar', - 'lib/bundles/org.apache.commons.compress_1.3.0.jar', - 'lib/bundles/org.apache.commons.io_2.4.0.jar', - 'lib/bundles/org.apache.commons.lang_2.6.0.v201404270220.jar', - 'lib/bundles/org.apache.commons.logging_1.1.1.v201101211721.jar', - 'lib/bundles/org.apache.felix.scr_2.0.10.v20170501-2007.jar', - 'lib/bundles/org.apache.httpcomponents.httpclient_4.5.3.jar', - 'lib/bundles/org.apache.httpcomponents.httpcore_4.4.6.v20170210-0925.jar', - 'lib/bundles/org.apache.log4j_1.2.15.v201005080500.jar', - 'lib/bundles/org.apache.servicemix.bundles.jsr305_2.0.1.1.jar', - 'lib/bundles/org.apiguardian_1.1.0.v20190826-0900.jar', - 'lib/bundles/org.eclipse.core.contenttype_3.6.0.v20170207-1037.jar', - 'lib/bundles/org.eclipse.core.jobs_3.9.2.v20171030-1027.jar', - 'lib/bundles/org.eclipse.core.runtime_3.13.0.v20170207-1030.jar', - 'lib/bundles/org.eclipse.emf.common_2.13.0.v20170609-0707.jar', - 'lib/bundles/org.eclipse.emf.ecore.xmi_2.13.0.v20170609-0707.jar', - 'lib/bundles/org.eclipse.emf.ecore_2.13.0.v20170609-0707.jar', - 'lib/bundles/org.eclipse.equinox.app_1.3.400.v20150715-1528.jar', - 'lib/bundles/org.eclipse.equinox.common_3.9.0.v20170207-1454.jar', - 'lib/bundles/org.eclipse.equinox.ds_1.5.0.v20170307-1429.jar', - 'lib/bundles/org.eclipse.equinox.preferences_3.7.0.v20170126-2132.jar', - 'lib/bundles/org.eclipse.equinox.registry_3.7.0.v20170222-1344.jar', - 'lib/bundles/org.eclipse.osgi.services_3.6.0.v20170228-1906.jar', - 'lib/bundles/org.eclipse.osgi.util_3.4.0.v20170111-1608.jar', - 'lib/bundles/org.eclipse.osgi_3.12.50.v20170928-1321.jar', - 'lib/bundles/org.eclipse.uml2.common_1.5.0.v200905041045.jar', - 'lib/bundles/org.hamcrest.core_1.3.0.v201303031735.jar', - 'lib/bundles/org.jboss.netty_3.10.6.Final.jar', - 'lib/bundles/org.json_1.0.0.255610281323.jar', - 'lib/bundles/org.junit.jupiter.api_5.5.1.v20190826-0900.jar', - 'lib/bundles/org.junit.jupiter.params_5.5.1.v20190826-0900.jar', - 'lib/bundles/org.junit.platform.commons_1.5.1.v20190826-0900.jar', - 'lib/bundles/org.junit_4.12.0.v201504281640/junit.jar', - 'lib/bundles/org.opentest4j_1.2.0.v20190826-0900.jar', - 'lib/bundles/org.reactivestreams.reactive-streams_1.0.2.jar', - 'lib/bundles/org.uncommons.maths_1.2.2.201301151508/lib/uncommons-maths-1.2.2a.jar', - 'lib/bundles/slf4j.api_1.7.25.jar', - 'lib/com.nomagic.osgi.launcher-17.0.5-SNAPSHOT.jar', - 'lib/commons-compress-1.3.jar', - 'lib/commons-httpclient-3.1.jar', - 'lib/commons-logging-1.0.4.jar', - 'lib/concurrent.jar', - 'lib/EccpressoAll.jar', - 'lib/ehcache-2.10.1.jar', - 'lib/flexlm.jar', - 'lib/graphics/clibwrapper_jiio.jar', - 'lib/graphics/freehep-base.jar', - 'lib/graphics/freehep-graphics2d.jar', - 'lib/graphics/freehep-graphicsio-emf.jar', - 'lib/graphics/freehep-graphicsio-ps.jar', - 'lib/graphics/freehep-graphicsio.jar', - 'lib/graphics/jai_imageio.jar', - 'lib/gson-2.2.4.jar', - 'lib/HTMLEditorLight.jar', - 'lib/hunspell-bridj-1.0.5-SNAPSHOT.jar', - 'lib/javassist.jar', - 'lib/jhall.jar', - 'lib/jide-action.jar', - 'lib/jide-charts.jar', - 'lib/jide-common.jar', - 'lib/jide-components.jar', - 'lib/jide-diff.jar', - 'lib/jide-dock.jar', - 'lib/jide-editor.jar', - 'lib/jide-gantt.jar', - 'lib/jide-grids.jar', - 'lib/jide-shortcut.jar', - 'lib/jimi.jar', - 'lib/jna.jar', - 'lib/jnp-client.jar', - 'lib/jtidy-sources.zip', - 'lib/jtidy.jar', - 'lib/JUnitParams-1.0.1.jar', - 'lib/lucene-analyzers-common-7.5.0.jar', - 'lib/lucene-core-7.5.0.jar', - 'lib/lucene-misc-7.5.0.jar', - 'lib/poi-3.14-20160307.jar', - 'lib/poi-ooxml-3.14-20160307.jar', - 'lib/poi-ooxml-schemas-3.14-20160307.jar', - 'lib/webservice/axis-config.jar', - 'lib/webservice/axis.jar', - 'lib/webservice/commons-discovery-0.2.jar', - 'lib/webservice/jaxrpc.jar', - 'lib/webservice/mdserviceclient.jar', - 'lib/webservice/rsclient.jar', - 'lib/webservice/wsdl4j-1.5.1.jar', - 'lib/xalan.jar', - 'lib/xmlbeans-2.6.0.jar', - 'lib/y.jar' -] + +// classpathLibraries as defined in bin/[magicdraw|csm].properties#CLASSPATH are stored in ./buildProfiles +def profiles = new Properties() +try { + file("buildProfiles/" + buildAccess + ".properties").withInputStream { profiles.load(it) } +} catch (FileNotFoundException e) { + println "Profile Properties File not found using default:" + e.message + file("buildProfiles/opensource.properties").withInputStream { profiles.load(it) } +} +String[] classpathLibraries = profiles.getProperty("classpathLibraries"); + String docbookNameVersion = 'docbook-xsl-1.79.1' String fopNameVersion = 'fop-1.1' @@ -337,7 +191,12 @@ dependencies { compile files(classpathLibraries.collect { 'build/dependency-cache/extracted/magicdraw/' + it }) compile fileTree(dir: 'build/dependency-cache/extracted/magicdraw', include: ['lib/**/*.jar', 'plugins/**/*.jar'], exclude: ([ classpathLibraries, ['plugins/com.nomagic.collaborator.publisher/**/*.jar', 'plugins/com.nomagic.magicdraw.emfuml2xmi*/**/*.jar', 'plugins/com.nomagic.magicdraw.automaton/lib/engines/**/*.jar', 'plugins/tomsawyer/**/*.jar', 'plugins/com.intercax.syndeia.md/**/*.jar'] ]).flatten()) compile fileTree(dir: 'lib', include: ['**/*.jar']) - compile files('build/dependency-cache/extracted/fop/jars/fop-1.1.jar', 'build/dependency-cache/extracted/fop/jars/xmlgraphics-commons-1.5.jar', 'build/dependency-cache/extracted/magicdraw/jre/lib/ext/jfxrt.jar') + if (buildAccess == 'internal') { + compile files('build/dependency-cache/extracted/fop/jars/fop-1.1.jar', 'build/dependency-cache/extracted/fop/jars/xmlgraphics-commons-1.5.jar', 'build/dependency-cache/extracted/magicdraw/jre/lib/ext/jfxrt.jar') + } + else { + compile files('build/dependency-cache/extracted/fop/jars/fop-1.1.jar', 'build/dependency-cache/extracted/fop/jars/xmlgraphics-commons-1.5.jar') + } } @@ -671,7 +530,9 @@ task runJava(type: JavaExec) { standardOutput = System.out errorOutput = System.err - executable = '/Applications/MagicDraw/cae-cameo-systems-modeler-5.0.0-SNAPSHOT-macos/jre/Contents/Home/bin/java' + if (buildAccess == 'internal') { + executable = '/Applications/MagicDraw/cae-cameo-systems-modeler-5.0.0-SNAPSHOT-macos/jre/Contents/Home/bin/java' + } main = 'com.nomagic.osgi.launcher.ProductionFrameworkLauncher' jvmArgs = ['-Xmx8192M', '-Xss512M', '-DLOCALCONFIG=true', '-DWINCONFIG=true', '-Djsse.enableSNIExtension=true', '-Djava.net.preferIPv4Stack=true', '-Dcom.sun.media.imageio.disableCodecLib=true', '-noverify', '-Dlocal.config.dir.ext=-dev', '-splash:data/splash.png', '-Dmd.class.path=$java.class.path', '-Dcom.nomagic.osgi.config.dir=configuration', '-Desi.system.config=data/application.conf', '-Dlogback.configurationFile=data/logback.xml', '-Dsun.locale.formatasdefault=true', '-Dorg.osgi.framework.bundle.parent=ext'] // arguments to pass to the application diff --git a/buildProfiles/internal.properties b/buildProfiles/internal.properties new file mode 100644 index 000000000..973fecb92 --- /dev/null +++ b/buildProfiles/internal.properties @@ -0,0 +1 @@ +classpathLibraries = ['lib/patch.jar','lib/brand.jar','lib/brand_api.jar','lib/md.jar','lib/md_api.jar','lib/md_common.jar','lib/md_common_api.jar','lib/md_common_test.jar','lib/tw_common.jar','lib/tw_common_api.jar','lib/launcher.jar','lib/activation.jar','lib/annotation.jar','lib/batik.jar','lib/bridj-0.7.0.jar','lib/bundles/ch.qos.logback.classic_1.2.3.jar','lib/bundles/ch.qos.logback.core_1.2.3.jar','lib/bundles/cmof_1.4.0.202006020804/cmof14.jar','lib/bundles/cmof_1.4.0.202006020804/tas.jar','lib/bundles/com.esotericsoftware.kryo_2.22.0.201401231130.jar','lib/bundles/com.google.guava_18.0.0.jar','lib/bundles/com.nomagic.annotations_1.0.0/com.nomagic.annotation-1.0.jar','lib/bundles/com.nomagic.ci.binary_17.0.5.v20200602-0758.jar','lib/bundles/com.nomagic.ci.metamodel.project_17.0.5.v20200602-0758.jar','lib/bundles/com.nomagic.ci.persistence.local_17.0.5.v20200602-0758.jar','lib/bundles/com.nomagic.ci.persistence_17.0.5.v20200602-0758.jar','lib/bundles/com.nomagic.ci.services_17.0.5.v20200602-0758.jar','lib/bundles/com.nomagic.ci_17.0.5.v20200602-0758.jar','lib/bundles/com.nomagic.magicdraw.ce_18.1.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.core.diagram_18.1.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.core.project.options_18.1.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.core_1.0.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.esi.binary.metamodel_18.1.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.esi.esiproject_18.1.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.esi.uuidmap_18.1.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.foundation_2.0.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.osgi.fragment_1.0.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.security_18.3.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.uml2_2.5.1.202006020804.jar','lib/bundles/com.nomagic.magicdraw_17.0.5.202006020804.jar','lib/bundles/com.teamdev.jxbrowser.chromium.internal.linux64_6.24.1.jar','lib/bundles/com.teamdev.jxbrowser.chromium.internal.mac_6.24.1.jar','lib/bundles/com.teamdev.jxbrowser.chromium.internal.win32_6.24.1.jar','lib/bundles/com.teamdev.jxbrowser.chromium.internal.win64_6.24.1.jar','lib/bundles/com.teamdev.jxbrowser.chromium_6.24.1.jar','lib/bundles/com.typesafe.config_1.3.0.jar','lib/bundles/com.typesafe.sslconfig_0.2.2.jar','lib/bundles/de.schlichtherle.truezip_7.4.3.v20200602-0758/lib/truezip-driver-zip-7.4.3.jar','lib/bundles/de.schlichtherle.truezip_7.4.3.v20200602-0758/lib/truezip-kernel-7.4.3.jar','lib/bundles/gnu.trove_3.0.3/lib/trove-3.0.3.jar','lib/bundles/io.aeron.client_1.7.0.jar','lib/bundles/io.aeron.driver_1.7.0.jar','lib/bundles/io.dropwizard.metrics.core_3.1.2.jar','lib/bundles/io.dropwizard.metrics.graphite_3.1.2.jar','lib/bundles/io.netty.buffer_4.1.21.Final.jar','lib/bundles/io.netty.codec_4.1.21.Final.jar','lib/bundles/io.netty.common_4.1.21.Final.jar','lib/bundles/io.netty.handler_4.1.21.Final.jar','lib/bundles/io.netty.resolver_4.1.21.Final.jar','lib/bundles/io.netty.transport_4.1.21.Final.jar','lib/bundles/javax.jmi_1.0.0.202006020804/javax_jmi-1_0-fr.jar','lib/bundles/joda-time_2.9.1.jar','lib/bundles/lz4-java_1.3.0.jar','lib/bundles/org.agrona_0.9.12.jar','lib/bundles/org.apache.commons.codec_1.9.0.v20170208-1614.jar','lib/bundles/org.apache.commons.collections_3.2.1.jar','lib/bundles/org.apache.commons.compress_1.3.0.jar','lib/bundles/org.apache.commons.io_2.4.0.jar','lib/bundles/org.apache.commons.lang_2.6.0.v201404270220.jar','lib/bundles/org.apache.commons.logging_1.1.1.v201101211721.jar','lib/bundles/org.apache.felix.scr_2.0.10.v20170501-2007.jar','lib/bundles/org.apache.httpcomponents.httpclient_4.5.3.jar','lib/bundles/org.apache.httpcomponents.httpcore_4.4.6.v20170210-0925.jar','lib/bundles/org.apache.log4j_1.2.15.v201005080500.jar','lib/bundles/org.apache.servicemix.bundles.jsr305_2.0.1.1.jar','lib/bundles/org.apiguardian_1.1.0.v20190826-0900.jar','lib/bundles/org.eclipse.core.contenttype_3.6.0.v20170207-1037.jar','lib/bundles/org.eclipse.core.jobs_3.9.2.v20171030-1027.jar','lib/bundles/org.eclipse.core.runtime_3.13.0.v20170207-1030.jar','lib/bundles/org.eclipse.emf.common_2.13.0.v20170609-0707.jar','lib/bundles/org.eclipse.emf.ecore.xmi_2.13.0.v20170609-0707.jar','lib/bundles/org.eclipse.emf.ecore_2.13.0.v20170609-0707.jar','lib/bundles/org.eclipse.equinox.app_1.3.400.v20150715-1528.jar','lib/bundles/org.eclipse.equinox.common_3.9.0.v20170207-1454.jar','lib/bundles/org.eclipse.equinox.ds_1.5.0.v20170307-1429.jar','lib/bundles/org.eclipse.equinox.preferences_3.7.0.v20170126-2132.jar','lib/bundles/org.eclipse.equinox.registry_3.7.0.v20170222-1344.jar','lib/bundles/org.eclipse.osgi.services_3.6.0.v20170228-1906.jar','lib/bundles/org.eclipse.osgi.util_3.4.0.v20170111-1608.jar','lib/bundles/org.eclipse.osgi_3.12.50.v20170928-1321.jar','lib/bundles/org.eclipse.uml2.common_1.5.0.v200905041045.jar','lib/bundles/org.hamcrest.core_1.3.0.v201303031735.jar','lib/bundles/org.jboss.netty_3.10.6.Final.jar','lib/bundles/org.json_1.0.0.255610281323.jar','lib/bundles/org.junit.jupiter.api_5.5.1.v20190826-0900.jar','lib/bundles/org.junit.jupiter.params_5.5.1.v20190826-0900.jar','lib/bundles/org.junit.platform.commons_1.5.1.v20190826-0900.jar','lib/bundles/org.junit_4.12.0.v201504281640/junit.jar','lib/bundles/org.opentest4j_1.2.0.v20190826-0900.jar','lib/bundles/org.reactivestreams.reactive-streams_1.0.2.jar','lib/bundles/org.uncommons.maths_1.2.2.201301151508/lib/uncommons-maths-1.2.2a.jar','lib/bundles/slf4j.api_1.7.25.jar','lib/com.nomagic.osgi.launcher-17.0.5-SNAPSHOT.jar','lib/commons-compress-1.3.jar','lib/commons-httpclient-3.1.jar','lib/commons-logging-1.0.4.jar','lib/concurrent.jar','lib/EccpressoAll.jar','lib/ehcache-2.10.1.jar','lib/flexlm.jar','lib/graphics/clibwrapper_jiio.jar','lib/graphics/freehep-base.jar','lib/graphics/freehep-graphics2d.jar','lib/graphics/freehep-graphicsio-emf.jar','lib/graphics/freehep-graphicsio-ps.jar','lib/graphics/freehep-graphicsio.jar','lib/graphics/jai_imageio.jar','lib/gson-2.2.4.jar','lib/HTMLEditorLight.jar','lib/hunspell-bridj-1.0.5-SNAPSHOT.jar','lib/javassist.jar','lib/jhall.jar','lib/jide-action.jar','lib/jide-charts.jar','lib/jide-common.jar','lib/jide-components.jar','lib/jide-diff.jar','lib/jide-dock.jar','lib/jide-editor.jar','lib/jide-gantt.jar','lib/jide-grids.jar','lib/jide-shortcut.jar','lib/jimi.jar','lib/jna.jar','lib/jnp-client.jar','lib/jtidy-sources.zip','lib/jtidy.jar','lib/JUnitParams-1.0.1.jar','lib/lucene-analyzers-common-7.5.0.jar','lib/lucene-core-7.5.0.jar','lib/lucene-misc-7.5.0.jar','lib/poi-3.14-20160307.jar','lib/poi-ooxml-3.14-20160307.jar','lib/poi-ooxml-schemas-3.14-20160307.jar','lib/webservice/axis-config.jar','lib/webservice/axis.jar','lib/webservice/commons-discovery-0.2.jar','lib/webservice/jaxrpc.jar','lib/webservice/mdserviceclient.jar','lib/webservice/rsclient.jar','lib/webservice/wsdl4j-1.5.1.jar','lib/xalan.jar','lib/xmlbeans-2.6.0.jar','lib/y.jar'] \ No newline at end of file diff --git a/buildProfiles/opesource.properties b/buildProfiles/opesource.properties new file mode 100644 index 000000000..c04b30e6e --- /dev/null +++ b/buildProfiles/opesource.properties @@ -0,0 +1 @@ +classpathLibraries = ['lib/patch.jar','lib/brand.jar','lib/brand_api.jar','lib/md.jar','lib/md_api.jar','lib/md_common.jar','lib/md_common_api.jar','lib/md_common_test.jar','lib/tw_common.jar','lib/tw_common_api.jar','lib/launcher.jar','lib/activation.jar','lib/annotation.jar','lib/batik.jar','lib/bridj-0.7.0.jar','lib/bundles/ch.qos.logback.classic_1.2.3.jar','lib/bundles/ch.qos.logback.core_1.2.3.jar','lib/bundles/cmof_1.4.0.202006020804/cmof14.jar','lib/bundles/cmof_1.4.0.202006020804/tas.jar','lib/bundles/com.esotericsoftware.kryo_2.22.0.201401231130.jar','lib/bundles/com.google.guava_18.0.0.jar','lib/bundles/com.nomagic.annotations_1.0.0/com.nomagic.annotation-1.0.jar','lib/bundles/com.nomagic.ci.binary_17.0.5.v20200602-0758.jar','lib/bundles/com.nomagic.ci.metamodel.project_17.0.5.v20200602-0758.jar','lib/bundles/com.nomagic.ci.persistence.local_17.0.5.v20200602-0758.jar','lib/bundles/com.nomagic.ci.persistence_17.0.5.v20200602-0758.jar','lib/bundles/com.nomagic.ci.services_17.0.5.v20200602-0758.jar','lib/bundles/com.nomagic.ci_17.0.5.v20200602-0758.jar','lib/bundles/com.nomagic.esi.api.messages_1.0.0.v20191101-2128.jar','lib/bundles/com.nomagic.esi.api_1.0.0.v20191101-2128.jar','lib/bundles/com.nomagic.esi.client.core_1.0.0.v20191101-2128.jar','lib/bundles/com.nomagic.esi.common_1.0.0.v20191101-2128.jar','lib/bundles/com.nomagic.esi.config_1.0.0.v20191101-2128.jar','lib/bundles/com.nomagic.esi.core.msg_1.0.0.v20191101-2128.jar','lib/bundles/com.nomagic.esi.emf_1.0.0.v20191101-2128.jar','lib/bundles/com.nomagic.esi.helper_1.0.0.v20191101-2128.jar','lib/bundles/com.nomagic.esi.net_1.0.0.v20191101-2128.jar','lib/bundles/com.nomagic.esi.serializer.akka_1.0.0.v20191101-2128.jar','lib/bundles/com.nomagic.esi.serializer_1.0.0.v20191101-2128.jar','lib/bundles/com.nomagic.esi.service.actorsystem_1.0.0.v20191101-2128.jar','lib/bundles/com.nomagic.esi.services_1.0.0.v20191101-2128.jar','lib/bundles/com.nomagic.esi.stream_1.0.0.v20191101-2128.jar','lib/bundles/com.nomagic.esi.supervisor_1.0.0.v20191101-2128.jar','lib/bundles/com.nomagic.magicdraw.ce_18.1.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.core.diagram_18.1.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.core.project.options_18.1.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.core_1.0.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.esi.binary.metamodel_18.1.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.esi.esiproject_18.1.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.esi.uuidmap_18.1.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.foundation_2.0.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.osgi.fragment_1.0.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.security_18.3.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.uml2_2.5.1.202006020804.jar','lib/bundles/com.nomagic.magicdraw_17.0.5.202006020804.jar','lib/bundles/com.teamdev.jxbrowser.chromium.internal.linux64_6.24.1.jar','lib/bundles/com.teamdev.jxbrowser.chromium.internal.mac_6.24.1.jar','lib/bundles/com.teamdev.jxbrowser.chromium.internal.win32_6.24.1.jar','lib/bundles/com.teamdev.jxbrowser.chromium.internal.win64_6.24.1.jar','lib/bundles/com.teamdev.jxbrowser.chromium_6.24.1.jar','lib/bundles/com.typesafe.akka.actor_2.5.10.jar','lib/bundles/com.typesafe.akka.cluster.tools_2.5.10.jar','lib/bundles/com.typesafe.akka.cluster_2.5.10.jar','lib/bundles/com.typesafe.akka.osgi_2.5.10.jar','lib/bundles/com.typesafe.akka.protobuf_2.5.10.jar','lib/bundles/com.typesafe.akka.remote_2.5.10.jar','lib/bundles/com.typesafe.akka.slf4j_2.5.10.jar','lib/bundles/com.typesafe.akka.stream_2.5.10.jar','lib/bundles/com.typesafe.config_1.3.0.jar','lib/bundles/com.typesafe.sslconfig_0.2.2.jar','lib/bundles/de.schlichtherle.truezip_7.4.3.v20200602-0758/lib/truezip-driver-zip-7.4.3.jar','lib/bundles/de.schlichtherle.truezip_7.4.3.v20200602-0758/lib/truezip-kernel-7.4.3.jar','lib/bundles/gnu.trove_3.0.3/lib/trove-3.0.3.jar','lib/bundles/io.aeron.client_1.7.0.jar','lib/bundles/io.aeron.driver_1.7.0.jar','lib/bundles/io.dropwizard.metrics.core_3.1.2.jar','lib/bundles/io.dropwizard.metrics.graphite_3.1.2.jar','lib/bundles/io.netty.buffer_4.1.21.Final.jar','lib/bundles/io.netty.codec_4.1.21.Final.jar','lib/bundles/io.netty.common_4.1.21.Final.jar','lib/bundles/io.netty.handler_4.1.21.Final.jar','lib/bundles/io.netty.resolver_4.1.21.Final.jar','lib/bundles/javax.jmi_1.0.0.202006020804/javax_jmi-1_0-fr.jar','lib/bundles/io.netty.transport_4.1.21.Final.jar','lib/bundles/joda-time_2.9.1.jar','lib/bundles/lz4-java_1.3.0.jar','lib/bundles/org.agrona_0.9.12.jar','lib/bundles/org.apache.commons.codec_1.9.0.v20170208-1614.jar','lib/bundles/org.apache.commons.collections_3.2.1.jar','lib/bundles/org.apache.commons.compress_1.3.0.jar','lib/bundles/org.apache.commons.io_2.4.0.jar','lib/bundles/org.apache.commons.lang_2.6.0.v201404270220.jar','lib/bundles/org.apache.commons.logging_1.1.1.v201101211721.jar','lib/bundles/org.apache.felix.scr_2.0.10.v20170501-2007.jar','lib/bundles/org.apache.httpcomponents.httpclient_4.5.3.jar','lib/bundles/org.apache.httpcomponents.httpcore_4.4.6.v20170210-0925.jar','lib/bundles/org.apache.log4j_1.2.15.v201005080500.jar','lib/bundles/org.apache.servicemix.bundles.jsr305_2.0.1.1.jar','lib/bundles/org.apiguardian_1.1.0.v20190826-0900.jar','lib/bundles/org.eclipse.core.contenttype_3.6.0.v20170207-1037.jar','lib/bundles/org.eclipse.core.jobs_3.9.2.v20171030-1027.jar','lib/bundles/org.eclipse.core.runtime_3.13.0.v20170207-1030.jar','lib/bundles/org.eclipse.emf.common_2.13.0.v20170609-0707.jar','lib/bundles/org.eclipse.emf.ecore.xmi_2.13.0.v20170609-0707.jar','lib/bundles/org.eclipse.emf.ecore_2.13.0.v20170609-0707.jar','lib/bundles/org.eclipse.equinox.app_1.3.400.v20150715-1528.jar','lib/bundles/org.eclipse.equinox.common_3.9.0.v20170207-1454.jar','lib/bundles/org.eclipse.equinox.ds_1.5.0.v20170307-1429.jar','lib/bundles/org.eclipse.equinox.preferences_3.7.0.v20170126-2132.jar','lib/bundles/org.eclipse.equinox.registry_3.7.0.v20170222-1344.jar','lib/bundles/org.eclipse.osgi.services_3.6.0.v20170228-1906.jar','lib/bundles/org.eclipse.osgi.util_3.4.0.v20170111-1608.jar','lib/bundles/org.eclipse.osgi_3.12.50.v20170928-1321.jar','lib/bundles/org.eclipse.uml2.common_1.5.0.v200905041045.jar','lib/bundles/org.hamcrest.core_1.3.0.v201303031735.jar','lib/bundles/org.jboss.netty_3.10.6.Final.jar','lib/bundles/org.json_1.0.0.255610281323.jar','lib/bundles/org.junit.jupiter.api_5.5.1.v20190826-0900.jar','lib/bundles/org.junit.jupiter.params_5.5.1.v20190826-0900.jar','lib/bundles/org.junit.platform.commons_1.5.1.v20190826-0900.jar','lib/bundles/org.junit_4.12.0.v201504281640/junit.jar','lib/bundles/org.opentest4j_1.2.0.v20190826-0900.jar','lib/bundles/org.reactivestreams.reactive-streams_1.0.2.jar','lib/bundles/org.scala-lang.modules.scala-java8-compat_0.8.0.jar','lib/bundles/org.scala-lang.modules.scala-parser-combinators_1.0.4.jar','lib/bundles/org.scala-lang.scala-library_2.12.4.v20171010-220511-VFINAL-c2a5883.jar','lib/bundles/org.uncommons.maths_1.2.2.201301151508/lib/uncommons-maths-1.2.2a.jar','lib/bundles/slf4j.api_1.7.25.jar','lib/bundles/cmof_1.4.0.201912191136/cmof14.jar','lib/bundles/cmof_1.4.0.201912191136/tas.jar','lib/bundles/com.nomagic.ci.binary_17.0.5.v20191219-1130.jar','lib/bundles/com.nomagic.ci.metamodel.project_17.0.5.v20191219-1130.jar','lib/bundles/com.nomagic.ci.persistence.local_17.0.5.v20191219-1130.jar','lib/bundles/com.nomagic.ci.persistence_17.0.5.v20191219-1130.jar','lib/bundles/com.nomagic.ci.services_17.0.5.v20191219-1130.jar','lib/bundles/com.nomagic.ci_17.0.5.v20191219-1130.jar','lib/bundles/com.nomagic.magicdraw.ce_18.1.0.201912191136.jar','lib/bundles/com.nomagic.magicdraw.core.diagram_18.1.0.201912191136.jar','lib/bundles/com.nomagic.magicdraw.core.project.options_18.1.0.201912191136.jar','lib/bundles/com.nomagic.magicdraw.core_1.0.0.201912191136.jar','lib/bundles/com.nomagic.magicdraw.esi.binary.metamodel_18.1.0.201912191136.jar','lib/bundles/com.nomagic.magicdraw.esi.esiproject_18.1.0.201912191136.jar','lib/bundles/com.nomagic.magicdraw.esi.uuidmap_18.1.0.201912191136.jar','lib/bundles/com.nomagic.magicdraw.foundation_2.0.0.201912191136.jar','lib/bundles/com.nomagic.magicdraw.osgi.fragment_1.0.0.201912191136.jar','lib/bundles/com.nomagic.magicdraw.security_18.3.0.201912191136.jar','lib/bundles/com.nomagic.magicdraw.uml2_2.5.1.201912191136.jar','lib/bundles/com.nomagic.magicdraw_17.0.5.201912191136.jar','lib/bundles/de.schlichtherle.truezip_7.4.3.v20191219-1130/lib/truezip-driver-zip-7.4.3.jar','lib/bundles/de.schlichtherle.truezip_7.4.3.v20191219-1130/lib/truezip-kernel-7.4.3.jar','lib/bundles/javax.jmi_1.0.0.201912191136/javax_jmi-1_0-fr.jar','lib/com.nomagic.osgi.launcher-17.0.5-SNAPSHOT.jar','lib/commons-compress-1.3.jar','lib/commons-httpclient-3.1.jar','lib/commons-logging-1.0.4.jar','lib/concurrent.jar','lib/EccpressoAll.jar','lib/HTMLEditorLight.jar','lib/JUnitParams-1.0.1.jar','lib/ehcache-2.10.1.jar','lib/flexlm.jar','lib/graphics/clibwrapper_jiio.jar','lib/graphics/freehep-base.jar','lib/graphics/freehep-graphics2d.jar','lib/graphics/freehep-graphicsio-emf.jar','lib/graphics/freehep-graphicsio-ps.jar','lib/graphics/freehep-graphicsio.jar','lib/graphics/jai_imageio.jar','lib/gson-2.2.4.jar','lib/hunspell-bridj-1.0.5-SNAPSHOT.jar','lib/javassist.jar','lib/jhall.jar','lib/jide-action.jar','lib/jide-charts.jar','lib/jide-common.jar','lib/jide-components.jar','lib/jide-diff.jar','lib/jide-dock.jar','lib/jide-editor.jar','lib/jide-gantt.jar','lib/jide-grids.jar','lib/jide-shortcut.jar','lib/jimi.jar','lib/jna.jar','lib/jnp-client.jar','lib/jsr250-api-1.0.jar','lib/jsr305.jar','lib/jtidy.jar','lib/lucene-analyzers-common-7.5.0.jar','lib/lucene-core-7.5.0.jar','lib/lucene-misc-7.5.0.jar','lib/poi-3.14-20160307.jar','lib/poi-ooxml-3.14-20160307.jar','lib/poi-ooxml-schemas-3.14-20160307.jar','lib/webservice/axis-config.jar','lib/webservice/axis.jar','lib/webservice/commons-discovery-0.2.jar','lib/webservice/jaxrpc.jar','lib/webservice/mdserviceclient.jar','lib/webservice/rsclient.jar','lib/webservice/wsdl4j-1.5.1.jar','lib/xalan.jar','lib/xmlbeans-2.6.0.jar','lib/y.jar'] From c7d0fabf2ce58ba888cc4c7895d7ecb96fc99252 Mon Sep 17 00:00:00 2001 From: Enquier Date: Thu, 28 Oct 2021 14:52:36 -0600 Subject: [PATCH 15/28] Attempt to rebuild tests --- .circleci/config.yml | 2 +- buildProfiles/internal.properties | 2 +- lgtm.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d1c90263a..3b313398b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -48,7 +48,7 @@ jobs: - run: name: Compile - command: ./gradlew --refresh-dependencies --info --stacktrace clean assemble + command: ./gradlew --refresh-dependencies --info --stacktrace -PbuildAccess=opensource clean assemble # # Test # - run: diff --git a/buildProfiles/internal.properties b/buildProfiles/internal.properties index 973fecb92..f57af0cbe 100644 --- a/buildProfiles/internal.properties +++ b/buildProfiles/internal.properties @@ -1 +1 @@ -classpathLibraries = ['lib/patch.jar','lib/brand.jar','lib/brand_api.jar','lib/md.jar','lib/md_api.jar','lib/md_common.jar','lib/md_common_api.jar','lib/md_common_test.jar','lib/tw_common.jar','lib/tw_common_api.jar','lib/launcher.jar','lib/activation.jar','lib/annotation.jar','lib/batik.jar','lib/bridj-0.7.0.jar','lib/bundles/ch.qos.logback.classic_1.2.3.jar','lib/bundles/ch.qos.logback.core_1.2.3.jar','lib/bundles/cmof_1.4.0.202006020804/cmof14.jar','lib/bundles/cmof_1.4.0.202006020804/tas.jar','lib/bundles/com.esotericsoftware.kryo_2.22.0.201401231130.jar','lib/bundles/com.google.guava_18.0.0.jar','lib/bundles/com.nomagic.annotations_1.0.0/com.nomagic.annotation-1.0.jar','lib/bundles/com.nomagic.ci.binary_17.0.5.v20200602-0758.jar','lib/bundles/com.nomagic.ci.metamodel.project_17.0.5.v20200602-0758.jar','lib/bundles/com.nomagic.ci.persistence.local_17.0.5.v20200602-0758.jar','lib/bundles/com.nomagic.ci.persistence_17.0.5.v20200602-0758.jar','lib/bundles/com.nomagic.ci.services_17.0.5.v20200602-0758.jar','lib/bundles/com.nomagic.ci_17.0.5.v20200602-0758.jar','lib/bundles/com.nomagic.magicdraw.ce_18.1.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.core.diagram_18.1.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.core.project.options_18.1.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.core_1.0.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.esi.binary.metamodel_18.1.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.esi.esiproject_18.1.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.esi.uuidmap_18.1.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.foundation_2.0.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.osgi.fragment_1.0.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.security_18.3.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.uml2_2.5.1.202006020804.jar','lib/bundles/com.nomagic.magicdraw_17.0.5.202006020804.jar','lib/bundles/com.teamdev.jxbrowser.chromium.internal.linux64_6.24.1.jar','lib/bundles/com.teamdev.jxbrowser.chromium.internal.mac_6.24.1.jar','lib/bundles/com.teamdev.jxbrowser.chromium.internal.win32_6.24.1.jar','lib/bundles/com.teamdev.jxbrowser.chromium.internal.win64_6.24.1.jar','lib/bundles/com.teamdev.jxbrowser.chromium_6.24.1.jar','lib/bundles/com.typesafe.config_1.3.0.jar','lib/bundles/com.typesafe.sslconfig_0.2.2.jar','lib/bundles/de.schlichtherle.truezip_7.4.3.v20200602-0758/lib/truezip-driver-zip-7.4.3.jar','lib/bundles/de.schlichtherle.truezip_7.4.3.v20200602-0758/lib/truezip-kernel-7.4.3.jar','lib/bundles/gnu.trove_3.0.3/lib/trove-3.0.3.jar','lib/bundles/io.aeron.client_1.7.0.jar','lib/bundles/io.aeron.driver_1.7.0.jar','lib/bundles/io.dropwizard.metrics.core_3.1.2.jar','lib/bundles/io.dropwizard.metrics.graphite_3.1.2.jar','lib/bundles/io.netty.buffer_4.1.21.Final.jar','lib/bundles/io.netty.codec_4.1.21.Final.jar','lib/bundles/io.netty.common_4.1.21.Final.jar','lib/bundles/io.netty.handler_4.1.21.Final.jar','lib/bundles/io.netty.resolver_4.1.21.Final.jar','lib/bundles/io.netty.transport_4.1.21.Final.jar','lib/bundles/javax.jmi_1.0.0.202006020804/javax_jmi-1_0-fr.jar','lib/bundles/joda-time_2.9.1.jar','lib/bundles/lz4-java_1.3.0.jar','lib/bundles/org.agrona_0.9.12.jar','lib/bundles/org.apache.commons.codec_1.9.0.v20170208-1614.jar','lib/bundles/org.apache.commons.collections_3.2.1.jar','lib/bundles/org.apache.commons.compress_1.3.0.jar','lib/bundles/org.apache.commons.io_2.4.0.jar','lib/bundles/org.apache.commons.lang_2.6.0.v201404270220.jar','lib/bundles/org.apache.commons.logging_1.1.1.v201101211721.jar','lib/bundles/org.apache.felix.scr_2.0.10.v20170501-2007.jar','lib/bundles/org.apache.httpcomponents.httpclient_4.5.3.jar','lib/bundles/org.apache.httpcomponents.httpcore_4.4.6.v20170210-0925.jar','lib/bundles/org.apache.log4j_1.2.15.v201005080500.jar','lib/bundles/org.apache.servicemix.bundles.jsr305_2.0.1.1.jar','lib/bundles/org.apiguardian_1.1.0.v20190826-0900.jar','lib/bundles/org.eclipse.core.contenttype_3.6.0.v20170207-1037.jar','lib/bundles/org.eclipse.core.jobs_3.9.2.v20171030-1027.jar','lib/bundles/org.eclipse.core.runtime_3.13.0.v20170207-1030.jar','lib/bundles/org.eclipse.emf.common_2.13.0.v20170609-0707.jar','lib/bundles/org.eclipse.emf.ecore.xmi_2.13.0.v20170609-0707.jar','lib/bundles/org.eclipse.emf.ecore_2.13.0.v20170609-0707.jar','lib/bundles/org.eclipse.equinox.app_1.3.400.v20150715-1528.jar','lib/bundles/org.eclipse.equinox.common_3.9.0.v20170207-1454.jar','lib/bundles/org.eclipse.equinox.ds_1.5.0.v20170307-1429.jar','lib/bundles/org.eclipse.equinox.preferences_3.7.0.v20170126-2132.jar','lib/bundles/org.eclipse.equinox.registry_3.7.0.v20170222-1344.jar','lib/bundles/org.eclipse.osgi.services_3.6.0.v20170228-1906.jar','lib/bundles/org.eclipse.osgi.util_3.4.0.v20170111-1608.jar','lib/bundles/org.eclipse.osgi_3.12.50.v20170928-1321.jar','lib/bundles/org.eclipse.uml2.common_1.5.0.v200905041045.jar','lib/bundles/org.hamcrest.core_1.3.0.v201303031735.jar','lib/bundles/org.jboss.netty_3.10.6.Final.jar','lib/bundles/org.json_1.0.0.255610281323.jar','lib/bundles/org.junit.jupiter.api_5.5.1.v20190826-0900.jar','lib/bundles/org.junit.jupiter.params_5.5.1.v20190826-0900.jar','lib/bundles/org.junit.platform.commons_1.5.1.v20190826-0900.jar','lib/bundles/org.junit_4.12.0.v201504281640/junit.jar','lib/bundles/org.opentest4j_1.2.0.v20190826-0900.jar','lib/bundles/org.reactivestreams.reactive-streams_1.0.2.jar','lib/bundles/org.uncommons.maths_1.2.2.201301151508/lib/uncommons-maths-1.2.2a.jar','lib/bundles/slf4j.api_1.7.25.jar','lib/com.nomagic.osgi.launcher-17.0.5-SNAPSHOT.jar','lib/commons-compress-1.3.jar','lib/commons-httpclient-3.1.jar','lib/commons-logging-1.0.4.jar','lib/concurrent.jar','lib/EccpressoAll.jar','lib/ehcache-2.10.1.jar','lib/flexlm.jar','lib/graphics/clibwrapper_jiio.jar','lib/graphics/freehep-base.jar','lib/graphics/freehep-graphics2d.jar','lib/graphics/freehep-graphicsio-emf.jar','lib/graphics/freehep-graphicsio-ps.jar','lib/graphics/freehep-graphicsio.jar','lib/graphics/jai_imageio.jar','lib/gson-2.2.4.jar','lib/HTMLEditorLight.jar','lib/hunspell-bridj-1.0.5-SNAPSHOT.jar','lib/javassist.jar','lib/jhall.jar','lib/jide-action.jar','lib/jide-charts.jar','lib/jide-common.jar','lib/jide-components.jar','lib/jide-diff.jar','lib/jide-dock.jar','lib/jide-editor.jar','lib/jide-gantt.jar','lib/jide-grids.jar','lib/jide-shortcut.jar','lib/jimi.jar','lib/jna.jar','lib/jnp-client.jar','lib/jtidy-sources.zip','lib/jtidy.jar','lib/JUnitParams-1.0.1.jar','lib/lucene-analyzers-common-7.5.0.jar','lib/lucene-core-7.5.0.jar','lib/lucene-misc-7.5.0.jar','lib/poi-3.14-20160307.jar','lib/poi-ooxml-3.14-20160307.jar','lib/poi-ooxml-schemas-3.14-20160307.jar','lib/webservice/axis-config.jar','lib/webservice/axis.jar','lib/webservice/commons-discovery-0.2.jar','lib/webservice/jaxrpc.jar','lib/webservice/mdserviceclient.jar','lib/webservice/rsclient.jar','lib/webservice/wsdl4j-1.5.1.jar','lib/xalan.jar','lib/xmlbeans-2.6.0.jar','lib/y.jar'] \ No newline at end of file +classpathLibraries = ['lib/patch.jar','lib/brand.jar','lib/brand_api.jar','lib/md.jar','lib/md_api.jar','lib/md_common.jar','lib/md_common_api.jar','lib/md_common_test.jar','lib/tw_common.jar','lib/tw_common_api.jar','lib/launcher.jar','lib/activation.jar','lib/annotation.jar','lib/batik.jar','lib/bridj-0.7.0.jar','lib/bundles/ch.qos.logback.classic_1.2.3.jar','lib/bundles/ch.qos.logback.core_1.2.3.jar','lib/bundles/cmof_1.4.0.202006020804/cmof14.jar','lib/bundles/cmof_1.4.0.202006020804/tas.jar','lib/bundles/com.esotericsoftware.kryo_2.22.0.201401231130.jar','lib/bundles/com.google.guava_18.0.0.jar','lib/bundles/com.nomagic.annotations_1.0.0/com.nomagic.annotation-1.0.jar','lib/bundles/com.nomagic.ci.binary_17.0.5.v20200602-0758.jar','lib/bundles/com.nomagic.ci.metamodel.project_17.0.5.v20200602-0758.jar','lib/bundles/com.nomagic.ci.persistence.local_17.0.5.v20200602-0758.jar','lib/bundles/com.nomagic.ci.persistence_17.0.5.v20200602-0758.jar','lib/bundles/com.nomagic.ci.services_17.0.5.v20200602-0758.jar','lib/bundles/com.nomagic.ci_17.0.5.v20200602-0758.jar','lib/bundles/com.nomagic.magicdraw.ce_18.1.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.core.diagram_18.1.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.core.project.options_18.1.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.core_1.0.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.esi.binary.metamodel_18.1.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.esi.esiproject_18.1.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.esi.uuidmap_18.1.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.foundation_2.0.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.osgi.fragment_1.0.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.security_18.3.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.uml2_2.5.1.202006020804.jar','lib/bundles/com.nomagic.magicdraw_17.0.5.202006020804.jar','lib/bundles/com.teamdev.jxbrowser.chromium.internal.linux64_6.24.1.jar','lib/bundles/com.teamdev.jxbrowser.chromium.internal.mac_6.24.1.jar','lib/bundles/com.teamdev.jxbrowser.chromium.internal.win32_6.24.1.jar','lib/bundles/com.teamdev.jxbrowser.chromium.internal.win64_6.24.1.jar','lib/bundles/com.teamdev.jxbrowser.chromium_6.24.1.jar','lib/bundles/com.typesafe.config_1.3.0.jar','lib/bundles/com.typesafe.sslconfig_0.2.2.jar','lib/bundles/de.schlichtherle.truezip_7.4.3.v20200602-0758/lib/truezip-driver-zip-7.4.3.jar','lib/bundles/de.schlichtherle.truezip_7.4.3.v20200602-0758/lib/truezip-kernel-7.4.3.jar','lib/bundles/gnu.trove_3.0.3/lib/trove-3.0.3.jar','lib/bundles/io.aeron.client_1.7.0.jar','lib/bundles/io.aeron.driver_1.7.0.jar','lib/bundles/io.dropwizard.metrics.core_3.1.2.jar','lib/bundles/io.dropwizard.metrics.graphite_3.1.2.jar','lib/bundles/io.netty.buffer_4.1.21.Final.jar','lib/bundles/io.netty.codec_4.1.21.Final.jar','lib/bundles/io.netty.common_4.1.21.Final.jar','lib/bundles/io.netty.handler_4.1.21.Final.jar','lib/bundles/io.netty.resolver_4.1.21.Final.jar','lib/bundles/io.netty.transport_4.1.21.Final.jar','lib/bundles/javax.jmi_1.0.0.202006020804/javax_jmi-1_0-fr.jar','lib/bundles/joda-time_2.9.1.jar','lib/bundles/lz4-java_1.3.0.jar','lib/bundles/org.agrona_0.9.12.jar','lib/bundles/org.apache.commons.codec_1.9.0.v20170208-1614.jar','lib/bundles/org.apache.commons.collections_3.2.1.jar','lib/bundles/org.apache.commons.compress_1.3.0.jar','lib/bundles/org.apache.commons.io_2.4.0.jar','lib/bundles/org.apache.commons.lang_2.6.0.v201404270220.jar','lib/bundles/org.apache.commons.logging_1.1.1.v201101211721.jar','lib/bundles/org.apache.felix.scr_2.0.10.v20170501-2007.jar','lib/bundles/org.apache.httpcomponents.httpclient_4.5.3.jar','lib/bundles/org.apache.httpcomponents.httpcore_4.4.6.v20170210-0925.jar','lib/bundles/org.apache.log4j_1.2.15.v201005080500.jar','lib/bundles/org.apache.servicemix.bundles.jsr305_2.0.1.1.jar','lib/bundles/org.apiguardian_1.1.0.v20190826-0900.jar','lib/bundles/org.eclipse.core.contenttype_3.6.0.v20170207-1037.jar','lib/bundles/org.eclipse.core.jobs_3.9.2.v20171030-1027.jar','lib/bundles/org.eclipse.core.runtime_3.13.0.v20170207-1030.jar','lib/bundles/org.eclipse.emf.common_2.13.0.v20170609-0707.jar','lib/bundles/org.eclipse.emf.ecore.xmi_2.13.0.v20170609-0707.jar','lib/bundles/org.eclipse.emf.ecore_2.13.0.v20170609-0707.jar','lib/bundles/org.eclipse.equinox.app_1.3.400.v20150715-1528.jar','lib/bundles/org.eclipse.equinox.common_3.9.0.v20170207-1454.jar','lib/bundles/org.eclipse.equinox.ds_1.5.0.v20170307-1429.jar','lib/bundles/org.eclipse.equinox.preferences_3.7.0.v20170126-2132.jar','lib/bundles/org.eclipse.equinox.registry_3.7.0.v20170222-1344.jar','lib/bundles/org.eclipse.osgi.services_3.6.0.v20170228-1906.jar','lib/bundles/org.eclipse.osgi.util_3.4.0.v20170111-1608.jar','lib/bundles/org.eclipse.osgi_3.12.50.v20170928-1321.jar','lib/bundles/org.eclipse.uml2.common_1.5.0.v200905041045.jar','lib/bundles/org.hamcrest.core_1.3.0.v201303031735.jar','lib/bundles/org.jboss.netty_3.10.6.Final.jar','lib/bundles/org.json_1.0.0.255610281323.jar','lib/bundles/org.junit.jupiter.api_5.5.1.v20190826-0900.jar','lib/bundles/org.junit.jupiter.params_5.5.1.v20190826-0900.jar','lib/bundles/org.junit.platform.commons_1.5.1.v20190826-0900.jar','lib/bundles/org.junit_4.12.0.v201504281640/junit.jar','lib/bundles/org.opentest4j_1.2.0.v20190826-0900.jar','lib/bundles/org.reactivestreams.reactive-streams_1.0.2.jar','lib/bundles/org.uncommons.maths_1.2.2.201301151508/lib/uncommons-maths-1.2.2a.jar','lib/bundles/slf4j.api_1.7.25.jar','lib/com.nomagic.osgi.launcher-17.0.5-SNAPSHOT.jar','lib/commons-compress-1.3.jar','lib/commons-httpclient-3.1.jar','lib/commons-logging-1.0.4.jar','lib/concurrent.jar','lib/EccpressoAll.jar','lib/ehcache-2.10.1.jar','lib/flexlm.jar','lib/graphics/clibwrapper_jiio.jar','lib/graphics/freehep-base.jar','lib/graphics/freehep-graphics2d.jar','lib/graphics/freehep-graphicsio-emf.jar','lib/graphics/freehep-graphicsio-ps.jar','lib/graphics/freehep-graphicsio.jar','lib/graphics/jai_imageio.jar','lib/gson-2.2.4.jar','lib/HTMLEditorLight.jar','lib/hunspell-bridj-1.0.5-SNAPSHOT.jar','lib/javassist.jar','lib/jhall.jar','lib/jide-action.jar','lib/jide-charts.jar','lib/jide-common.jar','lib/jide-components.jar','lib/jide-diff.jar','lib/jide-dock.jar','lib/jide-editor.jar','lib/jide-gantt.jar','lib/jide-grids.jar','lib/jide-shortcut.jar','lib/jimi.jar','lib/jna.jar','lib/jnp-client.jar','lib/jtidy-sources.zip','lib/jtidy.jar','lib/JUnitParams-1.0.1.jar','lib/lucene-analyzers-common-7.5.0.jar','lib/lucene-core-7.5.0.jar','lib/lucene-misc-7.5.0.jar','lib/poi-3.14-20160307.jar','lib/poi-ooxml-3.14-20160307.jar','lib/poi-ooxml-schemas-3.14-20160307.jar','lib/webservice/axis-config.jar','lib/webservice/axis.jar','lib/webservice/commons-discovery-0.2.jar','lib/webservice/jaxrpc.jar','lib/webservice/mdserviceclient.jar','lib/webservice/rsclient.jar','lib/webservice/wsdl4j-1.5.1.jar','lib/xalan.jar','lib/xmlbeans-2.6.0.jar','lib/y.jar'] diff --git a/lgtm.yml b/lgtm.yml index ed530b084..1db806178 100644 --- a/lgtm.yml +++ b/lgtm.yml @@ -2,4 +2,4 @@ extraction: java: index: build_command: - - ./gradlew -Dorg.gradle.jvmargs=-Xmx2g --no-daemon -S testClasses + - ./gradlew -Dorg.gradle.jvmargs=-Xmx2g --no-daemon -S testClasses -PbuildAccess=opensource From 917504ddf0832e2b988d13dd737886774535df34 Mon Sep 17 00:00:00 2001 From: Enquier Date: Thu, 28 Oct 2021 14:53:24 -0600 Subject: [PATCH 16/28] fix lgtm --- lgtm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgtm.yml b/lgtm.yml index 1db806178..460d0dd3a 100644 --- a/lgtm.yml +++ b/lgtm.yml @@ -2,4 +2,4 @@ extraction: java: index: build_command: - - ./gradlew -Dorg.gradle.jvmargs=-Xmx2g --no-daemon -S testClasses -PbuildAccess=opensource + - ./gradlew -Dorg.gradle.jvmargs=-Xmx2g --no-daemon -S -PbuildAccess=opensource testClasses From d4a83120cfae37af0ab3cd7a1a604ce211ff9536 Mon Sep 17 00:00:00 2001 From: Enquier Date: Thu, 28 Oct 2021 14:55:57 -0600 Subject: [PATCH 17/28] try again with circle-ci --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3b313398b..387bee781 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -38,7 +38,7 @@ jobs: - gradle-repo-v5- - run: name: Download uncached dependencies - command: ./gradlew dependencies + command: ./gradlew -PbuildAccess=opensource dependencies no_output_timeout: 1h - save_cache: @@ -91,7 +91,7 @@ jobs: at: ~/ - run: name: Deploy snapshot - command: ./gradlew --info --stacktrace publishToSonatype + command: ./gradlew --info --stacktrace -PbuildAccess=opensource publishToSonatype deploy_release: executor: openjdk_executor steps: @@ -100,7 +100,7 @@ jobs: at: ~/ - run: name: Deploy release - command: ./gradlew --info --stacktrace publishToSonatype closeSonatypeStagingRepository + command: ./gradlew --info --stacktrace -PbuildAccess=opensource publishToSonatype closeSonatypeStagingRepository workflows: version: 2 From 285d2df3465395804d25879170dc9d7bb52b7ecf Mon Sep 17 00:00:00 2001 From: Enquier Date: Thu, 28 Oct 2021 14:57:45 -0600 Subject: [PATCH 18/28] and.. spelling is tech --- buildProfiles/{opesource.properties => opensource.properties} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename buildProfiles/{opesource.properties => opensource.properties} (100%) diff --git a/buildProfiles/opesource.properties b/buildProfiles/opensource.properties similarity index 100% rename from buildProfiles/opesource.properties rename to buildProfiles/opensource.properties From 6699c09c744be8faa036132a3442fe7f043d7178 Mon Sep 17 00:00:00 2001 From: Enquier Date: Thu, 28 Oct 2021 15:24:05 -0600 Subject: [PATCH 19/28] Fix variable formatting and processing --- build.gradle | 2 +- buildProfiles/internal.properties | 3 ++- buildProfiles/opensource.properties | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 0f45e7fa5..bcd37d41d 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ try { println "Profile Properties File not found using default:" + e.message file("buildProfiles/opensource.properties").withInputStream { profiles.load(it) } } -String[] classpathLibraries = profiles.getProperty("classpathLibraries"); +String[] classpathLibraries = profiles["classpathLibraries"].toString().split(','); String docbookNameVersion = 'docbook-xsl-1.79.1' String fopNameVersion = 'fop-1.1' diff --git a/buildProfiles/internal.properties b/buildProfiles/internal.properties index f57af0cbe..81823fa47 100644 --- a/buildProfiles/internal.properties +++ b/buildProfiles/internal.properties @@ -1 +1,2 @@ -classpathLibraries = ['lib/patch.jar','lib/brand.jar','lib/brand_api.jar','lib/md.jar','lib/md_api.jar','lib/md_common.jar','lib/md_common_api.jar','lib/md_common_test.jar','lib/tw_common.jar','lib/tw_common_api.jar','lib/launcher.jar','lib/activation.jar','lib/annotation.jar','lib/batik.jar','lib/bridj-0.7.0.jar','lib/bundles/ch.qos.logback.classic_1.2.3.jar','lib/bundles/ch.qos.logback.core_1.2.3.jar','lib/bundles/cmof_1.4.0.202006020804/cmof14.jar','lib/bundles/cmof_1.4.0.202006020804/tas.jar','lib/bundles/com.esotericsoftware.kryo_2.22.0.201401231130.jar','lib/bundles/com.google.guava_18.0.0.jar','lib/bundles/com.nomagic.annotations_1.0.0/com.nomagic.annotation-1.0.jar','lib/bundles/com.nomagic.ci.binary_17.0.5.v20200602-0758.jar','lib/bundles/com.nomagic.ci.metamodel.project_17.0.5.v20200602-0758.jar','lib/bundles/com.nomagic.ci.persistence.local_17.0.5.v20200602-0758.jar','lib/bundles/com.nomagic.ci.persistence_17.0.5.v20200602-0758.jar','lib/bundles/com.nomagic.ci.services_17.0.5.v20200602-0758.jar','lib/bundles/com.nomagic.ci_17.0.5.v20200602-0758.jar','lib/bundles/com.nomagic.magicdraw.ce_18.1.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.core.diagram_18.1.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.core.project.options_18.1.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.core_1.0.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.esi.binary.metamodel_18.1.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.esi.esiproject_18.1.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.esi.uuidmap_18.1.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.foundation_2.0.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.osgi.fragment_1.0.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.security_18.3.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.uml2_2.5.1.202006020804.jar','lib/bundles/com.nomagic.magicdraw_17.0.5.202006020804.jar','lib/bundles/com.teamdev.jxbrowser.chromium.internal.linux64_6.24.1.jar','lib/bundles/com.teamdev.jxbrowser.chromium.internal.mac_6.24.1.jar','lib/bundles/com.teamdev.jxbrowser.chromium.internal.win32_6.24.1.jar','lib/bundles/com.teamdev.jxbrowser.chromium.internal.win64_6.24.1.jar','lib/bundles/com.teamdev.jxbrowser.chromium_6.24.1.jar','lib/bundles/com.typesafe.config_1.3.0.jar','lib/bundles/com.typesafe.sslconfig_0.2.2.jar','lib/bundles/de.schlichtherle.truezip_7.4.3.v20200602-0758/lib/truezip-driver-zip-7.4.3.jar','lib/bundles/de.schlichtherle.truezip_7.4.3.v20200602-0758/lib/truezip-kernel-7.4.3.jar','lib/bundles/gnu.trove_3.0.3/lib/trove-3.0.3.jar','lib/bundles/io.aeron.client_1.7.0.jar','lib/bundles/io.aeron.driver_1.7.0.jar','lib/bundles/io.dropwizard.metrics.core_3.1.2.jar','lib/bundles/io.dropwizard.metrics.graphite_3.1.2.jar','lib/bundles/io.netty.buffer_4.1.21.Final.jar','lib/bundles/io.netty.codec_4.1.21.Final.jar','lib/bundles/io.netty.common_4.1.21.Final.jar','lib/bundles/io.netty.handler_4.1.21.Final.jar','lib/bundles/io.netty.resolver_4.1.21.Final.jar','lib/bundles/io.netty.transport_4.1.21.Final.jar','lib/bundles/javax.jmi_1.0.0.202006020804/javax_jmi-1_0-fr.jar','lib/bundles/joda-time_2.9.1.jar','lib/bundles/lz4-java_1.3.0.jar','lib/bundles/org.agrona_0.9.12.jar','lib/bundles/org.apache.commons.codec_1.9.0.v20170208-1614.jar','lib/bundles/org.apache.commons.collections_3.2.1.jar','lib/bundles/org.apache.commons.compress_1.3.0.jar','lib/bundles/org.apache.commons.io_2.4.0.jar','lib/bundles/org.apache.commons.lang_2.6.0.v201404270220.jar','lib/bundles/org.apache.commons.logging_1.1.1.v201101211721.jar','lib/bundles/org.apache.felix.scr_2.0.10.v20170501-2007.jar','lib/bundles/org.apache.httpcomponents.httpclient_4.5.3.jar','lib/bundles/org.apache.httpcomponents.httpcore_4.4.6.v20170210-0925.jar','lib/bundles/org.apache.log4j_1.2.15.v201005080500.jar','lib/bundles/org.apache.servicemix.bundles.jsr305_2.0.1.1.jar','lib/bundles/org.apiguardian_1.1.0.v20190826-0900.jar','lib/bundles/org.eclipse.core.contenttype_3.6.0.v20170207-1037.jar','lib/bundles/org.eclipse.core.jobs_3.9.2.v20171030-1027.jar','lib/bundles/org.eclipse.core.runtime_3.13.0.v20170207-1030.jar','lib/bundles/org.eclipse.emf.common_2.13.0.v20170609-0707.jar','lib/bundles/org.eclipse.emf.ecore.xmi_2.13.0.v20170609-0707.jar','lib/bundles/org.eclipse.emf.ecore_2.13.0.v20170609-0707.jar','lib/bundles/org.eclipse.equinox.app_1.3.400.v20150715-1528.jar','lib/bundles/org.eclipse.equinox.common_3.9.0.v20170207-1454.jar','lib/bundles/org.eclipse.equinox.ds_1.5.0.v20170307-1429.jar','lib/bundles/org.eclipse.equinox.preferences_3.7.0.v20170126-2132.jar','lib/bundles/org.eclipse.equinox.registry_3.7.0.v20170222-1344.jar','lib/bundles/org.eclipse.osgi.services_3.6.0.v20170228-1906.jar','lib/bundles/org.eclipse.osgi.util_3.4.0.v20170111-1608.jar','lib/bundles/org.eclipse.osgi_3.12.50.v20170928-1321.jar','lib/bundles/org.eclipse.uml2.common_1.5.0.v200905041045.jar','lib/bundles/org.hamcrest.core_1.3.0.v201303031735.jar','lib/bundles/org.jboss.netty_3.10.6.Final.jar','lib/bundles/org.json_1.0.0.255610281323.jar','lib/bundles/org.junit.jupiter.api_5.5.1.v20190826-0900.jar','lib/bundles/org.junit.jupiter.params_5.5.1.v20190826-0900.jar','lib/bundles/org.junit.platform.commons_1.5.1.v20190826-0900.jar','lib/bundles/org.junit_4.12.0.v201504281640/junit.jar','lib/bundles/org.opentest4j_1.2.0.v20190826-0900.jar','lib/bundles/org.reactivestreams.reactive-streams_1.0.2.jar','lib/bundles/org.uncommons.maths_1.2.2.201301151508/lib/uncommons-maths-1.2.2a.jar','lib/bundles/slf4j.api_1.7.25.jar','lib/com.nomagic.osgi.launcher-17.0.5-SNAPSHOT.jar','lib/commons-compress-1.3.jar','lib/commons-httpclient-3.1.jar','lib/commons-logging-1.0.4.jar','lib/concurrent.jar','lib/EccpressoAll.jar','lib/ehcache-2.10.1.jar','lib/flexlm.jar','lib/graphics/clibwrapper_jiio.jar','lib/graphics/freehep-base.jar','lib/graphics/freehep-graphics2d.jar','lib/graphics/freehep-graphicsio-emf.jar','lib/graphics/freehep-graphicsio-ps.jar','lib/graphics/freehep-graphicsio.jar','lib/graphics/jai_imageio.jar','lib/gson-2.2.4.jar','lib/HTMLEditorLight.jar','lib/hunspell-bridj-1.0.5-SNAPSHOT.jar','lib/javassist.jar','lib/jhall.jar','lib/jide-action.jar','lib/jide-charts.jar','lib/jide-common.jar','lib/jide-components.jar','lib/jide-diff.jar','lib/jide-dock.jar','lib/jide-editor.jar','lib/jide-gantt.jar','lib/jide-grids.jar','lib/jide-shortcut.jar','lib/jimi.jar','lib/jna.jar','lib/jnp-client.jar','lib/jtidy-sources.zip','lib/jtidy.jar','lib/JUnitParams-1.0.1.jar','lib/lucene-analyzers-common-7.5.0.jar','lib/lucene-core-7.5.0.jar','lib/lucene-misc-7.5.0.jar','lib/poi-3.14-20160307.jar','lib/poi-ooxml-3.14-20160307.jar','lib/poi-ooxml-schemas-3.14-20160307.jar','lib/webservice/axis-config.jar','lib/webservice/axis.jar','lib/webservice/commons-discovery-0.2.jar','lib/webservice/jaxrpc.jar','lib/webservice/mdserviceclient.jar','lib/webservice/rsclient.jar','lib/webservice/wsdl4j-1.5.1.jar','lib/xalan.jar','lib/xmlbeans-2.6.0.jar','lib/y.jar'] +classpathLibraries = "lib/patch.jar,lib/brand.jar,lib/brand_api.jar,lib/md.jar,lib/md_api.jar,lib/md_common.jar,lib/md_common_api.jar,lib/md_common_test.jar,lib/tw_common.jar,lib/tw_common_api.jar,lib/launcher.jar,lib/activation.jar,lib/annotation.jar,lib/batik.jar,lib/bridj-0.7.0.jar,lib/bundles/ch.qos.logback.classic_1.2.3.jar,lib/bundles/ch.qos.logback.core_1.2.3.jar,lib/bundles/cmof_1.4.0.202006020804/cmof14.jar,lib/bundles/cmof_1.4.0.202006020804/tas.jar,lib/bundles/com.esotericsoftware.kryo_2.22.0.201401231130.jar,lib/bundles/com.google.guava_18.0.0.jar,lib/bundles/com.nomagic.annotations_1.0.0/com.nomagic.annotation-1.0.jar,lib/bundles/com.nomagic.ci.binary_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.ci.metamodel.project_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.ci.persistence.local_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.ci.persistence_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.ci.services_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.ci_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.magicdraw.ce_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.core.diagram_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.core.project.options_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.core_1.0.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.esi.binary.metamodel_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.esi.esiproject_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.esi.uuidmap_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.foundation_2.0.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.osgi.fragment_1.0.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.security_18.3.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.uml2_2.5.1.202006020804.jar,lib/bundles/com.nomagic.magicdraw_17.0.5.202006020804.jar,lib/bundles/com.teamdev.jxbrowser.chromium.internal.linux64_6.24.1.jar,lib/bundles/com.teamdev.jxbrowser.chromium.internal.mac_6.24.1.jar,lib/bundles/com.teamdev.jxbrowser.chromium.internal.win32_6.24.1.jar,lib/bundles/com.teamdev.jxbrowser.chromium.internal.win64_6.24.1.jar,lib/bundles/com.teamdev.jxbrowser.chromium_6.24.1.jar,lib/bundles/com.typesafe.config_1.3.0.jar,lib/bundles/com.typesafe.sslconfig_0.2.2.jar,lib/bundles/de.schlichtherle.truezip_7.4.3.v20200602-0758/lib/truezip-driver-zip-7.4.3.jar,lib/bundles/de.schlichtherle.truezip_7.4.3.v20200602-0758/lib/truezip-kernel-7.4.3.jar,lib/bundles/gnu.trove_3.0.3/lib/trove-3.0.3.jar,lib/bundles/io.aeron.client_1.7.0.jar,lib/bundles/io.aeron.driver_1.7.0.jar,lib/bundles/io.dropwizard.metrics.core_3.1.2.jar,lib/bundles/io.dropwizard.metrics.graphite_3.1.2.jar,lib/bundles/io.netty.buffer_4.1.21.Final.jar,lib/bundles/io.netty.codec_4.1.21.Final.jar,lib/bundles/io.netty.common_4.1.21.Final.jar,lib/bundles/io.netty.handler_4.1.21.Final.jar,lib/bundles/io.netty.resolver_4.1.21.Final.jar,lib/bundles/io.netty.transport_4.1.21.Final.jar,lib/bundles/javax.jmi_1.0.0.202006020804/javax_jmi-1_0-fr.jar,lib/bundles/joda-time_2.9.1.jar,lib/bundles/lz4-java_1.3.0.jar,lib/bundles/org.agrona_0.9.12.jar,lib/bundles/org.apache.commons.codec_1.9.0.v20170208-1614.jar,lib/bundles/org.apache.commons.collections_3.2.1.jar,lib/bundles/org.apache.commons.compress_1.3.0.jar,lib/bundles/org.apache.commons.io_2.4.0.jar,lib/bundles/org.apache.commons.lang_2.6.0.v201404270220.jar,lib/bundles/org.apache.commons.logging_1.1.1.v201101211721.jar,lib/bundles/org.apache.felix.scr_2.0.10.v20170501-2007.jar,lib/bundles/org.apache.httpcomponents.httpclient_4.5.3.jar,lib/bundles/org.apache.httpcomponents.httpcore_4.4.6.v20170210-0925.jar,lib/bundles/org.apache.log4j_1.2.15.v201005080500.jar,lib/bundles/org.apache.servicemix.bundles.jsr305_2.0.1.1.jar,lib/bundles/org.apiguardian_1.1.0.v20190826-0900.jar,lib/bundles/org.eclipse.core.contenttype_3.6.0.v20170207-1037.jar,lib/bundles/org.eclipse.core.jobs_3.9.2.v20171030-1027.jar,lib/bundles/org.eclipse.core.runtime_3.13.0.v20170207-1030.jar,lib/bundles/org.eclipse.emf.common_2.13.0.v20170609-0707.jar,lib/bundles/org.eclipse.emf.ecore.xmi_2.13.0.v20170609-0707.jar,lib/bundles/org.eclipse.emf.ecore_2.13.0.v20170609-0707.jar,lib/bundles/org.eclipse.equinox.app_1.3.400.v20150715-1528.jar,lib/bundles/org.eclipse.equinox.common_3.9.0.v20170207-1454.jar,lib/bundles/org.eclipse.equinox.ds_1.5.0.v20170307-1429.jar,lib/bundles/org.eclipse.equinox.preferences_3.7.0.v20170126-2132.jar,lib/bundles/org.eclipse.equinox.registry_3.7.0.v20170222-1344.jar,lib/bundles/org.eclipse.osgi.services_3.6.0.v20170228-1906.jar,lib/bundles/org.eclipse.osgi.util_3.4.0.v20170111-1608.jar,lib/bundles/org.eclipse.osgi_3.12.50.v20170928-1321.jar,lib/bundles/org.eclipse.uml2.common_1.5.0.v200905041045.jar,lib/bundles/org.hamcrest.core_1.3.0.v201303031735.jar,lib/bundles/org.jboss.netty_3.10.6.Final.jar,lib/bundles/org.json_1.0.0.255610281323.jar,lib/bundles/org.junit.jupiter.api_5.5.1.v20190826-0900.jar,lib/bundles/org.junit.jupiter.params_5.5.1.v20190826-0900.jar,lib/bundles/org.junit.platform.commons_1.5.1.v20190826-0900.jar,lib/bundles/org.junit_4.12.0.v201504281640/junit.jar,lib/bundles/org.opentest4j_1.2.0.v20190826-0900.jar,lib/bundles/org.reactivestreams.reactive-streams_1.0.2.jar,lib/bundles/org.uncommons.maths_1.2.2.201301151508/lib/uncommons-maths-1.2.2a.jar,lib/bundles/slf4j.api_1.7.25.jar,lib/com.nomagic.osgi.launcher-17.0.5-SNAPSHOT.jar,lib/commons-compress-1.3.jar,lib/commons-httpclient-3.1.jar,lib/commons-logging-1.0.4.jar,lib/concurrent.jar,lib/EccpressoAll.jar,lib/ehcache-2.10.1.jar,lib/flexlm.jar,lib/graphics/clibwrapper_jiio.jar,lib/graphics/freehep-base.jar,lib/graphics/freehep-graphics2d.jar,lib/graphics/freehep-graphicsio-emf.jar,lib/graphics/freehep-graphicsio-ps.jar,lib/graphics/freehep-graphicsio.jar,lib/graphics/jai_imageio.jar,lib/gson-2.2.4.jar,lib/HTMLEditorLight.jar,lib/hunspell-bridj-1.0.5-SNAPSHOT.jar,lib/javassist.jar,lib/jhall.jar,lib/jide-action.jar,lib/jide-charts.jar,lib/jide-common.jar,lib/jide-components.jar,lib/jide-diff.jar,lib/jide-dock.jar,lib/jide-editor.jar,lib/jide-gantt.jar,lib/jide-grids.jar,lib/jide-shortcut.jar,lib/jimi.jar,lib/jna.jar,lib/jnp-client.jar,lib/jtidy-sources.zip,lib/jtidy.jar,lib/JUnitParams-1.0.1.jar,lib/lucene-analyzers-common-7.5.0.jar,lib/lucene-core-7.5.0.jar,lib/lucene-misc-7.5.0.jar,lib/poi-3.14-20160307.jar,lib/poi-ooxml-3.14-20160307.jar,lib/poi-ooxml-schemas-3.14-20160307.jar,lib/webservice/axis-config.jar,lib/webservice/axis.jar,lib/webservice/commons-discovery-0.2.jar,lib/webservice/jaxrpc.jar,lib/webservice/mdserviceclient.jar,lib/webservice/rsclient.jar,lib/webservice/wsdl4j-1.5.1.jar,lib/xalan.jar,lib/xmlbeans-2.6.0.jar,lib/y.jar + diff --git a/buildProfiles/opensource.properties b/buildProfiles/opensource.properties index c04b30e6e..fbc16658c 100644 --- a/buildProfiles/opensource.properties +++ b/buildProfiles/opensource.properties @@ -1 +1 @@ -classpathLibraries = ['lib/patch.jar','lib/brand.jar','lib/brand_api.jar','lib/md.jar','lib/md_api.jar','lib/md_common.jar','lib/md_common_api.jar','lib/md_common_test.jar','lib/tw_common.jar','lib/tw_common_api.jar','lib/launcher.jar','lib/activation.jar','lib/annotation.jar','lib/batik.jar','lib/bridj-0.7.0.jar','lib/bundles/ch.qos.logback.classic_1.2.3.jar','lib/bundles/ch.qos.logback.core_1.2.3.jar','lib/bundles/cmof_1.4.0.202006020804/cmof14.jar','lib/bundles/cmof_1.4.0.202006020804/tas.jar','lib/bundles/com.esotericsoftware.kryo_2.22.0.201401231130.jar','lib/bundles/com.google.guava_18.0.0.jar','lib/bundles/com.nomagic.annotations_1.0.0/com.nomagic.annotation-1.0.jar','lib/bundles/com.nomagic.ci.binary_17.0.5.v20200602-0758.jar','lib/bundles/com.nomagic.ci.metamodel.project_17.0.5.v20200602-0758.jar','lib/bundles/com.nomagic.ci.persistence.local_17.0.5.v20200602-0758.jar','lib/bundles/com.nomagic.ci.persistence_17.0.5.v20200602-0758.jar','lib/bundles/com.nomagic.ci.services_17.0.5.v20200602-0758.jar','lib/bundles/com.nomagic.ci_17.0.5.v20200602-0758.jar','lib/bundles/com.nomagic.esi.api.messages_1.0.0.v20191101-2128.jar','lib/bundles/com.nomagic.esi.api_1.0.0.v20191101-2128.jar','lib/bundles/com.nomagic.esi.client.core_1.0.0.v20191101-2128.jar','lib/bundles/com.nomagic.esi.common_1.0.0.v20191101-2128.jar','lib/bundles/com.nomagic.esi.config_1.0.0.v20191101-2128.jar','lib/bundles/com.nomagic.esi.core.msg_1.0.0.v20191101-2128.jar','lib/bundles/com.nomagic.esi.emf_1.0.0.v20191101-2128.jar','lib/bundles/com.nomagic.esi.helper_1.0.0.v20191101-2128.jar','lib/bundles/com.nomagic.esi.net_1.0.0.v20191101-2128.jar','lib/bundles/com.nomagic.esi.serializer.akka_1.0.0.v20191101-2128.jar','lib/bundles/com.nomagic.esi.serializer_1.0.0.v20191101-2128.jar','lib/bundles/com.nomagic.esi.service.actorsystem_1.0.0.v20191101-2128.jar','lib/bundles/com.nomagic.esi.services_1.0.0.v20191101-2128.jar','lib/bundles/com.nomagic.esi.stream_1.0.0.v20191101-2128.jar','lib/bundles/com.nomagic.esi.supervisor_1.0.0.v20191101-2128.jar','lib/bundles/com.nomagic.magicdraw.ce_18.1.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.core.diagram_18.1.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.core.project.options_18.1.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.core_1.0.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.esi.binary.metamodel_18.1.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.esi.esiproject_18.1.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.esi.uuidmap_18.1.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.foundation_2.0.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.osgi.fragment_1.0.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.security_18.3.0.202006020804.jar','lib/bundles/com.nomagic.magicdraw.uml2_2.5.1.202006020804.jar','lib/bundles/com.nomagic.magicdraw_17.0.5.202006020804.jar','lib/bundles/com.teamdev.jxbrowser.chromium.internal.linux64_6.24.1.jar','lib/bundles/com.teamdev.jxbrowser.chromium.internal.mac_6.24.1.jar','lib/bundles/com.teamdev.jxbrowser.chromium.internal.win32_6.24.1.jar','lib/bundles/com.teamdev.jxbrowser.chromium.internal.win64_6.24.1.jar','lib/bundles/com.teamdev.jxbrowser.chromium_6.24.1.jar','lib/bundles/com.typesafe.akka.actor_2.5.10.jar','lib/bundles/com.typesafe.akka.cluster.tools_2.5.10.jar','lib/bundles/com.typesafe.akka.cluster_2.5.10.jar','lib/bundles/com.typesafe.akka.osgi_2.5.10.jar','lib/bundles/com.typesafe.akka.protobuf_2.5.10.jar','lib/bundles/com.typesafe.akka.remote_2.5.10.jar','lib/bundles/com.typesafe.akka.slf4j_2.5.10.jar','lib/bundles/com.typesafe.akka.stream_2.5.10.jar','lib/bundles/com.typesafe.config_1.3.0.jar','lib/bundles/com.typesafe.sslconfig_0.2.2.jar','lib/bundles/de.schlichtherle.truezip_7.4.3.v20200602-0758/lib/truezip-driver-zip-7.4.3.jar','lib/bundles/de.schlichtherle.truezip_7.4.3.v20200602-0758/lib/truezip-kernel-7.4.3.jar','lib/bundles/gnu.trove_3.0.3/lib/trove-3.0.3.jar','lib/bundles/io.aeron.client_1.7.0.jar','lib/bundles/io.aeron.driver_1.7.0.jar','lib/bundles/io.dropwizard.metrics.core_3.1.2.jar','lib/bundles/io.dropwizard.metrics.graphite_3.1.2.jar','lib/bundles/io.netty.buffer_4.1.21.Final.jar','lib/bundles/io.netty.codec_4.1.21.Final.jar','lib/bundles/io.netty.common_4.1.21.Final.jar','lib/bundles/io.netty.handler_4.1.21.Final.jar','lib/bundles/io.netty.resolver_4.1.21.Final.jar','lib/bundles/javax.jmi_1.0.0.202006020804/javax_jmi-1_0-fr.jar','lib/bundles/io.netty.transport_4.1.21.Final.jar','lib/bundles/joda-time_2.9.1.jar','lib/bundles/lz4-java_1.3.0.jar','lib/bundles/org.agrona_0.9.12.jar','lib/bundles/org.apache.commons.codec_1.9.0.v20170208-1614.jar','lib/bundles/org.apache.commons.collections_3.2.1.jar','lib/bundles/org.apache.commons.compress_1.3.0.jar','lib/bundles/org.apache.commons.io_2.4.0.jar','lib/bundles/org.apache.commons.lang_2.6.0.v201404270220.jar','lib/bundles/org.apache.commons.logging_1.1.1.v201101211721.jar','lib/bundles/org.apache.felix.scr_2.0.10.v20170501-2007.jar','lib/bundles/org.apache.httpcomponents.httpclient_4.5.3.jar','lib/bundles/org.apache.httpcomponents.httpcore_4.4.6.v20170210-0925.jar','lib/bundles/org.apache.log4j_1.2.15.v201005080500.jar','lib/bundles/org.apache.servicemix.bundles.jsr305_2.0.1.1.jar','lib/bundles/org.apiguardian_1.1.0.v20190826-0900.jar','lib/bundles/org.eclipse.core.contenttype_3.6.0.v20170207-1037.jar','lib/bundles/org.eclipse.core.jobs_3.9.2.v20171030-1027.jar','lib/bundles/org.eclipse.core.runtime_3.13.0.v20170207-1030.jar','lib/bundles/org.eclipse.emf.common_2.13.0.v20170609-0707.jar','lib/bundles/org.eclipse.emf.ecore.xmi_2.13.0.v20170609-0707.jar','lib/bundles/org.eclipse.emf.ecore_2.13.0.v20170609-0707.jar','lib/bundles/org.eclipse.equinox.app_1.3.400.v20150715-1528.jar','lib/bundles/org.eclipse.equinox.common_3.9.0.v20170207-1454.jar','lib/bundles/org.eclipse.equinox.ds_1.5.0.v20170307-1429.jar','lib/bundles/org.eclipse.equinox.preferences_3.7.0.v20170126-2132.jar','lib/bundles/org.eclipse.equinox.registry_3.7.0.v20170222-1344.jar','lib/bundles/org.eclipse.osgi.services_3.6.0.v20170228-1906.jar','lib/bundles/org.eclipse.osgi.util_3.4.0.v20170111-1608.jar','lib/bundles/org.eclipse.osgi_3.12.50.v20170928-1321.jar','lib/bundles/org.eclipse.uml2.common_1.5.0.v200905041045.jar','lib/bundles/org.hamcrest.core_1.3.0.v201303031735.jar','lib/bundles/org.jboss.netty_3.10.6.Final.jar','lib/bundles/org.json_1.0.0.255610281323.jar','lib/bundles/org.junit.jupiter.api_5.5.1.v20190826-0900.jar','lib/bundles/org.junit.jupiter.params_5.5.1.v20190826-0900.jar','lib/bundles/org.junit.platform.commons_1.5.1.v20190826-0900.jar','lib/bundles/org.junit_4.12.0.v201504281640/junit.jar','lib/bundles/org.opentest4j_1.2.0.v20190826-0900.jar','lib/bundles/org.reactivestreams.reactive-streams_1.0.2.jar','lib/bundles/org.scala-lang.modules.scala-java8-compat_0.8.0.jar','lib/bundles/org.scala-lang.modules.scala-parser-combinators_1.0.4.jar','lib/bundles/org.scala-lang.scala-library_2.12.4.v20171010-220511-VFINAL-c2a5883.jar','lib/bundles/org.uncommons.maths_1.2.2.201301151508/lib/uncommons-maths-1.2.2a.jar','lib/bundles/slf4j.api_1.7.25.jar','lib/bundles/cmof_1.4.0.201912191136/cmof14.jar','lib/bundles/cmof_1.4.0.201912191136/tas.jar','lib/bundles/com.nomagic.ci.binary_17.0.5.v20191219-1130.jar','lib/bundles/com.nomagic.ci.metamodel.project_17.0.5.v20191219-1130.jar','lib/bundles/com.nomagic.ci.persistence.local_17.0.5.v20191219-1130.jar','lib/bundles/com.nomagic.ci.persistence_17.0.5.v20191219-1130.jar','lib/bundles/com.nomagic.ci.services_17.0.5.v20191219-1130.jar','lib/bundles/com.nomagic.ci_17.0.5.v20191219-1130.jar','lib/bundles/com.nomagic.magicdraw.ce_18.1.0.201912191136.jar','lib/bundles/com.nomagic.magicdraw.core.diagram_18.1.0.201912191136.jar','lib/bundles/com.nomagic.magicdraw.core.project.options_18.1.0.201912191136.jar','lib/bundles/com.nomagic.magicdraw.core_1.0.0.201912191136.jar','lib/bundles/com.nomagic.magicdraw.esi.binary.metamodel_18.1.0.201912191136.jar','lib/bundles/com.nomagic.magicdraw.esi.esiproject_18.1.0.201912191136.jar','lib/bundles/com.nomagic.magicdraw.esi.uuidmap_18.1.0.201912191136.jar','lib/bundles/com.nomagic.magicdraw.foundation_2.0.0.201912191136.jar','lib/bundles/com.nomagic.magicdraw.osgi.fragment_1.0.0.201912191136.jar','lib/bundles/com.nomagic.magicdraw.security_18.3.0.201912191136.jar','lib/bundles/com.nomagic.magicdraw.uml2_2.5.1.201912191136.jar','lib/bundles/com.nomagic.magicdraw_17.0.5.201912191136.jar','lib/bundles/de.schlichtherle.truezip_7.4.3.v20191219-1130/lib/truezip-driver-zip-7.4.3.jar','lib/bundles/de.schlichtherle.truezip_7.4.3.v20191219-1130/lib/truezip-kernel-7.4.3.jar','lib/bundles/javax.jmi_1.0.0.201912191136/javax_jmi-1_0-fr.jar','lib/com.nomagic.osgi.launcher-17.0.5-SNAPSHOT.jar','lib/commons-compress-1.3.jar','lib/commons-httpclient-3.1.jar','lib/commons-logging-1.0.4.jar','lib/concurrent.jar','lib/EccpressoAll.jar','lib/HTMLEditorLight.jar','lib/JUnitParams-1.0.1.jar','lib/ehcache-2.10.1.jar','lib/flexlm.jar','lib/graphics/clibwrapper_jiio.jar','lib/graphics/freehep-base.jar','lib/graphics/freehep-graphics2d.jar','lib/graphics/freehep-graphicsio-emf.jar','lib/graphics/freehep-graphicsio-ps.jar','lib/graphics/freehep-graphicsio.jar','lib/graphics/jai_imageio.jar','lib/gson-2.2.4.jar','lib/hunspell-bridj-1.0.5-SNAPSHOT.jar','lib/javassist.jar','lib/jhall.jar','lib/jide-action.jar','lib/jide-charts.jar','lib/jide-common.jar','lib/jide-components.jar','lib/jide-diff.jar','lib/jide-dock.jar','lib/jide-editor.jar','lib/jide-gantt.jar','lib/jide-grids.jar','lib/jide-shortcut.jar','lib/jimi.jar','lib/jna.jar','lib/jnp-client.jar','lib/jsr250-api-1.0.jar','lib/jsr305.jar','lib/jtidy.jar','lib/lucene-analyzers-common-7.5.0.jar','lib/lucene-core-7.5.0.jar','lib/lucene-misc-7.5.0.jar','lib/poi-3.14-20160307.jar','lib/poi-ooxml-3.14-20160307.jar','lib/poi-ooxml-schemas-3.14-20160307.jar','lib/webservice/axis-config.jar','lib/webservice/axis.jar','lib/webservice/commons-discovery-0.2.jar','lib/webservice/jaxrpc.jar','lib/webservice/mdserviceclient.jar','lib/webservice/rsclient.jar','lib/webservice/wsdl4j-1.5.1.jar','lib/xalan.jar','lib/xmlbeans-2.6.0.jar','lib/y.jar'] +classpathLibraries = "lib/patch.jar,lib/brand.jar,lib/brand_api.jar,lib/md.jar,lib/md_api.jar,lib/md_common.jar,lib/md_common_api.jar,lib/md_common_test.jar,lib/tw_common.jar,lib/tw_common_api.jar,lib/launcher.jar,lib/activation.jar,lib/annotation.jar,lib/batik.jar,lib/bridj-0.7.0.jar,lib/bundles/ch.qos.logback.classic_1.2.3.jar,lib/bundles/ch.qos.logback.core_1.2.3.jar,lib/bundles/cmof_1.4.0.202006020804/cmof14.jar,lib/bundles/cmof_1.4.0.202006020804/tas.jar,lib/bundles/com.esotericsoftware.kryo_2.22.0.201401231130.jar,lib/bundles/com.google.guava_18.0.0.jar,lib/bundles/com.nomagic.annotations_1.0.0/com.nomagic.annotation-1.0.jar,lib/bundles/com.nomagic.ci.binary_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.ci.metamodel.project_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.ci.persistence.local_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.ci.persistence_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.ci.services_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.ci_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.esi.api.messages_1.0.0.v20191101-2128.jar,lib/bundles/com.nomagic.esi.api_1.0.0.v20191101-2128.jar,lib/bundles/com.nomagic.esi.client.core_1.0.0.v20191101-2128.jar,lib/bundles/com.nomagic.esi.common_1.0.0.v20191101-2128.jar,lib/bundles/com.nomagic.esi.config_1.0.0.v20191101-2128.jar,lib/bundles/com.nomagic.esi.core.msg_1.0.0.v20191101-2128.jar,lib/bundles/com.nomagic.esi.emf_1.0.0.v20191101-2128.jar,lib/bundles/com.nomagic.esi.helper_1.0.0.v20191101-2128.jar,lib/bundles/com.nomagic.esi.net_1.0.0.v20191101-2128.jar,lib/bundles/com.nomagic.esi.serializer.akka_1.0.0.v20191101-2128.jar,lib/bundles/com.nomagic.esi.serializer_1.0.0.v20191101-2128.jar,lib/bundles/com.nomagic.esi.service.actorsystem_1.0.0.v20191101-2128.jar,lib/bundles/com.nomagic.esi.services_1.0.0.v20191101-2128.jar,lib/bundles/com.nomagic.esi.stream_1.0.0.v20191101-2128.jar,lib/bundles/com.nomagic.esi.supervisor_1.0.0.v20191101-2128.jar,lib/bundles/com.nomagic.magicdraw.ce_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.core.diagram_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.core.project.options_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.core_1.0.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.esi.binary.metamodel_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.esi.esiproject_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.esi.uuidmap_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.foundation_2.0.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.osgi.fragment_1.0.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.security_18.3.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.uml2_2.5.1.202006020804.jar,lib/bundles/com.nomagic.magicdraw_17.0.5.202006020804.jar,lib/bundles/com.teamdev.jxbrowser.chromium.internal.linux64_6.24.1.jar,lib/bundles/com.teamdev.jxbrowser.chromium.internal.mac_6.24.1.jar,lib/bundles/com.teamdev.jxbrowser.chromium.internal.win32_6.24.1.jar,lib/bundles/com.teamdev.jxbrowser.chromium.internal.win64_6.24.1.jar,lib/bundles/com.teamdev.jxbrowser.chromium_6.24.1.jar,lib/bundles/com.typesafe.akka.actor_2.5.10.jar,lib/bundles/com.typesafe.akka.cluster.tools_2.5.10.jar,lib/bundles/com.typesafe.akka.cluster_2.5.10.jar,lib/bundles/com.typesafe.akka.osgi_2.5.10.jar,lib/bundles/com.typesafe.akka.protobuf_2.5.10.jar,lib/bundles/com.typesafe.akka.remote_2.5.10.jar,lib/bundles/com.typesafe.akka.slf4j_2.5.10.jar,lib/bundles/com.typesafe.akka.stream_2.5.10.jar,lib/bundles/com.typesafe.config_1.3.0.jar,lib/bundles/com.typesafe.sslconfig_0.2.2.jar,lib/bundles/de.schlichtherle.truezip_7.4.3.v20200602-0758/lib/truezip-driver-zip-7.4.3.jar,lib/bundles/de.schlichtherle.truezip_7.4.3.v20200602-0758/lib/truezip-kernel-7.4.3.jar,lib/bundles/gnu.trove_3.0.3/lib/trove-3.0.3.jar,lib/bundles/io.aeron.client_1.7.0.jar,lib/bundles/io.aeron.driver_1.7.0.jar,lib/bundles/io.dropwizard.metrics.core_3.1.2.jar,lib/bundles/io.dropwizard.metrics.graphite_3.1.2.jar,lib/bundles/io.netty.buffer_4.1.21.Final.jar,lib/bundles/io.netty.codec_4.1.21.Final.jar,lib/bundles/io.netty.common_4.1.21.Final.jar,lib/bundles/io.netty.handler_4.1.21.Final.jar,lib/bundles/io.netty.resolver_4.1.21.Final.jar,lib/bundles/javax.jmi_1.0.0.202006020804/javax_jmi-1_0-fr.jar,lib/bundles/io.netty.transport_4.1.21.Final.jar,lib/bundles/joda-time_2.9.1.jar,lib/bundles/lz4-java_1.3.0.jar,lib/bundles/org.agrona_0.9.12.jar,lib/bundles/org.apache.commons.codec_1.9.0.v20170208-1614.jar,lib/bundles/org.apache.commons.collections_3.2.1.jar,lib/bundles/org.apache.commons.compress_1.3.0.jar,lib/bundles/org.apache.commons.io_2.4.0.jar,lib/bundles/org.apache.commons.lang_2.6.0.v201404270220.jar,lib/bundles/org.apache.commons.logging_1.1.1.v201101211721.jar,lib/bundles/org.apache.felix.scr_2.0.10.v20170501-2007.jar,lib/bundles/org.apache.httpcomponents.httpclient_4.5.3.jar,lib/bundles/org.apache.httpcomponents.httpcore_4.4.6.v20170210-0925.jar,lib/bundles/org.apache.log4j_1.2.15.v201005080500.jar,lib/bundles/org.apache.servicemix.bundles.jsr305_2.0.1.1.jar,lib/bundles/org.apiguardian_1.1.0.v20190826-0900.jar,lib/bundles/org.eclipse.core.contenttype_3.6.0.v20170207-1037.jar,lib/bundles/org.eclipse.core.jobs_3.9.2.v20171030-1027.jar,lib/bundles/org.eclipse.core.runtime_3.13.0.v20170207-1030.jar,lib/bundles/org.eclipse.emf.common_2.13.0.v20170609-0707.jar,lib/bundles/org.eclipse.emf.ecore.xmi_2.13.0.v20170609-0707.jar,lib/bundles/org.eclipse.emf.ecore_2.13.0.v20170609-0707.jar,lib/bundles/org.eclipse.equinox.app_1.3.400.v20150715-1528.jar,lib/bundles/org.eclipse.equinox.common_3.9.0.v20170207-1454.jar,lib/bundles/org.eclipse.equinox.ds_1.5.0.v20170307-1429.jar,lib/bundles/org.eclipse.equinox.preferences_3.7.0.v20170126-2132.jar,lib/bundles/org.eclipse.equinox.registry_3.7.0.v20170222-1344.jar,lib/bundles/org.eclipse.osgi.services_3.6.0.v20170228-1906.jar,lib/bundles/org.eclipse.osgi.util_3.4.0.v20170111-1608.jar,lib/bundles/org.eclipse.osgi_3.12.50.v20170928-1321.jar,lib/bundles/org.eclipse.uml2.common_1.5.0.v200905041045.jar,lib/bundles/org.hamcrest.core_1.3.0.v201303031735.jar,lib/bundles/org.jboss.netty_3.10.6.Final.jar,lib/bundles/org.json_1.0.0.255610281323.jar,lib/bundles/org.junit.jupiter.api_5.5.1.v20190826-0900.jar,lib/bundles/org.junit.jupiter.params_5.5.1.v20190826-0900.jar,lib/bundles/org.junit.platform.commons_1.5.1.v20190826-0900.jar,lib/bundles/org.junit_4.12.0.v201504281640/junit.jar,lib/bundles/org.opentest4j_1.2.0.v20190826-0900.jar,lib/bundles/org.reactivestreams.reactive-streams_1.0.2.jar,lib/bundles/org.scala-lang.modules.scala-java8-compat_0.8.0.jar,lib/bundles/org.scala-lang.modules.scala-parser-combinators_1.0.4.jar,lib/bundles/org.scala-lang.scala-library_2.12.4.v20171010-220511-VFINAL-c2a5883.jar,lib/bundles/org.uncommons.maths_1.2.2.201301151508/lib/uncommons-maths-1.2.2a.jar,lib/bundles/slf4j.api_1.7.25.jar,lib/bundles/cmof_1.4.0.201912191136/cmof14.jar,lib/bundles/cmof_1.4.0.201912191136/tas.jar,lib/bundles/com.nomagic.ci.binary_17.0.5.v20191219-1130.jar,lib/bundles/com.nomagic.ci.metamodel.project_17.0.5.v20191219-1130.jar,lib/bundles/com.nomagic.ci.persistence.local_17.0.5.v20191219-1130.jar,lib/bundles/com.nomagic.ci.persistence_17.0.5.v20191219-1130.jar,lib/bundles/com.nomagic.ci.services_17.0.5.v20191219-1130.jar,lib/bundles/com.nomagic.ci_17.0.5.v20191219-1130.jar,lib/bundles/com.nomagic.magicdraw.ce_18.1.0.201912191136.jar,lib/bundles/com.nomagic.magicdraw.core.diagram_18.1.0.201912191136.jar,lib/bundles/com.nomagic.magicdraw.core.project.options_18.1.0.201912191136.jar,lib/bundles/com.nomagic.magicdraw.core_1.0.0.201912191136.jar,lib/bundles/com.nomagic.magicdraw.esi.binary.metamodel_18.1.0.201912191136.jar,lib/bundles/com.nomagic.magicdraw.esi.esiproject_18.1.0.201912191136.jar,lib/bundles/com.nomagic.magicdraw.esi.uuidmap_18.1.0.201912191136.jar,lib/bundles/com.nomagic.magicdraw.foundation_2.0.0.201912191136.jar,lib/bundles/com.nomagic.magicdraw.osgi.fragment_1.0.0.201912191136.jar,lib/bundles/com.nomagic.magicdraw.security_18.3.0.201912191136.jar,lib/bundles/com.nomagic.magicdraw.uml2_2.5.1.201912191136.jar,lib/bundles/com.nomagic.magicdraw_17.0.5.201912191136.jar,lib/bundles/de.schlichtherle.truezip_7.4.3.v20191219-1130/lib/truezip-driver-zip-7.4.3.jar,lib/bundles/de.schlichtherle.truezip_7.4.3.v20191219-1130/lib/truezip-kernel-7.4.3.jar,lib/bundles/javax.jmi_1.0.0.201912191136/javax_jmi-1_0-fr.jar,lib/com.nomagic.osgi.launcher-17.0.5-SNAPSHOT.jar,lib/commons-compress-1.3.jar,lib/commons-httpclient-3.1.jar,lib/commons-logging-1.0.4.jar,lib/concurrent.jar,lib/EccpressoAll.jar,lib/HTMLEditorLight.jar,lib/JUnitParams-1.0.1.jar,lib/ehcache-2.10.1.jar,lib/flexlm.jar,lib/graphics/clibwrapper_jiio.jar,lib/graphics/freehep-base.jar,lib/graphics/freehep-graphics2d.jar,lib/graphics/freehep-graphicsio-emf.jar,lib/graphics/freehep-graphicsio-ps.jar,lib/graphics/freehep-graphicsio.jar,lib/graphics/jai_imageio.jar,lib/gson-2.2.4.jar,lib/hunspell-bridj-1.0.5-SNAPSHOT.jar,lib/javassist.jar,lib/jhall.jar,lib/jide-action.jar,lib/jide-charts.jar,lib/jide-common.jar,lib/jide-components.jar,lib/jide-diff.jar,lib/jide-dock.jar,lib/jide-editor.jar,lib/jide-gantt.jar,lib/jide-grids.jar,lib/jide-shortcut.jar,lib/jimi.jar,lib/jna.jar,lib/jnp-client.jar,lib/jsr250-api-1.0.jar,lib/jsr305.jar,lib/jtidy.jar,lib/lucene-analyzers-common-7.5.0.jar,lib/lucene-core-7.5.0.jar,lib/lucene-misc-7.5.0.jar,lib/poi-3.14-20160307.jar,lib/poi-ooxml-3.14-20160307.jar,lib/poi-ooxml-schemas-3.14-20160307.jar,lib/webservice/axis-config.jar,lib/webservice/axis.jar,lib/webservice/commons-discovery-0.2.jar,lib/webservice/jaxrpc.jar,lib/webservice/mdserviceclient.jar,lib/webservice/rsclient.jar,lib/webservice/wsdl4j-1.5.1.jar,lib/xalan.jar,lib/xmlbeans-2.6.0.jar,lib/y.jar" From 3b177c7f114172397ff5fcbb2d82a1a5aa0bb176 Mon Sep 17 00:00:00 2001 From: Enquier Date: Thu, 28 Oct 2021 15:29:40 -0600 Subject: [PATCH 20/28] Final formatting change --- buildProfiles/internal.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildProfiles/internal.properties b/buildProfiles/internal.properties index 81823fa47..ee57af5c6 100644 --- a/buildProfiles/internal.properties +++ b/buildProfiles/internal.properties @@ -1,2 +1,2 @@ -classpathLibraries = "lib/patch.jar,lib/brand.jar,lib/brand_api.jar,lib/md.jar,lib/md_api.jar,lib/md_common.jar,lib/md_common_api.jar,lib/md_common_test.jar,lib/tw_common.jar,lib/tw_common_api.jar,lib/launcher.jar,lib/activation.jar,lib/annotation.jar,lib/batik.jar,lib/bridj-0.7.0.jar,lib/bundles/ch.qos.logback.classic_1.2.3.jar,lib/bundles/ch.qos.logback.core_1.2.3.jar,lib/bundles/cmof_1.4.0.202006020804/cmof14.jar,lib/bundles/cmof_1.4.0.202006020804/tas.jar,lib/bundles/com.esotericsoftware.kryo_2.22.0.201401231130.jar,lib/bundles/com.google.guava_18.0.0.jar,lib/bundles/com.nomagic.annotations_1.0.0/com.nomagic.annotation-1.0.jar,lib/bundles/com.nomagic.ci.binary_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.ci.metamodel.project_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.ci.persistence.local_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.ci.persistence_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.ci.services_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.ci_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.magicdraw.ce_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.core.diagram_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.core.project.options_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.core_1.0.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.esi.binary.metamodel_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.esi.esiproject_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.esi.uuidmap_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.foundation_2.0.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.osgi.fragment_1.0.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.security_18.3.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.uml2_2.5.1.202006020804.jar,lib/bundles/com.nomagic.magicdraw_17.0.5.202006020804.jar,lib/bundles/com.teamdev.jxbrowser.chromium.internal.linux64_6.24.1.jar,lib/bundles/com.teamdev.jxbrowser.chromium.internal.mac_6.24.1.jar,lib/bundles/com.teamdev.jxbrowser.chromium.internal.win32_6.24.1.jar,lib/bundles/com.teamdev.jxbrowser.chromium.internal.win64_6.24.1.jar,lib/bundles/com.teamdev.jxbrowser.chromium_6.24.1.jar,lib/bundles/com.typesafe.config_1.3.0.jar,lib/bundles/com.typesafe.sslconfig_0.2.2.jar,lib/bundles/de.schlichtherle.truezip_7.4.3.v20200602-0758/lib/truezip-driver-zip-7.4.3.jar,lib/bundles/de.schlichtherle.truezip_7.4.3.v20200602-0758/lib/truezip-kernel-7.4.3.jar,lib/bundles/gnu.trove_3.0.3/lib/trove-3.0.3.jar,lib/bundles/io.aeron.client_1.7.0.jar,lib/bundles/io.aeron.driver_1.7.0.jar,lib/bundles/io.dropwizard.metrics.core_3.1.2.jar,lib/bundles/io.dropwizard.metrics.graphite_3.1.2.jar,lib/bundles/io.netty.buffer_4.1.21.Final.jar,lib/bundles/io.netty.codec_4.1.21.Final.jar,lib/bundles/io.netty.common_4.1.21.Final.jar,lib/bundles/io.netty.handler_4.1.21.Final.jar,lib/bundles/io.netty.resolver_4.1.21.Final.jar,lib/bundles/io.netty.transport_4.1.21.Final.jar,lib/bundles/javax.jmi_1.0.0.202006020804/javax_jmi-1_0-fr.jar,lib/bundles/joda-time_2.9.1.jar,lib/bundles/lz4-java_1.3.0.jar,lib/bundles/org.agrona_0.9.12.jar,lib/bundles/org.apache.commons.codec_1.9.0.v20170208-1614.jar,lib/bundles/org.apache.commons.collections_3.2.1.jar,lib/bundles/org.apache.commons.compress_1.3.0.jar,lib/bundles/org.apache.commons.io_2.4.0.jar,lib/bundles/org.apache.commons.lang_2.6.0.v201404270220.jar,lib/bundles/org.apache.commons.logging_1.1.1.v201101211721.jar,lib/bundles/org.apache.felix.scr_2.0.10.v20170501-2007.jar,lib/bundles/org.apache.httpcomponents.httpclient_4.5.3.jar,lib/bundles/org.apache.httpcomponents.httpcore_4.4.6.v20170210-0925.jar,lib/bundles/org.apache.log4j_1.2.15.v201005080500.jar,lib/bundles/org.apache.servicemix.bundles.jsr305_2.0.1.1.jar,lib/bundles/org.apiguardian_1.1.0.v20190826-0900.jar,lib/bundles/org.eclipse.core.contenttype_3.6.0.v20170207-1037.jar,lib/bundles/org.eclipse.core.jobs_3.9.2.v20171030-1027.jar,lib/bundles/org.eclipse.core.runtime_3.13.0.v20170207-1030.jar,lib/bundles/org.eclipse.emf.common_2.13.0.v20170609-0707.jar,lib/bundles/org.eclipse.emf.ecore.xmi_2.13.0.v20170609-0707.jar,lib/bundles/org.eclipse.emf.ecore_2.13.0.v20170609-0707.jar,lib/bundles/org.eclipse.equinox.app_1.3.400.v20150715-1528.jar,lib/bundles/org.eclipse.equinox.common_3.9.0.v20170207-1454.jar,lib/bundles/org.eclipse.equinox.ds_1.5.0.v20170307-1429.jar,lib/bundles/org.eclipse.equinox.preferences_3.7.0.v20170126-2132.jar,lib/bundles/org.eclipse.equinox.registry_3.7.0.v20170222-1344.jar,lib/bundles/org.eclipse.osgi.services_3.6.0.v20170228-1906.jar,lib/bundles/org.eclipse.osgi.util_3.4.0.v20170111-1608.jar,lib/bundles/org.eclipse.osgi_3.12.50.v20170928-1321.jar,lib/bundles/org.eclipse.uml2.common_1.5.0.v200905041045.jar,lib/bundles/org.hamcrest.core_1.3.0.v201303031735.jar,lib/bundles/org.jboss.netty_3.10.6.Final.jar,lib/bundles/org.json_1.0.0.255610281323.jar,lib/bundles/org.junit.jupiter.api_5.5.1.v20190826-0900.jar,lib/bundles/org.junit.jupiter.params_5.5.1.v20190826-0900.jar,lib/bundles/org.junit.platform.commons_1.5.1.v20190826-0900.jar,lib/bundles/org.junit_4.12.0.v201504281640/junit.jar,lib/bundles/org.opentest4j_1.2.0.v20190826-0900.jar,lib/bundles/org.reactivestreams.reactive-streams_1.0.2.jar,lib/bundles/org.uncommons.maths_1.2.2.201301151508/lib/uncommons-maths-1.2.2a.jar,lib/bundles/slf4j.api_1.7.25.jar,lib/com.nomagic.osgi.launcher-17.0.5-SNAPSHOT.jar,lib/commons-compress-1.3.jar,lib/commons-httpclient-3.1.jar,lib/commons-logging-1.0.4.jar,lib/concurrent.jar,lib/EccpressoAll.jar,lib/ehcache-2.10.1.jar,lib/flexlm.jar,lib/graphics/clibwrapper_jiio.jar,lib/graphics/freehep-base.jar,lib/graphics/freehep-graphics2d.jar,lib/graphics/freehep-graphicsio-emf.jar,lib/graphics/freehep-graphicsio-ps.jar,lib/graphics/freehep-graphicsio.jar,lib/graphics/jai_imageio.jar,lib/gson-2.2.4.jar,lib/HTMLEditorLight.jar,lib/hunspell-bridj-1.0.5-SNAPSHOT.jar,lib/javassist.jar,lib/jhall.jar,lib/jide-action.jar,lib/jide-charts.jar,lib/jide-common.jar,lib/jide-components.jar,lib/jide-diff.jar,lib/jide-dock.jar,lib/jide-editor.jar,lib/jide-gantt.jar,lib/jide-grids.jar,lib/jide-shortcut.jar,lib/jimi.jar,lib/jna.jar,lib/jnp-client.jar,lib/jtidy-sources.zip,lib/jtidy.jar,lib/JUnitParams-1.0.1.jar,lib/lucene-analyzers-common-7.5.0.jar,lib/lucene-core-7.5.0.jar,lib/lucene-misc-7.5.0.jar,lib/poi-3.14-20160307.jar,lib/poi-ooxml-3.14-20160307.jar,lib/poi-ooxml-schemas-3.14-20160307.jar,lib/webservice/axis-config.jar,lib/webservice/axis.jar,lib/webservice/commons-discovery-0.2.jar,lib/webservice/jaxrpc.jar,lib/webservice/mdserviceclient.jar,lib/webservice/rsclient.jar,lib/webservice/wsdl4j-1.5.1.jar,lib/xalan.jar,lib/xmlbeans-2.6.0.jar,lib/y.jar +classpathLibraries = "lib/patch.jar,lib/brand.jar,lib/brand_api.jar,lib/md.jar,lib/md_api.jar,lib/md_common.jar,lib/md_common_api.jar,lib/md_common_test.jar,lib/tw_common.jar,lib/tw_common_api.jar,lib/launcher.jar,lib/activation.jar,lib/annotation.jar,lib/batik.jar,lib/bridj-0.7.0.jar,lib/bundles/ch.qos.logback.classic_1.2.3.jar,lib/bundles/ch.qos.logback.core_1.2.3.jar,lib/bundles/cmof_1.4.0.202006020804/cmof14.jar,lib/bundles/cmof_1.4.0.202006020804/tas.jar,lib/bundles/com.esotericsoftware.kryo_2.22.0.201401231130.jar,lib/bundles/com.google.guava_18.0.0.jar,lib/bundles/com.nomagic.annotations_1.0.0/com.nomagic.annotation-1.0.jar,lib/bundles/com.nomagic.ci.binary_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.ci.metamodel.project_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.ci.persistence.local_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.ci.persistence_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.ci.services_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.ci_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.magicdraw.ce_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.core.diagram_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.core.project.options_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.core_1.0.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.esi.binary.metamodel_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.esi.esiproject_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.esi.uuidmap_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.foundation_2.0.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.osgi.fragment_1.0.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.security_18.3.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.uml2_2.5.1.202006020804.jar,lib/bundles/com.nomagic.magicdraw_17.0.5.202006020804.jar,lib/bundles/com.teamdev.jxbrowser.chromium.internal.linux64_6.24.1.jar,lib/bundles/com.teamdev.jxbrowser.chromium.internal.mac_6.24.1.jar,lib/bundles/com.teamdev.jxbrowser.chromium.internal.win32_6.24.1.jar,lib/bundles/com.teamdev.jxbrowser.chromium.internal.win64_6.24.1.jar,lib/bundles/com.teamdev.jxbrowser.chromium_6.24.1.jar,lib/bundles/com.typesafe.config_1.3.0.jar,lib/bundles/com.typesafe.sslconfig_0.2.2.jar,lib/bundles/de.schlichtherle.truezip_7.4.3.v20200602-0758/lib/truezip-driver-zip-7.4.3.jar,lib/bundles/de.schlichtherle.truezip_7.4.3.v20200602-0758/lib/truezip-kernel-7.4.3.jar,lib/bundles/gnu.trove_3.0.3/lib/trove-3.0.3.jar,lib/bundles/io.aeron.client_1.7.0.jar,lib/bundles/io.aeron.driver_1.7.0.jar,lib/bundles/io.dropwizard.metrics.core_3.1.2.jar,lib/bundles/io.dropwizard.metrics.graphite_3.1.2.jar,lib/bundles/io.netty.buffer_4.1.21.Final.jar,lib/bundles/io.netty.codec_4.1.21.Final.jar,lib/bundles/io.netty.common_4.1.21.Final.jar,lib/bundles/io.netty.handler_4.1.21.Final.jar,lib/bundles/io.netty.resolver_4.1.21.Final.jar,lib/bundles/io.netty.transport_4.1.21.Final.jar,lib/bundles/javax.jmi_1.0.0.202006020804/javax_jmi-1_0-fr.jar,lib/bundles/joda-time_2.9.1.jar,lib/bundles/lz4-java_1.3.0.jar,lib/bundles/org.agrona_0.9.12.jar,lib/bundles/org.apache.commons.codec_1.9.0.v20170208-1614.jar,lib/bundles/org.apache.commons.collections_3.2.1.jar,lib/bundles/org.apache.commons.compress_1.3.0.jar,lib/bundles/org.apache.commons.io_2.4.0.jar,lib/bundles/org.apache.commons.lang_2.6.0.v201404270220.jar,lib/bundles/org.apache.commons.logging_1.1.1.v201101211721.jar,lib/bundles/org.apache.felix.scr_2.0.10.v20170501-2007.jar,lib/bundles/org.apache.httpcomponents.httpclient_4.5.3.jar,lib/bundles/org.apache.httpcomponents.httpcore_4.4.6.v20170210-0925.jar,lib/bundles/org.apache.log4j_1.2.15.v201005080500.jar,lib/bundles/org.apache.servicemix.bundles.jsr305_2.0.1.1.jar,lib/bundles/org.apiguardian_1.1.0.v20190826-0900.jar,lib/bundles/org.eclipse.core.contenttype_3.6.0.v20170207-1037.jar,lib/bundles/org.eclipse.core.jobs_3.9.2.v20171030-1027.jar,lib/bundles/org.eclipse.core.runtime_3.13.0.v20170207-1030.jar,lib/bundles/org.eclipse.emf.common_2.13.0.v20170609-0707.jar,lib/bundles/org.eclipse.emf.ecore.xmi_2.13.0.v20170609-0707.jar,lib/bundles/org.eclipse.emf.ecore_2.13.0.v20170609-0707.jar,lib/bundles/org.eclipse.equinox.app_1.3.400.v20150715-1528.jar,lib/bundles/org.eclipse.equinox.common_3.9.0.v20170207-1454.jar,lib/bundles/org.eclipse.equinox.ds_1.5.0.v20170307-1429.jar,lib/bundles/org.eclipse.equinox.preferences_3.7.0.v20170126-2132.jar,lib/bundles/org.eclipse.equinox.registry_3.7.0.v20170222-1344.jar,lib/bundles/org.eclipse.osgi.services_3.6.0.v20170228-1906.jar,lib/bundles/org.eclipse.osgi.util_3.4.0.v20170111-1608.jar,lib/bundles/org.eclipse.osgi_3.12.50.v20170928-1321.jar,lib/bundles/org.eclipse.uml2.common_1.5.0.v200905041045.jar,lib/bundles/org.hamcrest.core_1.3.0.v201303031735.jar,lib/bundles/org.jboss.netty_3.10.6.Final.jar,lib/bundles/org.json_1.0.0.255610281323.jar,lib/bundles/org.junit.jupiter.api_5.5.1.v20190826-0900.jar,lib/bundles/org.junit.jupiter.params_5.5.1.v20190826-0900.jar,lib/bundles/org.junit.platform.commons_1.5.1.v20190826-0900.jar,lib/bundles/org.junit_4.12.0.v201504281640/junit.jar,lib/bundles/org.opentest4j_1.2.0.v20190826-0900.jar,lib/bundles/org.reactivestreams.reactive-streams_1.0.2.jar,lib/bundles/org.uncommons.maths_1.2.2.201301151508/lib/uncommons-maths-1.2.2a.jar,lib/bundles/slf4j.api_1.7.25.jar,lib/com.nomagic.osgi.launcher-17.0.5-SNAPSHOT.jar,lib/commons-compress-1.3.jar,lib/commons-httpclient-3.1.jar,lib/commons-logging-1.0.4.jar,lib/concurrent.jar,lib/EccpressoAll.jar,lib/ehcache-2.10.1.jar,lib/flexlm.jar,lib/graphics/clibwrapper_jiio.jar,lib/graphics/freehep-base.jar,lib/graphics/freehep-graphics2d.jar,lib/graphics/freehep-graphicsio-emf.jar,lib/graphics/freehep-graphicsio-ps.jar,lib/graphics/freehep-graphicsio.jar,lib/graphics/jai_imageio.jar,lib/gson-2.2.4.jar,lib/HTMLEditorLight.jar,lib/hunspell-bridj-1.0.5-SNAPSHOT.jar,lib/javassist.jar,lib/jhall.jar,lib/jide-action.jar,lib/jide-charts.jar,lib/jide-common.jar,lib/jide-components.jar,lib/jide-diff.jar,lib/jide-dock.jar,lib/jide-editor.jar,lib/jide-gantt.jar,lib/jide-grids.jar,lib/jide-shortcut.jar,lib/jimi.jar,lib/jna.jar,lib/jnp-client.jar,lib/jtidy-sources.zip,lib/jtidy.jar,lib/JUnitParams-1.0.1.jar,lib/lucene-analyzers-common-7.5.0.jar,lib/lucene-core-7.5.0.jar,lib/lucene-misc-7.5.0.jar,lib/poi-3.14-20160307.jar,lib/poi-ooxml-3.14-20160307.jar,lib/poi-ooxml-schemas-3.14-20160307.jar,lib/webservice/axis-config.jar,lib/webservice/axis.jar,lib/webservice/commons-discovery-0.2.jar,lib/webservice/jaxrpc.jar,lib/webservice/mdserviceclient.jar,lib/webservice/rsclient.jar,lib/webservice/wsdl4j-1.5.1.jar,lib/xalan.jar,lib/xmlbeans-2.6.0.jar,lib/y.jar" From a7af21adf375804d81bd475bc5beee2f06aceded Mon Sep 17 00:00:00 2001 From: Enquier Date: Fri, 29 Oct 2021 12:06:56 -0600 Subject: [PATCH 21/28] Updates to README --- README.md | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 942c0d960..b9c6a1a9f 100644 --- a/README.md +++ b/README.md @@ -9,12 +9,18 @@ Cameo MDK is a plugin for [Cameo Systems Modeler](https://www.nomagic.com/produc ## Prerequisites * [Cameo Systems Modeler (CSM)](https://www.nomagic.com/products/cameo-systems-modeler) or another No Magic environment bundle that includes the [SysML plugin](https://www.nomagic.com/product-addons/magicdraw-addons/sysml-plugin) - * The latest Cameo MDK is tested with and supports **19.0 SP3**. Compatibility for previous versions of Cameo MDK can be found in the [compatibility matrices](https://github.com/Open-MBEE/open-mbee.github.io/wiki/Compatibilities). + * The latest Cameo MDK is tested with and supports **19.0 SP4**. Compatibility for previous versions of Cameo MDK can be found in the [compatibility matrices](https://github.com/Open-MBEE/open-mbee.github.io/wiki/Compatibilities). +#### Versions prior to 5.x: * [Model Management System (MMS) 3](https://github.com/Open-MBEE/mms-alfresco) +#### Version 5.0+ +* [Model Management System (MMS) 4](https://github.com/Open-MBEE/mms) ## Installation -1. [Download](https://bintray.com/openmbee/maven/mdk/_latestVersion) the Cameo MDK plugin, e.g. `mdk-*-plugin.zip`. +1. [Download](https://github.com/Open-MBEE/mdk/releases/latest) the Cameo MDK plugin, e.g. `mdk-*-plugin.zip`. + + *Note: Make sure you are downloading the correct version for your installation of MMS (for mms-alfresco (mms3/donbot) use + version 4.5.x, for mms (mms4/execubots) use versions 5.0+)* 2. Run CSM. From the main menu, select "Help" > "Resource/Plugin Manager". ![Resource/Plugin Manager](doc/images/resource-plugin-manager.png) @@ -43,6 +49,15 @@ To learn how you can get involved in a variety of ways, please see [Contibuting Cameo MDK is a Java project that uses the [Gradle](https://gradle.org/) build tool. It can be imported as a Gradle project in IDEs like [IntelliJ](https://www.jetbrains.com/idea/) and [Eclipse](https://www.eclipse.org/ide/). ## Common Tasks +*Note starting in version 5.0 you will need to define a build profile (in `./buildProfiles`) which will house the classpath +for your particular version of cameo. In order to retrieve this classpath, copy paste the CLASSPATH entry from your +`${md.install.dir}/bin/(magicraw/csm/cea).properties` file. Copy the entire line into a new file and find replace the `\:` +with `,` for more information refer to the existing `buildProfiles/opensource.properties`. Also, note that that profile should +work for most 19.0sp3 installations.* + +In order to use your custom profile run any of the below commands with `-PbuildAccess=` otherwise it will +default to using `opensource`. + * `./gradlew dependencies` will download all necessary dependencies. * `./gradlew assemble` will compile Cameo MDK from source. * `./gradlew distZip` will package the installable plugin. From 5c8ecd442bd8d0c71fcf804a5ffdfedca3a64d94 Mon Sep 17 00:00:00 2001 From: Enquier Date: Tue, 9 Nov 2021 14:00:54 -0700 Subject: [PATCH 22/28] Update build profiles based on feedback --- .circleci/config.yml | 6 +- build.gradle | 91 +++++++++++++++++++------------ buildProfiles/.gitignore | 4 ++ buildProfiles/example.properties | 18 ++++++ buildProfiles/internal.properties | 2 - 5 files changed, 80 insertions(+), 41 deletions(-) create mode 100644 buildProfiles/.gitignore create mode 100644 buildProfiles/example.properties delete mode 100644 buildProfiles/internal.properties diff --git a/.circleci/config.yml b/.circleci/config.yml index 387bee781..3b313398b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -38,7 +38,7 @@ jobs: - gradle-repo-v5- - run: name: Download uncached dependencies - command: ./gradlew -PbuildAccess=opensource dependencies + command: ./gradlew dependencies no_output_timeout: 1h - save_cache: @@ -91,7 +91,7 @@ jobs: at: ~/ - run: name: Deploy snapshot - command: ./gradlew --info --stacktrace -PbuildAccess=opensource publishToSonatype + command: ./gradlew --info --stacktrace publishToSonatype deploy_release: executor: openjdk_executor steps: @@ -100,7 +100,7 @@ jobs: at: ~/ - run: name: Deploy release - command: ./gradlew --info --stacktrace -PbuildAccess=opensource publishToSonatype closeSonatypeStagingRepository + command: ./gradlew --info --stacktrace publishToSonatype closeSonatypeStagingRepository workflows: version: 2 diff --git a/build.gradle b/build.gradle index bcd37d41d..11e549a10 100644 --- a/build.gradle +++ b/build.gradle @@ -2,6 +2,8 @@ import java.time.LocalDateTime import java.time.format.DateTimeFormatter import java.util.stream.Collectors import java.util.zip.ZipFile +import groovy.json.JsonSlurper; + String buildAccess = project.getProperties().getOrDefault('buildAccess', 'opensource') String buildTag = project.getProperties().get('buildTag') @@ -12,20 +14,23 @@ if ((buildTag == null || buildTag.isEmpty()) && !version.endsWith('-SNAPSHOT')) version += '-SNAPSHOT' } -if (buildAccess == 'internal') { - group = group.replace('org.openmbee', 'gov.nasa.jpl.cae') -} -String buildNumber = project.hasProperty('buildNumber') ? project.getProperty('buildNumber') : System.currentTimeSeconds() -String timestamp = DateTimeFormatter.ofPattern("yyyy-MM-dd-HH:mm").format(LocalDateTime.now()) - -// classpathLibraries as defined in bin/[magicdraw|csm].properties#CLASSPATH are stored in ./buildProfiles def profiles = new Properties() +def parser = new JsonSlurper() try { file("buildProfiles/" + buildAccess + ".properties").withInputStream { profiles.load(it) } } catch (FileNotFoundException e) { println "Profile Properties File not found using default:" + e.message file("buildProfiles/opensource.properties").withInputStream { profiles.load(it) } } + +if (profiles['group'] != null) { + group = group.replace('org.openmbee', profiles['group']) +} +String buildNumber = project.hasProperty('buildNumber') ? project.getProperty('buildNumber') : System.currentTimeSeconds() +String timestamp = DateTimeFormatter.ofPattern("yyyy-MM-dd-HH:mm").format(LocalDateTime.now()) + +// classpathLibraries as defined in bin/[magicdraw|csm].properties#CLASSPATH are stored in ./buildProfiles + String[] classpathLibraries = profiles["classpathLibraries"].toString().split(','); String docbookNameVersion = 'docbook-xsl-1.79.1' @@ -60,30 +65,6 @@ repositories { maven { url 'https://repo.gradle.org/gradle/libs-releases-local/' } - if (buildAccess == 'internal') { - maven { - url 'https://cae-artifactory.jpl.nasa.gov/artifactory/maven-libs-snapshot-virtual' - credentials { - username project.getProperties().get('artifactoryUsername') - password project.getProperties().get('artifactoryPassword') - } - } - maven { - url 'https://cae-artifactory.jpl.nasa.gov/artifactory/maven-libs-release-virtual' - credentials { - username project.getProperties().get('artifactoryUsername') - password project.getProperties().get('artifactoryPassword') - } - } - } - else { - ivy { - url 'http://download1.nomagic.com/' - layout 'pattern', { - artifact '/[module][revision]/[classifier].[ext]' - } - } - } ivy { url 'https://sourceforge.net/projects/docbook/files/docbook-xsl/' layout 'pattern', { @@ -98,6 +79,41 @@ repositories { } } } +if (profiles['repositories'] != null) { + def repos = parser.parseText(profiles['repositories'].toString()) + repos.each { + if (it.type == 'maven') { + def mavenRepo = it + repositories.maven { + url "${mavenRepo.url}" + if (mavenRepo.credentials == true) { + credentials { + username project.getProperties().get('artifactoryUsername') + password project.getProperties().get('artifactoryPassword') + } + } + } + } + if (it["type"] == 'ivy') { + def ivyRepo = it + repositories.ivy { + url "${ivyRepo.url}" + layout "${ivyRepo.layout.type}", { + artifact '' + ivyRepo.layout.pattern + } + } + } + } +} +else { + repositories.ivy { + url 'http://download1.nomagic.com/' + layout 'pattern', { + artifact '/[module][revision]/[classifier].[ext]' + } + } +} + configurations { preCompile @@ -173,9 +189,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.4.4', classifier: 'linux', ext: 'zip' - + if (profiles['nomagicDeps'] != null) { + def mdDeps = parser.parseText(profiles['nomagicDeps'].toString()) + mdDeps.each { + def dep = it + preCompile group: "${dep.group}", name: "${dep.name}", version: "${dep.version}", classifier: "${dep.classifier != null ? dep.classifier : ''}", ext: "${dep.ext}" + } } else { preCompile group: 'com.nomagic', name: 'demomagicdraw', version: '190sp3', classifier: 'MagicDraw_Demo_190_sp3_no_install', ext: 'zip' @@ -530,8 +549,8 @@ task runJava(type: JavaExec) { standardOutput = System.out errorOutput = System.err - if (buildAccess == 'internal') { - executable = '/Applications/MagicDraw/cae-cameo-systems-modeler-5.0.0-SNAPSHOT-macos/jre/Contents/Home/bin/java' + if (profiles["executablePath"] != null) { + executable = profiles["executablePath"] } main = 'com.nomagic.osgi.launcher.ProductionFrameworkLauncher' jvmArgs = ['-Xmx8192M', '-Xss512M', '-DLOCALCONFIG=true', '-DWINCONFIG=true', '-Djsse.enableSNIExtension=true', '-Djava.net.preferIPv4Stack=true', '-Dcom.sun.media.imageio.disableCodecLib=true', '-noverify', '-Dlocal.config.dir.ext=-dev', '-splash:data/splash.png', '-Dmd.class.path=$java.class.path', '-Dcom.nomagic.osgi.config.dir=configuration', '-Desi.system.config=data/application.conf', '-Dlogback.configurationFile=data/logback.xml', '-Dsun.locale.formatasdefault=true', '-Dorg.osgi.framework.bundle.parent=ext'] diff --git a/buildProfiles/.gitignore b/buildProfiles/.gitignore new file mode 100644 index 000000000..51e1d9e3a --- /dev/null +++ b/buildProfiles/.gitignore @@ -0,0 +1,4 @@ +* +!example.properties +!opensource.properties +!.gitignore \ No newline at end of file diff --git a/buildProfiles/example.properties b/buildProfiles/example.properties new file mode 100644 index 000000000..e0160bcc8 --- /dev/null +++ b/buildProfiles/example.properties @@ -0,0 +1,18 @@ +#Example Properties file for custom builds of MDK + +#Specifies the desired classpath for MD/Cameo related resources, copy paste from /bin/.properties and find replace \: for ',' +#classpathLibraries = "lib/patch.jar,lib/brand.jar,lib/brand_api.jar,lib/md.jar,lib/md_api.jar,lib/md_common.jar,lib/md_common_api.jar,lib/md_common_test.jar,lib/tw_common.jar,lib/tw_common_api.jar,lib/launcher.jar,lib/activation.jar,lib/annotation.jar,lib/batik.jar,lib/bridj-0.7.0.jar,lib/bundles/ch.qos.logback.classic_1.2.3.jar,lib/bundles/ch.qos.logback.core_1.2.3.jar,lib/bundles/cmof_1.4.0.202006020804/cmof14.jar,lib/bundles/cmof_1.4.0.202006020804/tas.jar,lib/bundles/com.esotericsoftware.kryo_2.22.0.201401231130.jar,lib/bundles/com.google.guava_18.0.0.jar,lib/bundles/com.nomagic.annotations_1.0.0/com.nomagic.annotation-1.0.jar,lib/bundles/com.nomagic.ci.binary_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.ci.metamodel.project_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.ci.persistence.local_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.ci.persistence_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.ci.services_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.ci_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.magicdraw.ce_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.core.diagram_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.core.project.options_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.core_1.0.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.esi.binary.metamodel_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.esi.esiproject_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.esi.uuidmap_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.foundation_2.0.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.osgi.fragment_1.0.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.security_18.3.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.uml2_2.5.1.202006020804.jar,lib/bundles/com.nomagic.magicdraw_17.0.5.202006020804.jar,lib/bundles/com.teamdev.jxbrowser.chromium.internal.linux64_6.24.1.jar,lib/bundles/com.teamdev.jxbrowser.chromium.internal.mac_6.24.1.jar,lib/bundles/com.teamdev.jxbrowser.chromium.internal.win32_6.24.1.jar,lib/bundles/com.teamdev.jxbrowser.chromium.internal.win64_6.24.1.jar,lib/bundles/com.teamdev.jxbrowser.chromium_6.24.1.jar,lib/bundles/com.typesafe.config_1.3.0.jar,lib/bundles/com.typesafe.sslconfig_0.2.2.jar,lib/bundles/de.schlichtherle.truezip_7.4.3.v20200602-0758/lib/truezip-driver-zip-7.4.3.jar,lib/bundles/de.schlichtherle.truezip_7.4.3.v20200602-0758/lib/truezip-kernel-7.4.3.jar,lib/bundles/gnu.trove_3.0.3/lib/trove-3.0.3.jar,lib/bundles/io.aeron.client_1.7.0.jar,lib/bundles/io.aeron.driver_1.7.0.jar,lib/bundles/io.dropwizard.metrics.core_3.1.2.jar,lib/bundles/io.dropwizard.metrics.graphite_3.1.2.jar,lib/bundles/io.netty.buffer_4.1.21.Final.jar,lib/bundles/io.netty.codec_4.1.21.Final.jar,lib/bundles/io.netty.common_4.1.21.Final.jar,lib/bundles/io.netty.handler_4.1.21.Final.jar,lib/bundles/io.netty.resolver_4.1.21.Final.jar,lib/bundles/io.netty.transport_4.1.21.Final.jar,lib/bundles/javax.jmi_1.0.0.202006020804/javax_jmi-1_0-fr.jar,lib/bundles/joda-time_2.9.1.jar,lib/bundles/lz4-java_1.3.0.jar,lib/bundles/org.agrona_0.9.12.jar,lib/bundles/org.apache.commons.codec_1.9.0.v20170208-1614.jar,lib/bundles/org.apache.commons.collections_3.2.1.jar,lib/bundles/org.apache.commons.compress_1.3.0.jar,lib/bundles/org.apache.commons.io_2.4.0.jar,lib/bundles/org.apache.commons.lang_2.6.0.v201404270220.jar,lib/bundles/org.apache.commons.logging_1.1.1.v201101211721.jar,lib/bundles/org.apache.felix.scr_2.0.10.v20170501-2007.jar,lib/bundles/org.apache.httpcomponents.httpclient_4.5.3.jar,lib/bundles/org.apache.httpcomponents.httpcore_4.4.6.v20170210-0925.jar,lib/bundles/org.apache.log4j_1.2.15.v201005080500.jar,lib/bundles/org.apache.servicemix.bundles.jsr305_2.0.1.1.jar,lib/bundles/org.apiguardian_1.1.0.v20190826-0900.jar,lib/bundles/org.eclipse.core.contenttype_3.6.0.v20170207-1037.jar,lib/bundles/org.eclipse.core.jobs_3.9.2.v20171030-1027.jar,lib/bundles/org.eclipse.core.runtime_3.13.0.v20170207-1030.jar,lib/bundles/org.eclipse.emf.common_2.13.0.v20170609-0707.jar,lib/bundles/org.eclipse.emf.ecore.xmi_2.13.0.v20170609-0707.jar,lib/bundles/org.eclipse.emf.ecore_2.13.0.v20170609-0707.jar,lib/bundles/org.eclipse.equinox.app_1.3.400.v20150715-1528.jar,lib/bundles/org.eclipse.equinox.common_3.9.0.v20170207-1454.jar,lib/bundles/org.eclipse.equinox.ds_1.5.0.v20170307-1429.jar,lib/bundles/org.eclipse.equinox.preferences_3.7.0.v20170126-2132.jar,lib/bundles/org.eclipse.equinox.registry_3.7.0.v20170222-1344.jar,lib/bundles/org.eclipse.osgi.services_3.6.0.v20170228-1906.jar,lib/bundles/org.eclipse.osgi.util_3.4.0.v20170111-1608.jar,lib/bundles/org.eclipse.osgi_3.12.50.v20170928-1321.jar,lib/bundles/org.eclipse.uml2.common_1.5.0.v200905041045.jar,lib/bundles/org.hamcrest.core_1.3.0.v201303031735.jar,lib/bundles/org.jboss.netty_3.10.6.Final.jar,lib/bundles/org.json_1.0.0.255610281323.jar,lib/bundles/org.junit.jupiter.api_5.5.1.v20190826-0900.jar,lib/bundles/org.junit.jupiter.params_5.5.1.v20190826-0900.jar,lib/bundles/org.junit.platform.commons_1.5.1.v20190826-0900.jar,lib/bundles/org.junit_4.12.0.v201504281640/junit.jar,lib/bundles/org.opentest4j_1.2.0.v20190826-0900.jar,lib/bundles/org.reactivestreams.reactive-streams_1.0.2.jar,lib/bundles/org.uncommons.maths_1.2.2.201301151508/lib/uncommons-maths-1.2.2a.jar,lib/bundles/slf4j.api_1.7.25.jar,lib/com.nomagic.osgi.launcher-17.0.5-SNAPSHOT.jar,lib/commons-compress-1.3.jar,lib/commons-httpclient-3.1.jar,lib/commons-logging-1.0.4.jar,lib/concurrent.jar,lib/EccpressoAll.jar,lib/ehcache-2.10.1.jar,lib/flexlm.jar,lib/graphics/clibwrapper_jiio.jar,lib/graphics/freehep-base.jar,lib/graphics/freehep-graphics2d.jar,lib/graphics/freehep-graphicsio-emf.jar,lib/graphics/freehep-graphicsio-ps.jar,lib/graphics/freehep-graphicsio.jar,lib/graphics/jai_imageio.jar,lib/gson-2.2.4.jar,lib/HTMLEditorLight.jar,lib/hunspell-bridj-1.0.5-SNAPSHOT.jar,lib/javassist.jar,lib/jhall.jar,lib/jide-action.jar,lib/jide-charts.jar,lib/jide-common.jar,lib/jide-components.jar,lib/jide-diff.jar,lib/jide-dock.jar,lib/jide-editor.jar,lib/jide-gantt.jar,lib/jide-grids.jar,lib/jide-shortcut.jar,lib/jimi.jar,lib/jna.jar,lib/jnp-client.jar,lib/jtidy-sources.zip,lib/jtidy.jar,lib/JUnitParams-1.0.1.jar,lib/lucene-analyzers-common-7.5.0.jar,lib/lucene-core-7.5.0.jar,lib/lucene-misc-7.5.0.jar,lib/poi-3.14-20160307.jar,lib/poi-ooxml-3.14-20160307.jar,lib/poi-ooxml-schemas-3.14-20160307.jar,lib/webservice/axis-config.jar,lib/webservice/axis.jar,lib/webservice/commons-discovery-0.2.jar,lib/webservice/jaxrpc.jar,lib/webservice/mdserviceclient.jar,lib/webservice/rsclient.jar,lib/webservice/wsdl4j-1.5.1.jar,lib/xalan.jar,lib/xmlbeans-2.6.0.jar,lib/y.jar" + +#Specify a custom package for magicdraw to download +#nomagicDeps = "[{"group": "gov.nasa.jpl.cae.nomagic", "name": "cae-cameo-systems-modeler-core", "version": "4.4.4", "classifier": "linux", "ext": "zip"}]" + +#If you wish to change the Java package structure group specify it here. Otherwise defaults to org.openmbee +#group = "gov.nasa.jpl.cae" + +#If you wish to pull from your own custom repositories specify them here in JSON format +#repositories = [{"type": "maven", "url": "", "credentials": true }, {"type": "maven", "url": "", "credentials": true }] + +#For development use of the runJava task, this will let you specify a path to a locally usable JRE for +#Cameo/MD and MDK. Otherwise your machine's JAVA_HOME will be used +#executablePath = "" + diff --git a/buildProfiles/internal.properties b/buildProfiles/internal.properties deleted file mode 100644 index ee57af5c6..000000000 --- a/buildProfiles/internal.properties +++ /dev/null @@ -1,2 +0,0 @@ -classpathLibraries = "lib/patch.jar,lib/brand.jar,lib/brand_api.jar,lib/md.jar,lib/md_api.jar,lib/md_common.jar,lib/md_common_api.jar,lib/md_common_test.jar,lib/tw_common.jar,lib/tw_common_api.jar,lib/launcher.jar,lib/activation.jar,lib/annotation.jar,lib/batik.jar,lib/bridj-0.7.0.jar,lib/bundles/ch.qos.logback.classic_1.2.3.jar,lib/bundles/ch.qos.logback.core_1.2.3.jar,lib/bundles/cmof_1.4.0.202006020804/cmof14.jar,lib/bundles/cmof_1.4.0.202006020804/tas.jar,lib/bundles/com.esotericsoftware.kryo_2.22.0.201401231130.jar,lib/bundles/com.google.guava_18.0.0.jar,lib/bundles/com.nomagic.annotations_1.0.0/com.nomagic.annotation-1.0.jar,lib/bundles/com.nomagic.ci.binary_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.ci.metamodel.project_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.ci.persistence.local_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.ci.persistence_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.ci.services_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.ci_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.magicdraw.ce_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.core.diagram_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.core.project.options_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.core_1.0.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.esi.binary.metamodel_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.esi.esiproject_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.esi.uuidmap_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.foundation_2.0.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.osgi.fragment_1.0.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.security_18.3.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.uml2_2.5.1.202006020804.jar,lib/bundles/com.nomagic.magicdraw_17.0.5.202006020804.jar,lib/bundles/com.teamdev.jxbrowser.chromium.internal.linux64_6.24.1.jar,lib/bundles/com.teamdev.jxbrowser.chromium.internal.mac_6.24.1.jar,lib/bundles/com.teamdev.jxbrowser.chromium.internal.win32_6.24.1.jar,lib/bundles/com.teamdev.jxbrowser.chromium.internal.win64_6.24.1.jar,lib/bundles/com.teamdev.jxbrowser.chromium_6.24.1.jar,lib/bundles/com.typesafe.config_1.3.0.jar,lib/bundles/com.typesafe.sslconfig_0.2.2.jar,lib/bundles/de.schlichtherle.truezip_7.4.3.v20200602-0758/lib/truezip-driver-zip-7.4.3.jar,lib/bundles/de.schlichtherle.truezip_7.4.3.v20200602-0758/lib/truezip-kernel-7.4.3.jar,lib/bundles/gnu.trove_3.0.3/lib/trove-3.0.3.jar,lib/bundles/io.aeron.client_1.7.0.jar,lib/bundles/io.aeron.driver_1.7.0.jar,lib/bundles/io.dropwizard.metrics.core_3.1.2.jar,lib/bundles/io.dropwizard.metrics.graphite_3.1.2.jar,lib/bundles/io.netty.buffer_4.1.21.Final.jar,lib/bundles/io.netty.codec_4.1.21.Final.jar,lib/bundles/io.netty.common_4.1.21.Final.jar,lib/bundles/io.netty.handler_4.1.21.Final.jar,lib/bundles/io.netty.resolver_4.1.21.Final.jar,lib/bundles/io.netty.transport_4.1.21.Final.jar,lib/bundles/javax.jmi_1.0.0.202006020804/javax_jmi-1_0-fr.jar,lib/bundles/joda-time_2.9.1.jar,lib/bundles/lz4-java_1.3.0.jar,lib/bundles/org.agrona_0.9.12.jar,lib/bundles/org.apache.commons.codec_1.9.0.v20170208-1614.jar,lib/bundles/org.apache.commons.collections_3.2.1.jar,lib/bundles/org.apache.commons.compress_1.3.0.jar,lib/bundles/org.apache.commons.io_2.4.0.jar,lib/bundles/org.apache.commons.lang_2.6.0.v201404270220.jar,lib/bundles/org.apache.commons.logging_1.1.1.v201101211721.jar,lib/bundles/org.apache.felix.scr_2.0.10.v20170501-2007.jar,lib/bundles/org.apache.httpcomponents.httpclient_4.5.3.jar,lib/bundles/org.apache.httpcomponents.httpcore_4.4.6.v20170210-0925.jar,lib/bundles/org.apache.log4j_1.2.15.v201005080500.jar,lib/bundles/org.apache.servicemix.bundles.jsr305_2.0.1.1.jar,lib/bundles/org.apiguardian_1.1.0.v20190826-0900.jar,lib/bundles/org.eclipse.core.contenttype_3.6.0.v20170207-1037.jar,lib/bundles/org.eclipse.core.jobs_3.9.2.v20171030-1027.jar,lib/bundles/org.eclipse.core.runtime_3.13.0.v20170207-1030.jar,lib/bundles/org.eclipse.emf.common_2.13.0.v20170609-0707.jar,lib/bundles/org.eclipse.emf.ecore.xmi_2.13.0.v20170609-0707.jar,lib/bundles/org.eclipse.emf.ecore_2.13.0.v20170609-0707.jar,lib/bundles/org.eclipse.equinox.app_1.3.400.v20150715-1528.jar,lib/bundles/org.eclipse.equinox.common_3.9.0.v20170207-1454.jar,lib/bundles/org.eclipse.equinox.ds_1.5.0.v20170307-1429.jar,lib/bundles/org.eclipse.equinox.preferences_3.7.0.v20170126-2132.jar,lib/bundles/org.eclipse.equinox.registry_3.7.0.v20170222-1344.jar,lib/bundles/org.eclipse.osgi.services_3.6.0.v20170228-1906.jar,lib/bundles/org.eclipse.osgi.util_3.4.0.v20170111-1608.jar,lib/bundles/org.eclipse.osgi_3.12.50.v20170928-1321.jar,lib/bundles/org.eclipse.uml2.common_1.5.0.v200905041045.jar,lib/bundles/org.hamcrest.core_1.3.0.v201303031735.jar,lib/bundles/org.jboss.netty_3.10.6.Final.jar,lib/bundles/org.json_1.0.0.255610281323.jar,lib/bundles/org.junit.jupiter.api_5.5.1.v20190826-0900.jar,lib/bundles/org.junit.jupiter.params_5.5.1.v20190826-0900.jar,lib/bundles/org.junit.platform.commons_1.5.1.v20190826-0900.jar,lib/bundles/org.junit_4.12.0.v201504281640/junit.jar,lib/bundles/org.opentest4j_1.2.0.v20190826-0900.jar,lib/bundles/org.reactivestreams.reactive-streams_1.0.2.jar,lib/bundles/org.uncommons.maths_1.2.2.201301151508/lib/uncommons-maths-1.2.2a.jar,lib/bundles/slf4j.api_1.7.25.jar,lib/com.nomagic.osgi.launcher-17.0.5-SNAPSHOT.jar,lib/commons-compress-1.3.jar,lib/commons-httpclient-3.1.jar,lib/commons-logging-1.0.4.jar,lib/concurrent.jar,lib/EccpressoAll.jar,lib/ehcache-2.10.1.jar,lib/flexlm.jar,lib/graphics/clibwrapper_jiio.jar,lib/graphics/freehep-base.jar,lib/graphics/freehep-graphics2d.jar,lib/graphics/freehep-graphicsio-emf.jar,lib/graphics/freehep-graphicsio-ps.jar,lib/graphics/freehep-graphicsio.jar,lib/graphics/jai_imageio.jar,lib/gson-2.2.4.jar,lib/HTMLEditorLight.jar,lib/hunspell-bridj-1.0.5-SNAPSHOT.jar,lib/javassist.jar,lib/jhall.jar,lib/jide-action.jar,lib/jide-charts.jar,lib/jide-common.jar,lib/jide-components.jar,lib/jide-diff.jar,lib/jide-dock.jar,lib/jide-editor.jar,lib/jide-gantt.jar,lib/jide-grids.jar,lib/jide-shortcut.jar,lib/jimi.jar,lib/jna.jar,lib/jnp-client.jar,lib/jtidy-sources.zip,lib/jtidy.jar,lib/JUnitParams-1.0.1.jar,lib/lucene-analyzers-common-7.5.0.jar,lib/lucene-core-7.5.0.jar,lib/lucene-misc-7.5.0.jar,lib/poi-3.14-20160307.jar,lib/poi-ooxml-3.14-20160307.jar,lib/poi-ooxml-schemas-3.14-20160307.jar,lib/webservice/axis-config.jar,lib/webservice/axis.jar,lib/webservice/commons-discovery-0.2.jar,lib/webservice/jaxrpc.jar,lib/webservice/mdserviceclient.jar,lib/webservice/rsclient.jar,lib/webservice/wsdl4j-1.5.1.jar,lib/xalan.jar,lib/xmlbeans-2.6.0.jar,lib/y.jar" - From e006023ce0752561a3df8f929e82465266871649 Mon Sep 17 00:00:00 2001 From: Enquier Date: Tue, 9 Nov 2021 14:59:36 -0700 Subject: [PATCH 23/28] Adding last removal of internal references. --- build.gradle | 9 ++++++--- buildProfiles/example.properties | 3 +++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 11e549a10..b84549d43 100644 --- a/build.gradle +++ b/build.gradle @@ -31,7 +31,7 @@ String timestamp = DateTimeFormatter.ofPattern("yyyy-MM-dd-HH:mm").format(LocalD // classpathLibraries as defined in bin/[magicdraw|csm].properties#CLASSPATH are stored in ./buildProfiles -String[] classpathLibraries = profiles["classpathLibraries"].toString().split(','); +String[] classpathLibraries = profiles["classpathLibraries"].toString().split(',') String docbookNameVersion = 'docbook-xsl-1.79.1' String fopNameVersion = 'fop-1.1' @@ -210,8 +210,11 @@ dependencies { compile files(classpathLibraries.collect { 'build/dependency-cache/extracted/magicdraw/' + it }) compile fileTree(dir: 'build/dependency-cache/extracted/magicdraw', include: ['lib/**/*.jar', 'plugins/**/*.jar'], exclude: ([ classpathLibraries, ['plugins/com.nomagic.collaborator.publisher/**/*.jar', 'plugins/com.nomagic.magicdraw.emfuml2xmi*/**/*.jar', 'plugins/com.nomagic.magicdraw.automaton/lib/engines/**/*.jar', 'plugins/tomsawyer/**/*.jar', 'plugins/com.intercax.syndeia.md/**/*.jar'] ]).flatten()) compile fileTree(dir: 'lib', include: ['**/*.jar']) - if (buildAccess == 'internal') { - compile files('build/dependency-cache/extracted/fop/jars/fop-1.1.jar', 'build/dependency-cache/extracted/fop/jars/xmlgraphics-commons-1.5.jar', 'build/dependency-cache/extracted/magicdraw/jre/lib/ext/jfxrt.jar') + if (profiles["compileFiles"] != null) { + def compileArray = profiles["compileFiles"].toString().split(',') + compileArray.each { + compile files(it) + } } else { compile files('build/dependency-cache/extracted/fop/jars/fop-1.1.jar', 'build/dependency-cache/extracted/fop/jars/xmlgraphics-commons-1.5.jar') diff --git a/buildProfiles/example.properties b/buildProfiles/example.properties index e0160bcc8..a32f63667 100644 --- a/buildProfiles/example.properties +++ b/buildProfiles/example.properties @@ -6,6 +6,9 @@ #Specify a custom package for magicdraw to download #nomagicDeps = "[{"group": "gov.nasa.jpl.cae.nomagic", "name": "cae-cameo-systems-modeler-core", "version": "4.4.4", "classifier": "linux", "ext": "zip"}]" +#Specify a custom list of additional non-java dependencies for your build (i.e. if you need JavaFX or FOP) +#compileFiles = build/dependency-cache/extracted/fop/jars/fop-1.1.jar,build/dependency-cache/extracted/fop/jars/xmlgraphics-commons-1.5.jar,build/dependency-cache/extracted/magicdraw/jre/lib/ext/jfxrt.jar + #If you wish to change the Java package structure group specify it here. Otherwise defaults to org.openmbee #group = "gov.nasa.jpl.cae" From eec3cc993325893e8673fbfe875772b3fba0cc4d Mon Sep 17 00:00:00 2001 From: Enquier Date: Tue, 9 Nov 2021 15:36:23 -0700 Subject: [PATCH 24/28] Scooping up last buildAccess references, making the profile system more defaulty and readme tweaks --- .circleci/config.yml | 2 +- Jenkinsfile | 12 +++++----- README.md | 39 +++++++++++++++++++++++--------- build.gradle | 37 +++++++++++++++++++++++------- buildProfiles/example.properties | 25 ++++++++++++-------- lgtm.yml | 2 +- 6 files changed, 81 insertions(+), 36 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3b313398b..d1c90263a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -48,7 +48,7 @@ jobs: - run: name: Compile - command: ./gradlew --refresh-dependencies --info --stacktrace -PbuildAccess=opensource clean assemble + command: ./gradlew --refresh-dependencies --info --stacktrace clean assemble # # Test # - run: diff --git a/Jenkinsfile b/Jenkinsfile index abcf99e1b..2cff4c6ee 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,7 @@ pipeline { GRADLE_USER_HOME = "$WORKSPACE/.gradle" ARTIFACTORY_CREDENTIALS = credentials('mdk-artifactory-credentials') TESTRAIL_CREDENTIALS = credentials('mdk-testrail-credentials') - BUILD_ACCESS = credentials('mdk-build-access') + BUILD_PROFILE = credentials('mdk-build-access') TESTRAIL_HOST = credentials('mdk-testrail-host') TESTRAIL_SUITE_ID = credentials('mdk-testrail-suite-id') ARTIFACTORY_URL = credentials('mdk-artifactory-url') @@ -21,7 +21,7 @@ pipeline { echo 'TAG_NAME = $TAG_NAME' sh './gradlew \ -PbuildNumber=$BUILD_NUMBER \ - -PbuildAccess=$BUILD_ACCESS \ + -PbuildProfile=$BUILD_PROFILE \ -PbuildTag=$TAG_NAME \ -PartifactoryUrl=$ARTIFACTORY_URL \ -PartifactoryUsername=$ARTIFACTORY_CREDENTIALS_USR \ @@ -35,7 +35,7 @@ pipeline { steps { sh './gradlew \ -PbuildNumber=$BUILD_NUMBER \ - -PbuildAccess=$BUILD_ACCESS \ + -PbuildProfile=$BUILD_PROFILE \ -PbuildTag=$TAG_NAME \ -PartifactoryUrl=$ARTIFACTORY_URL \ -PartifactoryUsername=$ARTIFACTORY_CREDENTIALS_USR \ @@ -49,7 +49,7 @@ pipeline { steps { sh 'xvfb-run ./gradlew \ -PbuildNumber=$BUILD_NUMBER \ - -PbuildAccess=$BUILD_ACCESS \ + -PbuildProfile=$BUILD_PROFILE \ -PbuildTag=$TAG_NAME \ -PartifactoryUrl=$ARTIFACTORY_URL \ -PartifactoryUsername=$ARTIFACTORY_CREDENTIALS_USR \ @@ -69,7 +69,7 @@ pipeline { steps { sh './gradlew \ -PbuildNumber=$BUILD_NUMBER \ - -PbuildAccess=$BUILD_ACCESS \ + -PbuildProfile=$BUILD_PROFILE \ -PbuildTag=$TAG_NAME \ -PartifactoryUrl=$ARTIFACTORY_URL \ -PartifactoryUsername=$ARTIFACTORY_CREDENTIALS_USR \ @@ -86,7 +86,7 @@ pipeline { steps { sh './gradlew \ -PbuildNumber=$BUILD_NUMBER \ - -PbuildAccess=$BUILD_ACCESS \ + -PbuildProfile=$BUILD_PROFILE \ -PbuildTag=$TAG_NAME \ -PartifactoryUrl=$ARTIFACTORY_URL \ -PartifactoryUsername=$ARTIFACTORY_CREDENTIALS_USR \ diff --git a/README.md b/README.md index b9c6a1a9f..79878100c 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Cameo MDK is a plugin for [Cameo Systems Modeler](https://www.nomagic.com/produc ## Prerequisites * [Cameo Systems Modeler (CSM)](https://www.nomagic.com/products/cameo-systems-modeler) or another No Magic environment bundle that includes the [SysML plugin](https://www.nomagic.com/product-addons/magicdraw-addons/sysml-plugin) - * The latest Cameo MDK is tested with and supports **19.0 SP4**. Compatibility for previous versions of Cameo MDK can be found in the [compatibility matrices](https://github.com/Open-MBEE/open-mbee.github.io/wiki/Compatibilities). + * The latest Cameo MDK is tested with and supports **19.0 SP3** and **19.0 SP4** (you must use a custom profile for SP4). Compatibility for previous versions of Cameo MDK can be found in the [compatibility matrices](https://github.com/Open-MBEE/open-mbee.github.io/wiki/Compatibilities). #### Versions prior to 5.x: * [Model Management System (MMS) 3](https://github.com/Open-MBEE/mms-alfresco) #### Version 5.0+ @@ -19,8 +19,8 @@ Cameo MDK is a plugin for [Cameo Systems Modeler](https://www.nomagic.com/produc 1. [Download](https://github.com/Open-MBEE/mdk/releases/latest) the Cameo MDK plugin, e.g. `mdk-*-plugin.zip`. - *Note: Make sure you are downloading the correct version for your installation of MMS (for mms-alfresco (mms3/donbot) use - version 4.5.x, for mms (mms4/execubots) use versions 5.0+)* + >**Note:** *Make sure you are downloading the correct version for your installation of MMS (for mms-alfresco (mms3/donbot) use + >version 4.5.x, for mms (mms4/execubots) use versions 5.0+)* 2. Run CSM. From the main menu, select "Help" > "Resource/Plugin Manager". ![Resource/Plugin Manager](doc/images/resource-plugin-manager.png) @@ -48,15 +48,32 @@ To learn how you can get involved in a variety of ways, please see [Contibuting Cameo MDK is a Java project that uses the [Gradle](https://gradle.org/) build tool. It can be imported as a Gradle project in IDEs like [IntelliJ](https://www.jetbrains.com/idea/) and [Eclipse](https://www.eclipse.org/ide/). -## Common Tasks -*Note starting in version 5.0 you will need to define a build profile (in `./buildProfiles`) which will house the classpath -for your particular version of cameo. In order to retrieve this classpath, copy paste the CLASSPATH entry from your -`${md.install.dir}/bin/(magicraw/csm/cea).properties` file. Copy the entire line into a new file and find replace the `\:` -with `,` for more information refer to the existing `buildProfiles/opensource.properties`. Also, note that that profile should -work for most 19.0sp3 installations.* -In order to use your custom profile run any of the below commands with `-PbuildAccess=` otherwise it will -default to using `opensource`. +## Custom Build Profiles +Starting with version 5.0+ you will be able to define custom build profiles (in `./buildProfiles`) which will house +the classpath and other variables previously managed by setting `-buildAccess=internal`. These profiles will allow +customization based on your build process and for your particular version of Cameo. + +**NOTE:** By default build profiles are excluded from being committed to git by a `buildProfiles/.gitignore` + +### Create a new profile +Create a new java properties file in `buildProfiles/.properties`. +In order to use a custom profile to run any of the below commands. Use the command with `-PbuildProfile=` +> For more examples of what properties are available in profiles see the example file in `buildProfiles/example.properties` + +### For users of non-standard cameo bundles +To retrieve the classpath: +1. Copy the CLASSPATH entry from your `${md.install.dir}/bin/(magicraw/csm/cea).properties` file. +2. Paste the entire line into a new file and find replace the `\:` with `,` and set it equal to `classpath` +3. Save this file to `buildProfiles/.properties` +> This is only necessary for custom build repositories or non-SP3 builds, most users will not need to modify the classpath +> and modification of the classpath is not necessary to use profiles! + + + +## Build +>In order to use a custom profile to run any of the below commands. Use the command with `-PbuildProfile=` otherwise it will +>default to using `opensource`. * `./gradlew dependencies` will download all necessary dependencies. * `./gradlew assemble` will compile Cameo MDK from source. diff --git a/build.gradle b/build.gradle index b84549d43..c1b5d8cf8 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ import java.util.zip.ZipFile import groovy.json.JsonSlurper; -String buildAccess = project.getProperties().getOrDefault('buildAccess', 'opensource') +String buildProfile = project.getProperties().getOrDefault('buildProfile', 'opensource') String buildTag = project.getProperties().get('buildTag') if (buildTag != null && !buildTag.isEmpty() && buildTag != version) { throw new GradleException('Version mismatch: '+buildTag+' vs '+version) @@ -16,22 +16,37 @@ if ((buildTag == null || buildTag.isEmpty()) && !version.endsWith('-SNAPSHOT')) def profiles = new Properties() def parser = new JsonSlurper() -try { - file("buildProfiles/" + buildAccess + ".properties").withInputStream { profiles.load(it) } -} catch (FileNotFoundException e) { - println "Profile Properties File not found using default:" + e.message - file("buildProfiles/opensource.properties").withInputStream { profiles.load(it) } +def defaults = new Properties() +file("buildProfiles/opensource.properties").withInputStream { defaults.load(it) } + +if (buildProfile != 'opensource') { + try { + file("buildProfiles/" + buildProfile + ".properties").withInputStream { profiles.load(it) } + } catch (FileNotFoundException e) { + println "Profile Properties File not found using default:" + e.message + file("buildProfiles/opensource.properties").withInputStream { profiles.load(it) } + } +} +else{ + profiles = defaults } + + if (profiles['group'] != null) { group = group.replace('org.openmbee', profiles['group']) } String buildNumber = project.hasProperty('buildNumber') ? project.getProperty('buildNumber') : System.currentTimeSeconds() String timestamp = DateTimeFormatter.ofPattern("yyyy-MM-dd-HH:mm").format(LocalDateTime.now()) -// classpathLibraries as defined in bin/[magicdraw|csm].properties#CLASSPATH are stored in ./buildProfiles +String[] classpathLibraries = null +if (profiles['classpathLibraries'] != null) { + classpathLibraries = profiles["classpathLibraries"].toString().split(',') +} +else{ + classpathLibraries = defaults["classpathLibraries"].toString().split(',') +} -String[] classpathLibraries = profiles["classpathLibraries"].toString().split(',') String docbookNameVersion = 'docbook-xsl-1.79.1' String fopNameVersion = 'fop-1.1' @@ -98,6 +113,12 @@ if (profiles['repositories'] != null) { def ivyRepo = it repositories.ivy { url "${ivyRepo.url}" + if (ivyRepo.credentials == true) { + credentials { + username project.getProperties().get('artifactoryUsername') + password project.getProperties().get('artifactoryPassword') + } + } layout "${ivyRepo.layout.type}", { artifact '' + ivyRepo.layout.pattern } diff --git a/buildProfiles/example.properties b/buildProfiles/example.properties index a32f63667..052b5e1ad 100644 --- a/buildProfiles/example.properties +++ b/buildProfiles/example.properties @@ -1,21 +1,28 @@ -#Example Properties file for custom builds of MDK - +#/* Example Properties +# +#* This file serves as a reference for defining custom profiles for building MDK. You are not required to use any of +#* these properties to build MDK, any property if undefined will just cause the build script to use the defaults in build.gradle and +#* opensource.properties files +#/* #Specifies the desired classpath for MD/Cameo related resources, copy paste from /bin/.properties and find replace \: for ',' -#classpathLibraries = "lib/patch.jar,lib/brand.jar,lib/brand_api.jar,lib/md.jar,lib/md_api.jar,lib/md_common.jar,lib/md_common_api.jar,lib/md_common_test.jar,lib/tw_common.jar,lib/tw_common_api.jar,lib/launcher.jar,lib/activation.jar,lib/annotation.jar,lib/batik.jar,lib/bridj-0.7.0.jar,lib/bundles/ch.qos.logback.classic_1.2.3.jar,lib/bundles/ch.qos.logback.core_1.2.3.jar,lib/bundles/cmof_1.4.0.202006020804/cmof14.jar,lib/bundles/cmof_1.4.0.202006020804/tas.jar,lib/bundles/com.esotericsoftware.kryo_2.22.0.201401231130.jar,lib/bundles/com.google.guava_18.0.0.jar,lib/bundles/com.nomagic.annotations_1.0.0/com.nomagic.annotation-1.0.jar,lib/bundles/com.nomagic.ci.binary_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.ci.metamodel.project_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.ci.persistence.local_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.ci.persistence_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.ci.services_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.ci_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.magicdraw.ce_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.core.diagram_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.core.project.options_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.core_1.0.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.esi.binary.metamodel_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.esi.esiproject_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.esi.uuidmap_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.foundation_2.0.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.osgi.fragment_1.0.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.security_18.3.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.uml2_2.5.1.202006020804.jar,lib/bundles/com.nomagic.magicdraw_17.0.5.202006020804.jar,lib/bundles/com.teamdev.jxbrowser.chromium.internal.linux64_6.24.1.jar,lib/bundles/com.teamdev.jxbrowser.chromium.internal.mac_6.24.1.jar,lib/bundles/com.teamdev.jxbrowser.chromium.internal.win32_6.24.1.jar,lib/bundles/com.teamdev.jxbrowser.chromium.internal.win64_6.24.1.jar,lib/bundles/com.teamdev.jxbrowser.chromium_6.24.1.jar,lib/bundles/com.typesafe.config_1.3.0.jar,lib/bundles/com.typesafe.sslconfig_0.2.2.jar,lib/bundles/de.schlichtherle.truezip_7.4.3.v20200602-0758/lib/truezip-driver-zip-7.4.3.jar,lib/bundles/de.schlichtherle.truezip_7.4.3.v20200602-0758/lib/truezip-kernel-7.4.3.jar,lib/bundles/gnu.trove_3.0.3/lib/trove-3.0.3.jar,lib/bundles/io.aeron.client_1.7.0.jar,lib/bundles/io.aeron.driver_1.7.0.jar,lib/bundles/io.dropwizard.metrics.core_3.1.2.jar,lib/bundles/io.dropwizard.metrics.graphite_3.1.2.jar,lib/bundles/io.netty.buffer_4.1.21.Final.jar,lib/bundles/io.netty.codec_4.1.21.Final.jar,lib/bundles/io.netty.common_4.1.21.Final.jar,lib/bundles/io.netty.handler_4.1.21.Final.jar,lib/bundles/io.netty.resolver_4.1.21.Final.jar,lib/bundles/io.netty.transport_4.1.21.Final.jar,lib/bundles/javax.jmi_1.0.0.202006020804/javax_jmi-1_0-fr.jar,lib/bundles/joda-time_2.9.1.jar,lib/bundles/lz4-java_1.3.0.jar,lib/bundles/org.agrona_0.9.12.jar,lib/bundles/org.apache.commons.codec_1.9.0.v20170208-1614.jar,lib/bundles/org.apache.commons.collections_3.2.1.jar,lib/bundles/org.apache.commons.compress_1.3.0.jar,lib/bundles/org.apache.commons.io_2.4.0.jar,lib/bundles/org.apache.commons.lang_2.6.0.v201404270220.jar,lib/bundles/org.apache.commons.logging_1.1.1.v201101211721.jar,lib/bundles/org.apache.felix.scr_2.0.10.v20170501-2007.jar,lib/bundles/org.apache.httpcomponents.httpclient_4.5.3.jar,lib/bundles/org.apache.httpcomponents.httpcore_4.4.6.v20170210-0925.jar,lib/bundles/org.apache.log4j_1.2.15.v201005080500.jar,lib/bundles/org.apache.servicemix.bundles.jsr305_2.0.1.1.jar,lib/bundles/org.apiguardian_1.1.0.v20190826-0900.jar,lib/bundles/org.eclipse.core.contenttype_3.6.0.v20170207-1037.jar,lib/bundles/org.eclipse.core.jobs_3.9.2.v20171030-1027.jar,lib/bundles/org.eclipse.core.runtime_3.13.0.v20170207-1030.jar,lib/bundles/org.eclipse.emf.common_2.13.0.v20170609-0707.jar,lib/bundles/org.eclipse.emf.ecore.xmi_2.13.0.v20170609-0707.jar,lib/bundles/org.eclipse.emf.ecore_2.13.0.v20170609-0707.jar,lib/bundles/org.eclipse.equinox.app_1.3.400.v20150715-1528.jar,lib/bundles/org.eclipse.equinox.common_3.9.0.v20170207-1454.jar,lib/bundles/org.eclipse.equinox.ds_1.5.0.v20170307-1429.jar,lib/bundles/org.eclipse.equinox.preferences_3.7.0.v20170126-2132.jar,lib/bundles/org.eclipse.equinox.registry_3.7.0.v20170222-1344.jar,lib/bundles/org.eclipse.osgi.services_3.6.0.v20170228-1906.jar,lib/bundles/org.eclipse.osgi.util_3.4.0.v20170111-1608.jar,lib/bundles/org.eclipse.osgi_3.12.50.v20170928-1321.jar,lib/bundles/org.eclipse.uml2.common_1.5.0.v200905041045.jar,lib/bundles/org.hamcrest.core_1.3.0.v201303031735.jar,lib/bundles/org.jboss.netty_3.10.6.Final.jar,lib/bundles/org.json_1.0.0.255610281323.jar,lib/bundles/org.junit.jupiter.api_5.5.1.v20190826-0900.jar,lib/bundles/org.junit.jupiter.params_5.5.1.v20190826-0900.jar,lib/bundles/org.junit.platform.commons_1.5.1.v20190826-0900.jar,lib/bundles/org.junit_4.12.0.v201504281640/junit.jar,lib/bundles/org.opentest4j_1.2.0.v20190826-0900.jar,lib/bundles/org.reactivestreams.reactive-streams_1.0.2.jar,lib/bundles/org.uncommons.maths_1.2.2.201301151508/lib/uncommons-maths-1.2.2a.jar,lib/bundles/slf4j.api_1.7.25.jar,lib/com.nomagic.osgi.launcher-17.0.5-SNAPSHOT.jar,lib/commons-compress-1.3.jar,lib/commons-httpclient-3.1.jar,lib/commons-logging-1.0.4.jar,lib/concurrent.jar,lib/EccpressoAll.jar,lib/ehcache-2.10.1.jar,lib/flexlm.jar,lib/graphics/clibwrapper_jiio.jar,lib/graphics/freehep-base.jar,lib/graphics/freehep-graphics2d.jar,lib/graphics/freehep-graphicsio-emf.jar,lib/graphics/freehep-graphicsio-ps.jar,lib/graphics/freehep-graphicsio.jar,lib/graphics/jai_imageio.jar,lib/gson-2.2.4.jar,lib/HTMLEditorLight.jar,lib/hunspell-bridj-1.0.5-SNAPSHOT.jar,lib/javassist.jar,lib/jhall.jar,lib/jide-action.jar,lib/jide-charts.jar,lib/jide-common.jar,lib/jide-components.jar,lib/jide-diff.jar,lib/jide-dock.jar,lib/jide-editor.jar,lib/jide-gantt.jar,lib/jide-grids.jar,lib/jide-shortcut.jar,lib/jimi.jar,lib/jna.jar,lib/jnp-client.jar,lib/jtidy-sources.zip,lib/jtidy.jar,lib/JUnitParams-1.0.1.jar,lib/lucene-analyzers-common-7.5.0.jar,lib/lucene-core-7.5.0.jar,lib/lucene-misc-7.5.0.jar,lib/poi-3.14-20160307.jar,lib/poi-ooxml-3.14-20160307.jar,lib/poi-ooxml-schemas-3.14-20160307.jar,lib/webservice/axis-config.jar,lib/webservice/axis.jar,lib/webservice/commons-discovery-0.2.jar,lib/webservice/jaxrpc.jar,lib/webservice/mdserviceclient.jar,lib/webservice/rsclient.jar,lib/webservice/wsdl4j-1.5.1.jar,lib/xalan.jar,lib/xmlbeans-2.6.0.jar,lib/y.jar" +classpathLibraries = "lib/patch.jar,lib/brand.jar,lib/brand_api.jar,lib/md.jar,lib/md_api.jar,lib/md_common.jar,lib/md_common_api.jar,lib/md_common_test.jar,lib/tw_common.jar,lib/tw_common_api.jar,lib/launcher.jar,lib/activation.jar,lib/annotation.jar,lib/batik.jar,lib/bridj-0.7.0.jar,lib/bundles/ch.qos.logback.classic_1.2.3.jar,lib/bundles/ch.qos.logback.core_1.2.3.jar,lib/bundles/cmof_1.4.0.202006020804/cmof14.jar,lib/bundles/cmof_1.4.0.202006020804/tas.jar,lib/bundles/com.esotericsoftware.kryo_2.22.0.201401231130.jar,lib/bundles/com.google.guava_18.0.0.jar,lib/bundles/com.nomagic.annotations_1.0.0/com.nomagic.annotation-1.0.jar,lib/bundles/com.nomagic.ci.binary_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.ci.metamodel.project_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.ci.persistence.local_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.ci.persistence_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.ci.services_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.ci_17.0.5.v20200602-0758.jar,lib/bundles/com.nomagic.magicdraw.ce_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.core.diagram_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.core.project.options_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.core_1.0.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.esi.binary.metamodel_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.esi.esiproject_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.esi.uuidmap_18.1.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.foundation_2.0.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.osgi.fragment_1.0.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.security_18.3.0.202006020804.jar,lib/bundles/com.nomagic.magicdraw.uml2_2.5.1.202006020804.jar,lib/bundles/com.nomagic.magicdraw_17.0.5.202006020804.jar,lib/bundles/com.teamdev.jxbrowser.chromium.internal.linux64_6.24.1.jar,lib/bundles/com.teamdev.jxbrowser.chromium.internal.mac_6.24.1.jar,lib/bundles/com.teamdev.jxbrowser.chromium.internal.win32_6.24.1.jar,lib/bundles/com.teamdev.jxbrowser.chromium.internal.win64_6.24.1.jar,lib/bundles/com.teamdev.jxbrowser.chromium_6.24.1.jar,lib/bundles/com.typesafe.config_1.3.0.jar,lib/bundles/com.typesafe.sslconfig_0.2.2.jar,lib/bundles/de.schlichtherle.truezip_7.4.3.v20200602-0758/lib/truezip-driver-zip-7.4.3.jar,lib/bundles/de.schlichtherle.truezip_7.4.3.v20200602-0758/lib/truezip-kernel-7.4.3.jar,lib/bundles/gnu.trove_3.0.3/lib/trove-3.0.3.jar,lib/bundles/io.aeron.client_1.7.0.jar,lib/bundles/io.aeron.driver_1.7.0.jar,lib/bundles/io.dropwizard.metrics.core_3.1.2.jar,lib/bundles/io.dropwizard.metrics.graphite_3.1.2.jar,lib/bundles/io.netty.buffer_4.1.21.Final.jar,lib/bundles/io.netty.codec_4.1.21.Final.jar,lib/bundles/io.netty.common_4.1.21.Final.jar,lib/bundles/io.netty.handler_4.1.21.Final.jar,lib/bundles/io.netty.resolver_4.1.21.Final.jar,lib/bundles/io.netty.transport_4.1.21.Final.jar,lib/bundles/javax.jmi_1.0.0.202006020804/javax_jmi-1_0-fr.jar,lib/bundles/joda-time_2.9.1.jar,lib/bundles/lz4-java_1.3.0.jar,lib/bundles/org.agrona_0.9.12.jar,lib/bundles/org.apache.commons.codec_1.9.0.v20170208-1614.jar,lib/bundles/org.apache.commons.collections_3.2.1.jar,lib/bundles/org.apache.commons.compress_1.3.0.jar,lib/bundles/org.apache.commons.io_2.4.0.jar,lib/bundles/org.apache.commons.lang_2.6.0.v201404270220.jar,lib/bundles/org.apache.commons.logging_1.1.1.v201101211721.jar,lib/bundles/org.apache.felix.scr_2.0.10.v20170501-2007.jar,lib/bundles/org.apache.httpcomponents.httpclient_4.5.3.jar,lib/bundles/org.apache.httpcomponents.httpcore_4.4.6.v20170210-0925.jar,lib/bundles/org.apache.log4j_1.2.15.v201005080500.jar,lib/bundles/org.apache.servicemix.bundles.jsr305_2.0.1.1.jar,lib/bundles/org.apiguardian_1.1.0.v20190826-0900.jar,lib/bundles/org.eclipse.core.contenttype_3.6.0.v20170207-1037.jar,lib/bundles/org.eclipse.core.jobs_3.9.2.v20171030-1027.jar,lib/bundles/org.eclipse.core.runtime_3.13.0.v20170207-1030.jar,lib/bundles/org.eclipse.emf.common_2.13.0.v20170609-0707.jar,lib/bundles/org.eclipse.emf.ecore.xmi_2.13.0.v20170609-0707.jar,lib/bundles/org.eclipse.emf.ecore_2.13.0.v20170609-0707.jar,lib/bundles/org.eclipse.equinox.app_1.3.400.v20150715-1528.jar,lib/bundles/org.eclipse.equinox.common_3.9.0.v20170207-1454.jar,lib/bundles/org.eclipse.equinox.ds_1.5.0.v20170307-1429.jar,lib/bundles/org.eclipse.equinox.preferences_3.7.0.v20170126-2132.jar,lib/bundles/org.eclipse.equinox.registry_3.7.0.v20170222-1344.jar,lib/bundles/org.eclipse.osgi.services_3.6.0.v20170228-1906.jar,lib/bundles/org.eclipse.osgi.util_3.4.0.v20170111-1608.jar,lib/bundles/org.eclipse.osgi_3.12.50.v20170928-1321.jar,lib/bundles/org.eclipse.uml2.common_1.5.0.v200905041045.jar,lib/bundles/org.hamcrest.core_1.3.0.v201303031735.jar,lib/bundles/org.jboss.netty_3.10.6.Final.jar,lib/bundles/org.json_1.0.0.255610281323.jar,lib/bundles/org.junit.jupiter.api_5.5.1.v20190826-0900.jar,lib/bundles/org.junit.jupiter.params_5.5.1.v20190826-0900.jar,lib/bundles/org.junit.platform.commons_1.5.1.v20190826-0900.jar,lib/bundles/org.junit_4.12.0.v201504281640/junit.jar,lib/bundles/org.opentest4j_1.2.0.v20190826-0900.jar,lib/bundles/org.reactivestreams.reactive-streams_1.0.2.jar,lib/bundles/org.uncommons.maths_1.2.2.201301151508/lib/uncommons-maths-1.2.2a.jar,lib/bundles/slf4j.api_1.7.25.jar,lib/com.nomagic.osgi.launcher-17.0.5-SNAPSHOT.jar,lib/commons-compress-1.3.jar,lib/commons-httpclient-3.1.jar,lib/commons-logging-1.0.4.jar,lib/concurrent.jar,lib/EccpressoAll.jar,lib/ehcache-2.10.1.jar,lib/flexlm.jar,lib/graphics/clibwrapper_jiio.jar,lib/graphics/freehep-base.jar,lib/graphics/freehep-graphics2d.jar,lib/graphics/freehep-graphicsio-emf.jar,lib/graphics/freehep-graphicsio-ps.jar,lib/graphics/freehep-graphicsio.jar,lib/graphics/jai_imageio.jar,lib/gson-2.2.4.jar,lib/HTMLEditorLight.jar,lib/hunspell-bridj-1.0.5-SNAPSHOT.jar,lib/javassist.jar,lib/jhall.jar,lib/jide-action.jar,lib/jide-charts.jar,lib/jide-common.jar,lib/jide-components.jar,lib/jide-diff.jar,lib/jide-dock.jar,lib/jide-editor.jar,lib/jide-gantt.jar,lib/jide-grids.jar,lib/jide-shortcut.jar,lib/jimi.jar,lib/jna.jar,lib/jnp-client.jar,lib/jtidy-sources.zip,lib/jtidy.jar,lib/JUnitParams-1.0.1.jar,lib/lucene-analyzers-common-7.5.0.jar,lib/lucene-core-7.5.0.jar,lib/lucene-misc-7.5.0.jar,lib/poi-3.14-20160307.jar,lib/poi-ooxml-3.14-20160307.jar,lib/poi-ooxml-schemas-3.14-20160307.jar,lib/webservice/axis-config.jar,lib/webservice/axis.jar,lib/webservice/commons-discovery-0.2.jar,lib/webservice/jaxrpc.jar,lib/webservice/mdserviceclient.jar,lib/webservice/rsclient.jar,lib/webservice/wsdl4j-1.5.1.jar,lib/xalan.jar,lib/xmlbeans-2.6.0.jar,lib/y.jar" #Specify a custom package for magicdraw to download -#nomagicDeps = "[{"group": "gov.nasa.jpl.cae.nomagic", "name": "cae-cameo-systems-modeler-core", "version": "4.4.4", "classifier": "linux", "ext": "zip"}]" +nomagicDeps = "[{"group": "gov.nasa.jpl.cae.nomagic", "name": "cae-cameo-systems-modeler-core", "version": "4.4.4", "classifier": "linux", "ext": "zip"}]" -#Specify a custom list of additional non-java dependencies for your build (i.e. if you need JavaFX or FOP) -#compileFiles = build/dependency-cache/extracted/fop/jars/fop-1.1.jar,build/dependency-cache/extracted/fop/jars/xmlgraphics-commons-1.5.jar,build/dependency-cache/extracted/magicdraw/jre/lib/ext/jfxrt.jar +#Specify a custom list of additional non-java dependencies for your build (i.e. if you need JavaFX or FOP). +#Note: the first two are required, the third depends on the version of Java you are using to build (ie. Oracle JDK vs OpenJDK) +compileFiles = build/dependency-cache/extracted/fop/jars/fop-1.1.jar,build/dependency-cache/extracted/fop/jars/xmlgraphics-commons-1.5.jar,build/dependency-cache/extracted/magicdraw/jre/lib/ext/jfxrt.jar #If you wish to change the Java package structure group specify it here. Otherwise defaults to org.openmbee -#group = "gov.nasa.jpl.cae" +group = "com.yourcompany" #If you wish to pull from your own custom repositories specify them here in JSON format -#repositories = [{"type": "maven", "url": "", "credentials": true }, {"type": "maven", "url": "", "credentials": true }] +#Note: Setting credentials to true, will allow use of -PartifactoryUsername and -PartifactoryPassword for that repo, they do NOT +#allow specification of custom credentials. +repositories = [{"type": "maven", "url": "", "credentials": true }, {"type": "maven", "url": "", "credentials": true }] #For development use of the runJava task, this will let you specify a path to a locally usable JRE for #Cameo/MD and MDK. Otherwise your machine's JAVA_HOME will be used -#executablePath = "" +executablePath = "" diff --git a/lgtm.yml b/lgtm.yml index 460d0dd3a..ed530b084 100644 --- a/lgtm.yml +++ b/lgtm.yml @@ -2,4 +2,4 @@ extraction: java: index: build_command: - - ./gradlew -Dorg.gradle.jvmargs=-Xmx2g --no-daemon -S -PbuildAccess=opensource testClasses + - ./gradlew -Dorg.gradle.jvmargs=-Xmx2g --no-daemon -S testClasses From 5700df26409975ab6a5b034f567500c964237dce Mon Sep 17 00:00:00 2001 From: Ivan Date: Wed, 10 Nov 2021 15:04:23 -0600 Subject: [PATCH 25/28] De-duplicate README version hints --- README.md | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 79878100c..0f0f98444 100644 --- a/README.md +++ b/README.md @@ -9,19 +9,14 @@ Cameo MDK is a plugin for [Cameo Systems Modeler](https://www.nomagic.com/produc ## Prerequisites * [Cameo Systems Modeler (CSM)](https://www.nomagic.com/products/cameo-systems-modeler) or another No Magic environment bundle that includes the [SysML plugin](https://www.nomagic.com/product-addons/magicdraw-addons/sysml-plugin) - * The latest Cameo MDK is tested with and supports **19.0 SP3** and **19.0 SP4** (you must use a custom profile for SP4). Compatibility for previous versions of Cameo MDK can be found in the [compatibility matrices](https://github.com/Open-MBEE/open-mbee.github.io/wiki/Compatibilities). -#### Versions prior to 5.x: -* [Model Management System (MMS) 3](https://github.com/Open-MBEE/mms-alfresco) -#### Version 5.0+ -* [Model Management System (MMS) 4](https://github.com/Open-MBEE/mms) + * The latest Cameo MDK is compatible with **19.0 SP3** and **19.0 SP4**. Compatibility for previous versions of Cameo MDK can be found in the [compatibility matrices](https://github.com/Open-MBEE/open-mbee.github.io/wiki/Compatibilities). +* [Model Management System (MMS)](https://www.openmbee.org/projects.html#mms) + * The latest Cameo MDK is compatible with MMS **4.x**. Compatibility for previous version of Cameo MDK can be found in the [compatibility matrices](https://github.com/Open-MBEE/open-mbee.github.io/wiki/Compatibilities). ## Installation 1. [Download](https://github.com/Open-MBEE/mdk/releases/latest) the Cameo MDK plugin, e.g. `mdk-*-plugin.zip`. - >**Note:** *Make sure you are downloading the correct version for your installation of MMS (for mms-alfresco (mms3/donbot) use - >version 4.5.x, for mms (mms4/execubots) use versions 5.0+)* - 2. Run CSM. From the main menu, select "Help" > "Resource/Plugin Manager". ![Resource/Plugin Manager](doc/images/resource-plugin-manager.png) From 7853fac7bd78149a25f5d22b1a2fde2c0fcb5753 Mon Sep 17 00:00:00 2001 From: Ivan Gomes Date: Wed, 10 Nov 2021 15:20:05 -0600 Subject: [PATCH 26/28] MDK-67 unsuppress error on profile misconfig --- build.gradle | 64 ++++++++++++++++++++++++---------------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/build.gradle b/build.gradle index c1b5d8cf8..abf2a3122 100644 --- a/build.gradle +++ b/build.gradle @@ -1,14 +1,13 @@ +import groovy.json.JsonSlurper + import java.time.LocalDateTime import java.time.format.DateTimeFormatter import java.util.stream.Collectors -import java.util.zip.ZipFile -import groovy.json.JsonSlurper; - String buildProfile = project.getProperties().getOrDefault('buildProfile', 'opensource') String buildTag = project.getProperties().get('buildTag') if (buildTag != null && !buildTag.isEmpty() && buildTag != version) { - throw new GradleException('Version mismatch: '+buildTag+' vs '+version) + throw new GradleException('Version mismatch: ' + buildTag + ' vs ' + version) } if ((buildTag == null || buildTag.isEmpty()) && !version.endsWith('-SNAPSHOT')) { version += '-SNAPSHOT' @@ -20,19 +19,13 @@ def defaults = new Properties() file("buildProfiles/opensource.properties").withInputStream { defaults.load(it) } if (buildProfile != 'opensource') { - try { - file("buildProfiles/" + buildProfile + ".properties").withInputStream { profiles.load(it) } - } catch (FileNotFoundException e) { - println "Profile Properties File not found using default:" + e.message - file("buildProfiles/opensource.properties").withInputStream { profiles.load(it) } - } + file("buildProfiles/" + buildProfile + ".properties").withInputStream { profiles.load(it) } } -else{ +else { profiles = defaults } - if (profiles['group'] != null) { group = group.replace('org.openmbee', profiles['group']) } @@ -43,7 +36,7 @@ String[] classpathLibraries = null if (profiles['classpathLibraries'] != null) { classpathLibraries = profiles["classpathLibraries"].toString().split(',') } -else{ +else { classpathLibraries = defaults["classpathLibraries"].toString().split(',') } @@ -146,7 +139,7 @@ dependencies { // SLF4J API compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.2' // compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.21+' - + // SLF4J-Log4j12 compile group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.2' // compile group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.21+' @@ -154,29 +147,29 @@ dependencies { // JSoup compile group: 'org.jsoup', name: 'jsoup', version: '1.6.1' // compile group: 'org.jsoup', name: 'jsoup', version: '1.9.1+' - + // JGraphT compile group: 'net.sf.jgrapht', name: 'jgrapht', version: '0.8.3' // compile group: 'org.jgrapht', name: 'jgrapht', version: '1.0.0+' - + // JSON Simple compile group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1' // compile group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1.1+' - + // SwingX-All compile group: 'org.swinglabs.swingx', name: 'swingx-all', version: '1.6.4' // compile group: 'org.swinglabs.swingx', name: 'swingx-all', version: '1.6.5+' - + // OpenCSV compile group: 'net.sf.opencsv', name: 'opencsv', version: '2.3' // compile group: 'com.opencsv', name: 'opencsv', version: '3.8+' - + // ActiveMQ compile group: 'org.apache.activemq', name: 'activemq-all', version: '5.9.1' // compile group: 'org.apache.activemq', name: 'activemq-all', version: '5.14.0+' // Jackson - compile group: 'com.fasterxml.jackson.core', name:'jackson-databind', version: '2.8.3' + compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.8.3' // JSON Patch compile group: "com.box", name: "json-patch", version: "1.13" @@ -207,7 +200,7 @@ dependencies { testCompile group: 'org.gradle', name: 'gradle-tooling-api', version: '3.5.1' testPublish group: 'org.openmbee.testrail', name: 'testrail-cli', version: '1.1.1' - + // Other dependencies we're unable to resolve via standard repositories if (profiles['nomagicDeps'] != null) { @@ -224,12 +217,12 @@ dependencies { } preCompile group: 'org.apache.fop', name: 'fop', version: '1.1', classifier: fopNameVersion + '-bin', ext: 'zip' - preCompile group: 'net.sourceforge.docbook', name: 'docbook-xsl', version: '1.79.1', classifier: docbookNameVersion, ext:'zip' + preCompile group: 'net.sourceforge.docbook', name: 'docbook-xsl', version: '1.79.1', classifier: docbookNameVersion, ext: 'zip' // This ensures classpath load order to match the MagicDraw provided order and then includes extras needed for non-OpenAPI stuff. // This was necessary because of the Application class stubbing that was done in the chromium libraries. compile files(classpathLibraries.collect { 'build/dependency-cache/extracted/magicdraw/' + it }) - compile fileTree(dir: 'build/dependency-cache/extracted/magicdraw', include: ['lib/**/*.jar', 'plugins/**/*.jar'], exclude: ([ classpathLibraries, ['plugins/com.nomagic.collaborator.publisher/**/*.jar', 'plugins/com.nomagic.magicdraw.emfuml2xmi*/**/*.jar', 'plugins/com.nomagic.magicdraw.automaton/lib/engines/**/*.jar', 'plugins/tomsawyer/**/*.jar', 'plugins/com.intercax.syndeia.md/**/*.jar'] ]).flatten()) + compile fileTree(dir: 'build/dependency-cache/extracted/magicdraw', include: ['lib/**/*.jar', 'plugins/**/*.jar'], exclude: ([classpathLibraries, ['plugins/com.nomagic.collaborator.publisher/**/*.jar', 'plugins/com.nomagic.magicdraw.emfuml2xmi*/**/*.jar', 'plugins/com.nomagic.magicdraw.automaton/lib/engines/**/*.jar', 'plugins/tomsawyer/**/*.jar', 'plugins/com.intercax.syndeia.md/**/*.jar']]).flatten()) compile fileTree(dir: 'lib', include: ['**/*.jar']) if (profiles["compileFiles"] != null) { def compileArray = profiles["compileFiles"].toString().split(',') @@ -249,33 +242,33 @@ task extractDependencies { } doLast { inputs.files.each { archive -> - if ( archive.getName().endsWith(fopNameVersion + '-' + fopNameVersion + '-bin.zip')){ + if (archive.getName().endsWith(fopNameVersion + '-' + fopNameVersion + '-bin.zip')) { //extract fop zip copy { from zipTree(archive) into archive.getParentFile().getAbsolutePath() } copy { - from archive.getParentFile().getAbsolutePath() + '/' +fopNameVersion + '/build/fop.jar' + from archive.getParentFile().getAbsolutePath() + '/' + fopNameVersion + '/build/fop.jar' into 'build/dependency-cache/extracted/fop/jars' - rename { String fileName -> fopNameVersion + '.jar'} + rename { String fileName -> fopNameVersion + '.jar' } } copy { - from fileTree(dir: archive.getParentFile().getAbsolutePath() + '/' + fopNameVersion +'/lib', include: '*.jar', exclude: 'commons*.jar') + from fileTree(dir: archive.getParentFile().getAbsolutePath() + '/' + fopNameVersion + '/lib', include: '*.jar', exclude: 'commons*.jar') into 'build/dependency-cache/extracted/fop/jars' } copy { //license3rdparty - from archive.getParentFile().getAbsolutePath() + '/' +fopNameVersion + '/LICENSE' + from archive.getParentFile().getAbsolutePath() + '/' + fopNameVersion + '/LICENSE' into 'build/dependency-cache/extracted/fop/license' - rename { String fileName -> 'apache_fop_license.txt'} + rename { String fileName -> 'apache_fop_license.txt' } } copy { //license3rdparty - from fileTree(dir: archive.getParentFile().getAbsolutePath() + '/'+ fopNameVersion+ '/lib', include: '*.LICENSE.txt', exclude: 'commons*LICENSE.txt') + from fileTree(dir: archive.getParentFile().getAbsolutePath() + '/' + fopNameVersion + '/lib', include: '*.LICENSE.txt', exclude: 'commons*LICENSE.txt') into 'build/dependency-cache/extracted/fop/license' - rename { String fileName -> fileName.replace(".LICENSE.txt", "_license.txt")} + rename { String fileName -> fileName.replace(".LICENSE.txt", "_license.txt") } } } - else if( archive.getName().endsWith(docbookNameVersion + '-' + docbookNameVersion +'.zip')){ + else if (archive.getName().endsWith(docbookNameVersion + '-' + docbookNameVersion + '.zip')) { copy { from zipTree(archive) into 'build/dependency-cache/extracted/docbook' @@ -381,7 +374,7 @@ class PreDist extends DefaultTask { from "build/dependency-cache/extracted/docbook/" + docbookVersion + "/fo" into "build/generated-dist/plugins/${groupName}/docbook-xsl/fo" } - project.copy{ + project.copy { from "build/dependency-cache/extracted/docbook/" + docbookVersion + "/common" into "build/generated-dist/plugins/${groupName}/docbook-xsl/common" } @@ -606,7 +599,8 @@ task runScript(type: Exec) { if (System.getProperty('os.name').toLowerCase().contains('windows')) { commandLine 'bin\\magicdraw.exe' - } else { + } + else { commandLine 'sh', 'bin/magicdraw' } } @@ -673,7 +667,7 @@ test.dependsOn installDist task testrailPublish(type: JavaExec) { classpath configurations.testPublish main = 'org.openmbee.testrail.cli.JUnitPublisher' - def arguments = [ '--directory', 'build/test-results/test', '--milestone', version.replace('-SNAPSHOT', '') ] + def arguments = ['--directory', 'build/test-results/test', '--milestone', version.replace('-SNAPSHOT', '')] def s if ((s = project.getProperties().get('testrailHost')) != null) { arguments.addAll('--host', s) From f696cee1d7ad62f26d2dc9013b3cabedf0b72ca1 Mon Sep 17 00:00:00 2001 From: Ivan Gomes Date: Wed, 10 Nov 2021 18:53:27 -0600 Subject: [PATCH 27/28] Add mavencentral badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0f0f98444..c9e5ef73e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Cameo Model Development Kit (MDK) -[![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/Open-MBEE/mdk?label=download)](https://github.com/Open-MBEE/mdk/releases/latest) [![Jira](https://img.shields.io/badge/issues-jira-blue)](https://openmbee.atlassian.net/browse/MDK) [![CircleCI](https://circleci.com/gh/Open-MBEE/mdk.svg?style=shield)](https://circleci.com/gh/Open-MBEE/mdk) [![Language grade: Java](https://img.shields.io/lgtm/grade/java/g/Open-MBEE/mdk.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/Open-MBEE/mdk/context:java) +[![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/Open-MBEE/mdk?label=download)](https://github.com/Open-MBEE/mdk/releases/latest) [![Maven Central](https://img.shields.io/maven-central/v/org.openmbee.mdk.magic/mdk)](https://search.maven.org/artifact/org.openmbee.mdk.magic/mdk) [![Jira](https://img.shields.io/badge/issues-jira-blue)](https://openmbee.atlassian.net/browse/MDK) [![CircleCI](https://circleci.com/gh/Open-MBEE/mdk.svg?style=shield)](https://circleci.com/gh/Open-MBEE/mdk) [![Language grade: Java](https://img.shields.io/lgtm/grade/java/g/Open-MBEE/mdk.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/Open-MBEE/mdk/context:java) Cameo MDK is a plugin for [Cameo Systems Modeler](https://www.nomagic.com/products/cameo-systems-modeler) and other No Magic environment bundles that’s primary purposes are to sync models with the [MMS](https://github.com/Open-MBEE/mms-alfresco) and implement the [DocGen](src/main/dist/manual) language, which allows modelers to dynamically generate documents in a model-based approach using the view and viewpoint concept. From de3bafde134e26464e7472da2ef2fe535f82d8f1 Mon Sep 17 00:00:00 2001 From: Ivan Gomes Date: Wed, 10 Nov 2021 19:00:50 -0600 Subject: [PATCH 28/28] Update version number to 5.0.0 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 225325da1..59f406590 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=5.0.0-rc1 +version=5.0.0 group=org.openmbee.mdk.magic descriptorFile=MDR_Plugin_Model_Development_Kit_91110_descriptor.xml magicdDrawGroupName=gov.nasa.jpl.cae.magicdraw.mdk