Author: veithen
Date: Tue Jun 28 21:49:41 2016
New Revision: 1750589
URL: http://svn.apache.org/viewvc?rev=1750589&view=rev
Log:
AXIS2-5796: Require Java 8 for the build, upgrade jetty-maven-plugin to version
9.x and make sure that jetty:stop waits until the server has actually stopped
(stopWait isn't supported in version 8.x of the plugin).
Modified:
axis/axis2/java/core/trunk/modules/webapp/pom.xml
axis/axis2/java/core/trunk/pom.xml
axis/axis2/java/core/trunk/systests/webapp-tests/pom.xml
Modified: axis/axis2/java/core/trunk/modules/webapp/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/pom.xml?rev=1750589&r1=1750588&r2=1750589&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/webapp/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/webapp/pom.xml Tue Jun 28 21:49:41 2016
@@ -327,7 +327,7 @@
</executions>
</plugin>
<plugin>
- <groupId>org.mortbay.jetty</groupId>
+ <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<configuration>
<webXml>conf/web.xml</webXml>
Modified: axis/axis2/java/core/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/pom.xml?rev=1750589&r1=1750588&r2=1750589&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/pom.xml (original)
+++ axis/axis2/java/core/trunk/pom.xml Tue Jun 28 21:49:41 2016
@@ -1213,9 +1213,9 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.mortbay.jetty</groupId>
+ <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>8.1.16.v20140903</version>
+ <version>9.3.10.v20160621</version>
</plugin>
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
@@ -1263,8 +1263,8 @@
<version>3.0.0</version>
</requireMavenVersion>
<requireJavaVersion>
- <!-- We require Java 7 for the build, but
we enforce Java 5 compatibility using Animal Sniffer -->
- <version>1.7.0</version>
+ <!-- We require a recent Java version for
the build, but we enforce compatibility with older versions using Animal
Sniffer -->
+ <version>1.8.0</version>
</requireJavaVersion>
<requireNoRepositories>
<message>The POM must not include
repository definitions since non Apache repositories threaten the build
stability.</message>
Modified: axis/axis2/java/core/trunk/systests/webapp-tests/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/systests/webapp-tests/pom.xml?rev=1750589&r1=1750588&r2=1750589&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/systests/webapp-tests/pom.xml (original)
+++ axis/axis2/java/core/trunk/systests/webapp-tests/pom.xml Tue Jun 28
21:49:41 2016
@@ -106,16 +106,15 @@
</executions>
</plugin>
<plugin>
- <groupId>org.mortbay.jetty</groupId>
+ <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<configuration>
<stopKey>foo</stopKey>
<stopPort>${jetty.stopPort}</stopPort>
- <connectors>
- <connector
implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
- <port>${jetty.httpPort}</port>
- </connector>
- </connectors>
+ <stopWait>10</stopWait>
+ <httpConnector>
+ <port>${jetty.httpPort}</port>
+ </httpConnector>
<war>${webapp}</war>
<webApp>
<contextPath>/axis2</contextPath>
