Merge pull request #329 from Open-MBEE/release/3.4.2

Release/3.4.2

.circleci/config.yml

@@ -15,7 +15,7 @@ jobs:
 
       - run:
           name: Run Maven Build
-          command: cd mms-ent && sh mvnw install -Pbuild && sh mvnw install -f repo-amp/target/generated-sources/swagger/java/pom.xml
+          command: cd mms-ent && sh mvnw install -Pbuild -Dmaven.test.skip=true && sh mvnw install -Dmaven.test.skip=true -f repo-amp/target/generated-sources/swagger/java/pom.xml
 
       - save_cache:
           paths:
@@ -58,25 +58,22 @@ jobs:
           command: ./jfrog rt config --url $ARTIFACTORY_URL --user $ARTIFACTORY_USER --apikey $ARTIFACTORY_APIKEY --interactive false
       - run:
           name: Send mms-amp
-          command: ./jfrog rt u 'mms-ent/repo-amp/target/*.amp' libs-release-local/gov/nasa/jpl/mms/mms-amp/3.4.1/ --build-name=mms-circleci --build-number=$CIRCLE_BUILD_NUM --flat=true
+          command: ./jfrog rt u 'mms-ent/repo-amp/target/*.amp' libs-release-local/gov/nasa/jpl/mms/mms-amp/3.4.2/ --build-name=mms-circleci --build-number=$CIRCLE_BUILD_NUM --flat=true
       - run:
           name: Send mms-share-amp
-          command: ./jfrog rt u 'mms-ent/share-amp/target/*.amp' libs-release-local/gov/nasa/jpl/mms/mms-share-amp/3.4.1/ --build-name=mms-circleci --build-number=$CIRCLE_BUILD_NUM --flat=true
+          command: ./jfrog rt u 'mms-ent/share-amp/target/*.amp' libs-release-local/gov/nasa/jpl/mms/mms-share-amp/3.4.2/ --build-name=mms-circleci --build-number=$CIRCLE_BUILD_NUM --flat=true
       - run:
           name: Send mms java client
-          command: ./jfrog rt u 'mms-ent/repo-amp/target/mms-java-client/mms-java-*.jar' libs-release-local/gov/nasa/jpl/mms/mms-java-client/3.4.1/ --build-name=mms-circleci --build-number=$CIRCLE_BUILD_NUM --flat=true
-      - run:
-          name: Send mms java client
-          command: ./jfrog rt u 'mms-ent/repo-amp/target/mms-java-client/pom.xml' libs-release-local/gov/nasa/jpl/mms/mms-java-client/3.4.1/ --build-name=mms-circleci --build-number=$CIRCLE_BUILD_NUM --flat=true
+          command: ./jfrog rt u 'mms-ent/repo-amp/target/mms-java-client/mms-java-*.jar' libs-release-local/org/openmbee/mms/mms-java-client/3.4.2/ --build-name=mms-circleci --build-number=$CIRCLE_BUILD_NUM --flat=true
       - run:
           name: Send mms python client
-          command: ./jfrog rt u 'mms-ent/repo-amp/target/mms_python_*.zip' libs-release-local/gov/nasa/jpl/mms/mms-python-client/3.4.1/ --build-name=mms-circleci --build-number=$CIRCLE_BUILD_NUM --flat=true
+          command: ./jfrog rt u 'mms-ent/repo-amp/target/mms_python_*.zip' libs-release-local/gov/nasa/jpl/mms/mms-python-client/3.4.2/ --build-name=mms-circleci --build-number=$CIRCLE_BUILD_NUM --flat=true
       - run:
           name: Send mms mathematica client
-          command: ./jfrog rt u 'mms-ent/repo-amp/target/mms-mathematica-*.zip' libs-release-local/gov/nasa/jpl/mms/mms-mathematica-client/3.4.1/ --build-name=mms-circleci --build-number=$CIRCLE_BUILD_NUM --flat=true
+          command: ./jfrog rt u 'mms-ent/repo-amp/target/mms-mathematica-*.zip' libs-release-local/gov/nasa/jpl/mms/mms-mathematica-client/3.4.2/ --build-name=mms-circleci --build-number=$CIRCLE_BUILD_NUM --flat=true
       - run:
           name: Send mms matlab client
-          command: ./jfrog rt u 'mms-ent/repo-amp/target/mms-matlab-*.zip' libs-release-local/gov/nasa/jpl/mms/mms-matlab-client/3.4.1/ --build-name=mms-circleci --build-number=$CIRCLE_BUILD_NUM --flat=true
+          command: ./jfrog rt u 'mms-ent/repo-amp/target/mms-matlab-*.zip' libs-release-local/gov/nasa/jpl/mms/mms-matlab-client/3.4.2/ --build-name=mms-circleci --build-number=$CIRCLE_BUILD_NUM --flat=true
 
 workflows:
   version: 2

