This is an automated email from the ASF dual-hosted git repository.
veithen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
The following commit(s) were added to refs/heads/master by this push:
new f7f912a Use daemon-maven-plugin instead of jetty-maven-plugin
f7f912a is described below
commit f7f912ad718ee18a3202cd7b201505ae657ddd7f
Author: Andreas Veithen <[email protected]>
AuthorDate: Mon Jan 4 22:25:05 2021 +0000
Use daemon-maven-plugin instead of jetty-maven-plugin
jetty-maven-plugin runs the Web app in the same JVM as Maven, which means
that the code can't be instrumented by JaCoCo and miss code coverage.
---
pom.xml | 5 ++++
systests/webapp-tests/pom.xml | 58 ++++++++++++++-----------------------------
2 files changed, 24 insertions(+), 39 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7cd6dd9..88d4b17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1238,6 +1238,11 @@
<version>9.3.25.v20180904</version>
</plugin>
<plugin>
+ <groupId>com.github.veithen.daemon</groupId>
+ <artifactId>daemon-maven-plugin</artifactId>
+ <version>0.3.0</version>
+ </plugin>
+ <plugin>
<groupId>com.github.veithen.invoker</groupId>
<artifactId>resolver-proxy-maven-plugin</artifactId>
<version>0.1.3</version>
diff --git a/systests/webapp-tests/pom.xml b/systests/webapp-tests/pom.xml
index fd5a4e8..47adb2f 100644
--- a/systests/webapp-tests/pom.xml
+++ b/systests/webapp-tests/pom.xml
@@ -103,56 +103,36 @@
</executions>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>reserve-network-port</id>
- <goals>
- <goal>reserve-network-port</goal>
- </goals>
- <phase>pre-integration-test</phase>
- <configuration>
- <portNames>
- <portName>jetty.stopPort</portName>
- <portName>jetty.httpPort</portName>
- </portNames>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-maven-plugin</artifactId>
- <configuration>
- <stopKey>foo</stopKey>
- <stopPort>${jetty.stopPort}</stopPort>
- <stopWait>10</stopWait>
- <httpConnector>
- <port>${jetty.httpPort}</port>
- </httpConnector>
- <war>${webapp}</war>
- <webApp>
- <contextPath>/axis2</contextPath>
- </webApp>
- </configuration>
+ <groupId>com.github.veithen.daemon</groupId>
+ <artifactId>daemon-maven-plugin</artifactId>
<executions>
<execution>
<id>start-jetty</id>
- <phase>pre-integration-test</phase>
<goals>
- <goal>deploy-war</goal>
+ <goal>start</goal>
</goals>
<configuration>
- <!-- TODO: necessary? -->
- <daemon>true</daemon>
+ <daemonArtifact>
+ <artifactId>jetty-daemon</artifactId>
+ </daemonArtifact>
+ <daemonConfiguration>
+ <resourceBases>
+ <resourceBase>${webapp}</resourceBase>
+ </resourceBases>
+ <contextPath>/axis2</contextPath>
+ </daemonConfiguration>
+ <ports>
+ <port>
+ <name>http</name>
+ <propertyName>jetty.httpPort</propertyName>
+ </port>
+ </ports>
</configuration>
</execution>
<execution>
<id>stop-jetty</id>
- <phase>post-integration-test</phase>
<goals>
- <goal>stop</goal>
+ <goal>stop-all</goal>
</goals>
</execution>
</executions>
