Remove target directories and fix Maven parent project WARNs

capstone-coal · Mar 9, 2017 · 5ae4938 · 5ae4938
1 parent e5d4828
commit 5ae4938
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 *.class
+**/target
 
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/

diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -132,21 +132,21 @@
                               </artifactItem>
                               <artifactItem>
                                  <groupId>com.github.capstone-coal</groupId>
-                                 <artifactId>${parent.artifactId}-opsui</artifactId>
+                                 <artifactId>${project.parent.artifactId}-opsui</artifactId>
                                  <type>war</type>
                                  <overWrite>false</overWrite>
                                  <outputDirectory>${project.build.directory}/apache-tomcat-${tomcat.version}/webapps/opsui</outputDirectory>
                               </artifactItem>
                               <artifactItem>
                                  <groupId>com.github.capstone-coal</groupId>
-                                 <artifactId>${parent.artifactId}-pcs-services</artifactId>
+                                 <artifactId>${project.parent.artifactId}-pcs-services</artifactId>
                                  <type>war</type>
                                  <overWrite>false</overWrite>
                                  <outputDirectory>${project.build.directory}/apache-tomcat-${tomcat.version}/webapps/pcs</outputDirectory>
                               </artifactItem>
                               <artifactItem>
                                  <groupId>com.github.capstone-coal</groupId>
-                                 <artifactId>${parent.artifactId}-fmprod</artifactId>
+                                 <artifactId>${project.parent.artifactId}-fmprod</artifactId>
                                  <type>war</type>
                                  <overWrite>false</overWrite>
                                  <outputDirectory>${project.build.directory}/apache-tomcat-${tomcat.version}/webapps/fmprod</outputDirectory>
@@ -287,28 +287,28 @@
                               </artifactItem>
                               <artifactItem>
                                  <groupId>com.github.capstone-coal</groupId>
-                                 <artifactId>${parent.artifactId}-opsui</artifactId>
+                                 <artifactId>${project.parent.artifactId}-opsui</artifactId>
                                  <type>war</type>
                                  <overWrite>false</overWrite>
                                  <outputDirectory>${project.build.directory}/apache-tomcat-${tomcat.version}/webapps/opsui</outputDirectory>
                               </artifactItem>
                               <artifactItem>
                                  <groupId>com.github.capstone-coal</groupId>
-                                 <artifactId>${parent.artifactId}-pcs-services</artifactId>
+                                 <artifactId>${project.parent.artifactId}-pcs-services</artifactId>
                                  <type>war</type>
                                  <overWrite>false</overWrite>
                                  <outputDirectory>${project.build.directory}/apache-tomcat-${tomcat.version}/webapps/pcs</outputDirectory>
                               </artifactItem>
                               <artifactItem>
                                  <groupId>com.github.capstone-coal</groupId>
-                                 <artifactId>${parent.artifactId}-fmprod</artifactId>
+                                 <artifactId>${project.parent.artifactId}-fmprod</artifactId>
                                  <type>war</type>
                                  <overWrite>false</overWrite>
                                  <outputDirectory>${project.build.directory}/apache-tomcat-${tomcat.version}/webapps/fmprod</outputDirectory>
                               </artifactItem>
                               <artifactItem>
                                  <groupId>com.github.capstone-coal</groupId>
-                                 <artifactId>${parent.artifactId}-solr-webapp</artifactId>
+                                 <artifactId>${project.parent.artifactId}-solr-webapp</artifactId>
                                  <type>war</type>
                                  <overWrite>false</overWrite>
                                  <outputDirectory>${project.build.directory}/apache-tomcat-${tomcat.version}/webapps/solr</outputDirectory>

diff --git a/distribution/src/main/assembly/assembly.xml b/distribution/src/main/assembly/assembly.xml
@@ -104,10 +104,10 @@
       <useProjectArtifact>false</useProjectArtifact>
       <useTransitiveDependencies>false</useTransitiveDependencies>
       <excludes>
-        <exclude>${groupId}:${parent.artifactId}-opsui</exclude>
-        <exclude>${groupId}:${parent.artifactId}-pcs-services</exclude>
-        <exclude>${groupId}:${parent.artifactId}-fmprod</exclude>
-        <exclude>${groupId}:${parent.artifactId}-solr-webapp</exclude>
+        <exclude>${groupId}:${project.parent.artifactId}-opsui</exclude>
+        <exclude>${groupId}:${project.parent.artifactId}-pcs-services</exclude>
+        <exclude>${groupId}:${project.parent.artifactId}-fmprod</exclude>
+        <exclude>${groupId}:${project.parent.artifactId}-solr-webapp</exclude>
       </excludes>
     </dependencySet>
   </dependencySets>