You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2018/10/09 21:10:48 UTC
svn commit: r1843344 - in /axis/axis2/java/core/trunk:
modules/distribution/pom.xml pom.xml
Author: veithen
Date: Tue Oct 9 21:10:48 2018
New Revision: 1843344
URL: http://svn.apache.org/viewvc?rev=1843344&view=rev
Log:
Upgrade maven-war-plugin.
Modified:
axis/axis2/java/core/trunk/modules/distribution/pom.xml
axis/axis2/java/core/trunk/pom.xml
Modified: axis/axis2/java/core/trunk/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/pom.xml?rev=1843344&r1=1843343&r2=1843344&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/distribution/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/distribution/pom.xml Tue Oct 9 21:10:48 2018
@@ -381,20 +381,22 @@
</goals>
<configuration>
<scripts>
- <script>
+ <script><![CDATA[
import java.util.jar.*
def jar = new JarInputStream(new FileInputStream(project.properties['webapp']))
def expected = new HashSet()
def entry
while(entry = jar.nextJarEntry) {
- expected.add(entry.name)
+ if (entry.name != 'META-INF/') {
+ expected.add(entry.name)
+ }
}
jar.close()
jar = new JarInputStream(new FileInputStream(new File(project.build.directory, "axis2-" + project.version + "/dist/axis2.war")))
while(entry = jar.nextJarEntry) {
- if (!expected.remove(entry.name)) {
+ if (entry.name != 'META-INF/' && !expected.remove(entry.name)) {
throw new Error("Unexpected entry in Web app: " + entry.name)
}
}
@@ -402,7 +404,7 @@
throw new Error("Missing entries in Web app: " + expected)
}
jar.close()
- </script>
+ ]]></script>
</scripts>
</configuration>
</execution>
Modified: axis/axis2/java/core/trunk/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/pom.xml?rev=1843344&r1=1843343&r2=1843344&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/pom.xml (original)
+++ axis/axis2/java/core/trunk/pom.xml Tue Oct 9 21:10:48 2018
@@ -1208,7 +1208,7 @@
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
- <version>2.6</version>
+ <version>3.2.2</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>