.circleci/config.yml.template

@@ -15,7 +15,7 @@ jobs:
 
       - run:
           name: Run Maven Build
-          command: cd mms-ent && sh mvnw install -Pbuild && sh mvnw install -f repo-amp/target/generated-sources/swagger/java/pom.xml
+          command: cd mms-ent && sh mvnw install -Pbuild -Dmaven.test.skip=true && sh mvnw install -Dmaven.test.skip=true -f repo-amp/target/generated-sources/swagger/java/pom.xml
 
       - save_cache:
           paths:
@@ -64,10 +64,7 @@ jobs:
           command: ./jfrog rt u 'mms-ent/share-amp/target/*.amp' libs-snapshot-local/gov/nasa/jpl/mms/mms-share-amp/${version}/ --build-name=mms-circleci --build-number=$CIRCLE_BUILD_NUM --flat=true
       - run:
           name: Send mms java client
-          command: ./jfrog rt u 'mms-ent/repo-amp/target/mms-java-client/mms-java-*.jar' libs-snapshot-local/gov/nasa/jpl/mms/mms-java-client/${version}/ --build-name=mms-circleci --build-number=$CIRCLE_BUILD_NUM --flat=true
-      - run:
-          name: Send mms java client
-          command: ./jfrog rt u 'mms-ent/repo-amp/target/mms-java-client/pom.xml' libs-snapshot-local/gov/nasa/jpl/mms/mms-java-client/${version}/ --build-name=mms-circleci --build-number=$CIRCLE_BUILD_NUM --flat=true
+          command: ./jfrog rt u 'mms-ent/repo-amp/target/mms-java-client/mms-java-*.jar' libs-snapshot-local/org/openmbee/mms/mms-java-client/${version}/ --build-name=mms-circleci --build-number=$CIRCLE_BUILD_NUM --flat=true
       - run:
           name: Send mms python client
           command: ./jfrog rt u 'mms-ent/repo-amp/target/mms_python_*.zip' libs-snapshot-local/gov/nasa/jpl/mms/mms-python-client/${version}/ --build-name=mms-circleci --build-number=$CIRCLE_BUILD_NUM --flat=true

README.md

@@ -1,16 +1,21 @@
 # Model Management System
