Merge pull request #215 from Open-MBEE/release/3.2.2

Release/3.2.2

mms-ent/build.sh

@@ -4,7 +4,7 @@
 
 
 if [ "$1" == "" ]; then
-    MAVEN_OPTS="-Xms256m -Xmx8G -Xdebug" ./mvnw clean package -f pom.xml -Ddependency.surf.version=6.3 -Dmaven.test.skip=true -U -Dmaven.repo.local=$HOME/.m2/repository;
+    MAVEN_OPTS="-Xms256m -Xmx8G -Xdebug" ./mvnw clean package -f pom.xml -P build -Ddependency.surf.version=6.3 -Dmaven.test.skip=true -U -Dmaven.repo.local=$HOME/.m2/repository;
 else
     ./mvnw versions:set -DnewVersion=$1 -DgenerateBackupPoms=false -Ddependency.surf.version=6.3
 fi

mms-ent/migration/3.2.0/README.md

@@ -23,6 +23,19 @@ delete from alf_node_properties where qname_id in (select id from alf_qname wher
 delete from alf_qname where ns_id = (select id from alf_namespace where uri = 'http://jpl.nasa.gov/model/view/1.0');
 delete from alf_namespace where uri = 'http://jpl.nasa.gov/model/view/1.0';
 ```
+NOTE: If migrating from pre 3.0.0, run the following queries instead: (This will delete some model data stored in alfresco)
+```
+delete from alf_node_aspects where qname_id in (select id from alf_qname where ns_id = (select id from alf_namespace where uri = 'http://jpl.nasa.gov/model/view/1.0'));
+delete from alf_node_properties where node_id in (select id from alf_node where type_qname_id in (select id from alf_qname where ns_id = (select id from alf_namespace where uri = 'http://jpl.nasa.gov/model/view/1.0')));
+delete from alf_child_assoc where parent_node_id in (select id from alf_node where type_qname_id in (select id from alf_qname where ns_id = (select id from alf_namespace where uri = 'http://jpl.nasa.gov/model/view/1.0')));
+delete from alf_child_assoc where child_node_id in (select id from alf_node where type_qname_id in (select id from alf_qname where ns_id = (select id from alf_namespace where uri = 'http://jpl.nasa.gov/model/view/1.0')));
+delete from alf_node_aspects where node_id in (select id from alf_node where type_qname_id in (select id from alf_qname where ns_id = (select id from alf_namespace where uri = 'http://jpl.nasa.gov/model/view/1.0')));
+delete from alf_node_aspects where qname_id in (select id from alf_qname where ns_id = (select id from alf_namespace where uri = 'http://jpl.nasa.gov/model/view/1.0')));
+delete from alf_node_assoc where type_qname_id in (select id from alf_qname where ns_id = (select id from alf_namespace where uri = 'http://jpl.nasa.gov/model/view/1.0'));
+delete from alf_node where type_qname_id in (select id from alf_qname where ns_id = (select id from alf_namespace where uri = 'http://jpl.nasa.gov/model/view/1.0'));
+delete from alf_qname where ns_id = (select id from alf_namespace where uri = 'http://jpl.nasa.gov/model/view/1.0');
+delete from alf_namespace where uri = 'http://jpl.nasa.gov/model/view/1.0';
+```
 
 ### Updating Commit, Project and Ref Elastic Obejcts with the _projectId key
 

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.2.1</version>
+    <version>3.2.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>
@@ -104,7 +104,18 @@
                 <maven.alfresco.includeWebResources>false</maven.alfresco.includeWebResources>
             </properties>
         </profile>
-
+        <profile>
+            <!-- Invoke your build with -Prun to run the multimodule project and enable rapid dev mode in your IDE.
+                 See 'run' profile in the sub modules pom.xml for further behavioral details.
+             -->
+            <id>build</id>
+            <properties>
+                <!-- While running in rapid dev mode with -Prun, we don't want amp web resources
+                    to be added to the war, so we can load them directly from the AMP project (see
+                    runner/tomcat/context-*.xml for more details) -->
+                <maven.alfresco.includeWebResources>true</maven.alfresco.includeWebResources>
+            </properties>
+        </profile>
         <!-- if we're on a unix machine, chmod run.sh to be executable -->
         <profile>
             <id>chmod</id>

mms-ent/repo-amp/pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <groupId>gov.nasa.jpl.mbee</groupId>
         <artifactId>mms-ent</artifactId>
-        <version>3.2.1</version>
+        <version>3.2.2</version>
     </parent>
     <repositories>
         <repository>
@@ -151,8 +151,8 @@
         <dependency>
             <groupId>org.antlr</groupId>
             <artifactId>antlr4</artifactId>
-            <version>4.5</version>
-        </dependency><!--$NO-MVN-MAN-VER$-->
+            <version>4.5</version><!--$NO-MVN-MAN-VER$-->
+        </dependency>
         <dependency>
             <groupId>org.apache.xmlgraphics</groupId>
             <artifactId>batik-rasterizer</artifactId>