SAK-40004 - Maven War Plugin Updated (sakaiproject#5966)

* Udate maven-war-plugin to latest version and force same version * Deleted a default value
mrmodise · Sep 10, 2018 · d2e3cea · d2e3cea
1 parent da4c680
commit d2e3cea
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 6 deletions.
diff --git a/library/pom.xml b/library/pom.xml
@@ -513,7 +513,6 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-war-plugin</artifactId>
-				<version>3.0.0</version>
 				<configuration>
 					<warSourceExcludes>editor/elfinder/sakai/js/src/**</warSourceExcludes>
 					<webResources>

diff --git a/mailsender/tool/pom.xml b/mailsender/tool/pom.xml
@@ -41,7 +41,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-war-plugin</artifactId>
-				<version>2.3</version>
 				<configuration>
 					<packagingExcludes>WEB-INF/bundle/*.properties,WEB-INF/bundle</packagingExcludes>
 					<webResources>

diff --git a/master/pom.xml b/master/pom.xml
@@ -2021,7 +2021,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-war-plugin</artifactId>
-          <version>2.6</version>
+          <version>3.2.2</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -2221,10 +2221,10 @@
         </configuration>
       </plugin>
       <plugin>
-        <inherited>true</inherited>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
         <configuration>
+          <!--TODO Change this to use the default value -->
           <warSourceDirectory>${basedir}/src/webapp</warSourceDirectory>
         </configuration>
       </plugin>

diff --git a/samigo/samigo-app/pom.xml b/samigo/samigo-app/pom.xml
@@ -278,7 +278,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-war-plugin</artifactId>
-				<version>2.6</version>
 			</plugin>
 		</plugins>
 		<resources>

diff --git a/simple-rss-portlet/pom.xml b/simple-rss-portlet/pom.xml
@@ -154,7 +154,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-war-plugin</artifactId>
-				<version>2.2</version>
 				<configuration>
 					<webResources>
             			<resource>