+[![Language Grade: Java](https://img.shields.io/lgtm/grade/java/g/Open-MBEE/mms.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/Open-MBEE/mms/context:java) [![CircleCI](https://circleci.com/gh/Open-MBEE/mms.svg?style=svg)](https://circleci.com/gh/Open-MBEE/mms)
 
-<!--- Comment the download links until we can display them better or something --->
-<!--- [ ![Download](https://api.bintray.com/packages/openmbee/maven/mms-amp/images/download.svg) ](https://bintray.com/openmbee/maven/mms-amp/_latestVersion) mms-amp --->
+The MMS AMP is a hosted application run atop the [community version of an Alfresco Enterprise Content Management Server](https://docs.alfresco.com/community/concepts/welcome-infocenter_community.html).  
 
-<!--- [ ![Download](https://api.bintray.com/packages/openmbee/maven/mms-share-amp/images/download.svg) ](https://bintray.com/openmbee/maven/mms-share-amp/_latestVersion) mms-share-amp --->
+**NOTE 1: AMPs for Alfresco as built from this maven project are meant to be run by [Alfresco Community Edition v5.1.g (AKA 201605-GA)](https://download.alfresco.com/release/community/201605-build-00010/alfresco-community-distribution-201605.zip)**
 
+Per [ Alfresco's documentation on Modules](https://docs.alfresco.com/5.0/concepts/dev-extensions-modules-intro.html), Alfresco Module Packages (AMPs) are installed using the Module Management Tool [MMT](https://docs.alfresco.com/5.0/concepts/dev-extensions-modules-management-tool.html) jar file.  The latest version of the two AMPs you will be "exploding" into the "alfresco" and "share" WARs resident within the embedded Tomcat server are available via the download links leading to the two interdependent portions named "mms-repo.amp" and "mms-share.amp", relating to "alfresco.war" and "share.war", respectively.
+
+[ ![Download](https://api.bintray.com/packages/openmbee/maven/mms-amp/images/download.svg) ](https://bintray.com/openmbee/maven/mms-amp/_latestVersion) of the alfresco WAR related portion of the "MMS" Alfresco module.
+
+[ ![Download](https://api.bintray.com/packages/openmbee/maven/mms-share-amp/images/download.svg)](https://bintray.com/openmbee/maven/mms-share-amp/_latestVersion) of the share WAR related portion of the "MMS" Alfresco Module.
+
+In tandem with the EMS-Webapp (colloquially known as the View Editor), and the Magicdraw Development Kit (MDK) for MagicDraw client and Teamwork Cloud users; this github repo serves as a one-stop shop to set up the Model Management Server per the 
+[MMS-MDK-VE Compatibility Matrix](https://github.com/Open-MBEE/open-mbee.github.io/blob/master/compat%20matrix.pdf).
 
- [ ![Download](https://api.bintray.com/packages/openmbee/maven/mms-amp/images/download.svg) ](https://bintray.com/openmbee/maven/mms-amp/_latestVersion) [![Language Grade: Java](https://img.shields.io/lgtm/grade/java/g/Open-MBEE/mms.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/Open-MBEE/mms/context:java) [![CircleCI](https://circleci.com/gh/Open-MBEE/mms.svg?style=svg)](https://circleci.com/gh/Open-MBEE/mms)
 
-**AMP for Alfresco (5.1.g AKA 201605-GA)**
 
-Use this table to check what version of the mms - mdk - ve triple you should be using: [Compatibility Matrix](https://github.com/Open-MBEE/open-mbee.github.io/blob/master/compat%20matrix.pdf)
 ## Developer Setup
 
 ### Dependencies
@@ -280,12 +285,12 @@ API Documentation is located at the following endpoints:
 
 Swagger CodeGen:
 ```
-alfresco/mms
+alfresco/mms/index.html
 ```
 
 Swagger UI:
 ```
-alfresco/mms/swagger-ui
+alfresco/mms/swagger-ui/index.html
 ```
 
 Swagger YAML file:

mms-ent/.gitignore

@@ -14,6 +14,7 @@ mms.properties
 /solr-config/target/*
 /repo/overlays/*
 /share/overlays/*
+/repo-amp/conda/output*
 /runner/src/test/robotframework/libraries/*
 *.log
 *.log.*

mms-ent/pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>gov.nasa.jpl.mbee</groupId>
     <artifactId>mms-ent</artifactId>
-    <version>3.4.1</version>
+    <version>3.4.2</version>
     <name>Alfresco Repository and Share Quickstart with database and an embedded Tomcat runner.</name>
     <description>This All-in-One project allows to manage all the components involved in Alfresco development (Repo, Share, Solr4, AMPs) in one project
     </description>

mms-ent/repo-amp/conda/mms-python-client/meta.yaml

@@ -0,0 +1,48 @@
+{% set name = "mms-python-client" %}
+{% set version = "3.4.1" %}
+{% set file_ext = "tar.gz" %}
+{% set hash_type = "sha256" %}
+{% set hash_value = "c6c705df393aef09b583b11f2e36d21e9ed60e31a4ac05a3d0f6af09935df051" %}
+
+package:
+  name: '{{ name|lower }}'
+  version: '{{ version }}'
+
+source:
+  fn: '{{ name }}-{{ version }}.{{ file_ext }}'
+  url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.{{ file_ext }}
+  '{{ hash_type }}': '{{ hash_value }}'
+
+build:
+  number: 0
+  noarch: python
+  script: python setup.py install --single-version-externally-managed --record=record.txt
+
+requirements:
+  host:
+    - python
+    - setuptools
+    - urllib3 >=1.15
+    - six >=1.10
+    - certifi
+    - python-dateutil
+  run:
+    - python
+    - urllib3 >=1.15
+    - six >=1.10
+    - certifi
+    - python-dateutil
+
+about:
+  home: The package home page
+  license: UNKNOWN
+  license_family: OTHER
+  license_file: ''
+  summary: Model Management Service
+  description: 'Model Management System (MMS) is a version control system for structured data. It exposes model information through RESTful web services that can be used for CRUD operations, branching,
+    and tagging of the model repository.  # noqa: E501'
+  doc_url: ''
+  dev_url: ''
+
+extra:
+  recipe-maintainers: ''

mms-ent/repo-amp/pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <groupId>gov.nasa.jpl.mbee</groupId>
         <artifactId>mms-ent</artifactId>
-        <version>3.4.1</version>
+        <version>3.4.2</version>
     </parent>
 
     <properties>
@@ -126,7 +126,7 @@
         <dependency>
             <groupId>org.apache.tika</groupId>
             <artifactId>tika-core</artifactId>
-            <version>1.18</version>
+            <version>1.19.1</version>
         </dependency>
         <!-- apache chemistry opencmis CLIENT -->
         <dependency>