Merge branch 'master' of github.com:Open-MBEE/mms into release/3.2.2

# Conflicts: # mms-ent/pom.xml # mms-ent/repo-amp/pom.xml # mms-ent/repo/pom.xml # mms-ent/runner/pom.xml # mms-ent/share-amp/pom.xml # mms-ent/share/pom.xml # mms-ent/solr-config/pom.xml
Open-MBEE · Jan 13, 2018 · 5e8cf27 · 5e8cf27
2 parents 1fed2b9 + 0eff1be
commit 5e8cf27
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/mms-ent/share-amp/pom.xml b/mms-ent/share-amp/pom.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>mms-share-amp</artifactId>
-    <name>Alfresco Share AMP Module</name>
+    <name>MMS Alfresco Share AMP Module</name>
     <packaging>amp</packaging>
-    <description>This is a sample Alfresco Share AMP project, depended upon by the share WAR module</description>
+    <description>This is the MMS Share AMP (Alfresco Module Package)</description>
 
     <parent>
         <groupId>gov.nasa.jpl.mbee</groupId>