Repository: maven-surefire Updated Branches: refs/heads/master dbf8ef9b2 -> 1cdf49dc2
modernise Jetty configuration Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/1cdf49dc Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/1cdf49dc Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/1cdf49dc Branch: refs/heads/master Commit: 1cdf49dc2cbf2b0beee0eb73567718c04fa4efb9 Parents: dbf8ef9 Author: Brett Porter <br...@apache.org> Authored: Mon Jul 28 20:08:24 2014 +1000 Committer: Brett Porter <br...@apache.org> Committed: Mon Jul 28 20:08:24 2014 +1000 ---------------------------------------------------------------------- .../src/it/jetty-war-test-failing/pom.xml | 18 ++++++++---------- .../src/it/jetty-war-test-passing/pom.xml | 18 ++++++++---------- maven-surefire-plugin/src/site/apt/usage.apt.vm | 19 +++++++++---------- 3 files changed, 25 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/1cdf49dc/maven-failsafe-plugin/src/it/jetty-war-test-failing/pom.xml ---------------------------------------------------------------------- diff --git a/maven-failsafe-plugin/src/it/jetty-war-test-failing/pom.xml b/maven-failsafe-plugin/src/it/jetty-war-test-failing/pom.xml index b6fc6a7..cc65b18 100644 --- a/maven-failsafe-plugin/src/it/jetty-war-test-failing/pom.xml +++ b/maven-failsafe-plugin/src/it/jetty-war-test-failing/pom.xml @@ -65,19 +65,16 @@ </testResources> <plugins> <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>maven-jetty-plugin</artifactId> - <version>6.1.16</version> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-maven-plugin</artifactId> + <version>${jetty-version}</version> <configuration> <stopPort>${integration-test-stop-port}</stopPort> <stopKey>STOP</stopKey> - <contextPath>/</contextPath> - <connectors> - <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> - <port>${integration-test-port}</port> - <maxIdleTime>60000</maxIdleTime> - </connector> - </connectors> + <httpConnector> + <port>${integration-test-port}</port> + <idleTimeout>60000</idleTimeout> + </httpConnector> </configuration> <executions> <execution> @@ -137,6 +134,7 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <integration-test-port>8083</integration-test-port> <integration-test-stop-port>18009</integration-test-stop-port> + <jetty-version>9.2.2.v20140723</jetty-version> </properties> </project> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/1cdf49dc/maven-failsafe-plugin/src/it/jetty-war-test-passing/pom.xml ---------------------------------------------------------------------- diff --git a/maven-failsafe-plugin/src/it/jetty-war-test-passing/pom.xml b/maven-failsafe-plugin/src/it/jetty-war-test-passing/pom.xml index ed2c259..b90d3d8 100644 --- a/maven-failsafe-plugin/src/it/jetty-war-test-passing/pom.xml +++ b/maven-failsafe-plugin/src/it/jetty-war-test-passing/pom.xml @@ -65,19 +65,16 @@ </testResources> <plugins> <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>maven-jetty-plugin</artifactId> - <version>6.1.16</version> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-maven-plugin</artifactId> + <version>${jetty-version}</version> <configuration> <stopPort>${integration-test-stop-port}</stopPort> <stopKey>STOP</stopKey> - <contextPath>/</contextPath> - <connectors> - <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> - <port>${integration-test-port}</port> - <maxIdleTime>60000</maxIdleTime> - </connector> - </connectors> + <httpConnector> + <port>${integration-test-port}</port> + <idleTimeout>60000</idleTimeout> + </httpConnector> </configuration> <executions> <execution> @@ -137,6 +134,7 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <integration-test-port>8083</integration-test-port> <integration-test-stop-port>18009</integration-test-stop-port> + <jetty-version>9.2.2.v20140723</jetty-version> </properties> </project> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/1cdf49dc/maven-surefire-plugin/src/site/apt/usage.apt.vm ---------------------------------------------------------------------- diff --git a/maven-surefire-plugin/src/site/apt/usage.apt.vm b/maven-surefire-plugin/src/site/apt/usage.apt.vm index 93e8ded..b5dd3bd 100644 --- a/maven-surefire-plugin/src/site/apt/usage.apt.vm +++ b/maven-surefire-plugin/src/site/apt/usage.apt.vm @@ -134,7 +134,7 @@ mvn verify #{if}(${project.artifactId}=="maven-failsafe-plugin") * Using jetty and ${project.artifactId} - You need to bind one of <<<jetty:run>>>, <<<jetty:run-exploded>>> or <<<jetty:run-war>>> + You need to bind one of <<<jetty:start>>>, <<<jetty:run>>>, <<<jetty:run-exploded>>> or <<<jetty:run-war>>> to the <<<pre-integration-test>>> phase with <<<daemon>>> set to true, bind <<<failsafe:integration-test>>> to the <<<integration-test>>> phase, bind <<<jetty:stop>>> to the <<<post-integration-test>>> phase and finally bind <<<failsafe:verify>>> to @@ -167,16 +167,15 @@ mvn verify </executions> </plugin> <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>maven-jetty-plugin</artifactId> - <version>6.1.16</version> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-maven-plugin</artifactId> + <version>9.2.2.v20140723</version> [...] <configuration> [...] <scanIntervalSeconds>10</scanIntervalSeconds> <stopPort>8005</stopPort> <stopKey>STOP</stopKey> - <contextPath>/</contextPath> [...] </configuration> [...] @@ -186,7 +185,7 @@ mvn verify <id>start-jetty</id> <phase>pre-integration-test</phase> <goals> - <goal>run-exploded</goal> + <goal>start</goal> </goals> <configuration> <scanIntervalSeconds>0</scanIntervalSeconds> @@ -234,9 +233,9 @@ mvn verify <plugins> [...] <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>maven-jetty-plugin</artifactId> - <version>6.1.16</version> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-maven-plugin</artifactId> + <version>9.2.2.v20140723</version> [...] <executions> [...] @@ -246,7 +245,7 @@ mvn verify <goals> <!-- stop any previous instance to free up the port --> <goal>stop</goal> - <goal>run-exploded</goal> + <goal>start</goal> </goals> [...] </execution>
