Skip to content

Commit b274a3c

Browse files
authored
jetty 10.0.x no port 8080 (#8049)
* ensure it test is not started on port 8080 and use non random groupIds Signed-off-by: Olivier Lamy <[email protected]>
1 parent 38fcf7d commit b274a3c

File tree

4 files changed

+21
-22
lines changed

4 files changed

+21
-22
lines changed

jetty-maven-plugin/src/it/jetty-run-mojo-jar-scan-it/MyLibrary/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<parent>
6-
<artifactId>jetty-issue</artifactId>
7-
<groupId>org.mehdi</groupId>
6+
<groupId>org.eclipse.jetty.its.jetty-run-mojo-jar-scan-it</groupId>
7+
<artifactId>jetty-jar-scan</artifactId>
88
<version>1.0-SNAPSHOT</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

12-
<artifactId>MyLibrary</artifactId>
12+
<artifactId>jetty-jar-scan-library</artifactId>
1313

1414
<dependencies>
1515
<dependency>

jetty-maven-plugin/src/it/jetty-run-mojo-jar-scan-it/MyWebApp/pom.xml

+9-11
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<parent>
6-
<artifactId>jetty-issue</artifactId>
7-
<groupId>org.mehdi</groupId>
6+
<groupId>org.eclipse.jetty.its.jetty-run-mojo-jar-scan-it</groupId>
7+
<artifactId>jetty-jar-scan</artifactId>
88
<version>1.0-SNAPSHOT</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

12-
<artifactId>MyWebApp</artifactId>
12+
<artifactId>jetty-jar-scan-webapp</artifactId>
1313
<packaging>jar</packaging>
1414

1515
<properties>
@@ -23,8 +23,8 @@
2323
<scope>provided</scope>
2424
</dependency>
2525
<dependency>
26-
<groupId>org.mehdi</groupId>
27-
<artifactId>MyLibrary</artifactId>
26+
<groupId>org.eclipse.jetty.its.jetty-run-mojo-jar-scan-it</groupId>
27+
<artifactId>jetty-jar-scan-library</artifactId>
2828
</dependency>
2929
</dependencies>
3030

@@ -44,13 +44,11 @@
4444
</goals>
4545
<configuration>
4646
<systemProperties>
47-
<systemProperty>
48-
<name>jetty.port.file</name>
49-
<value>${jetty.port.file}</value>
50-
</systemProperty>
47+
<jetty.port.file>${jetty.port.file}</jetty.port.file>
5148
</systemProperties>
52-
<nonBlocking>true</nonBlocking>
53-
<jettyXml>${basedir}/src/config/jetty.xml</jettyXml>
49+
<jettyXmls>
50+
<jettyXml>${basedir}/src/config/jetty.xml</jettyXml>
51+
</jettyXmls>
5452
<contextXml>${basedir}/src/config/context.xml</contextXml>
5553
<useTestScope>true</useTestScope>
5654
<supportedPackagings>

jetty-maven-plugin/src/it/jetty-run-mojo-jar-scan-it/MyWebApp/src/config/jetty.xml

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
1+
<?xml version="1.0"?>
2+
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
23

34
<Configure id="Server" class="org.eclipse.jetty.server.Server">
45
<New id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
@@ -23,15 +24,15 @@
2324
</Item>
2425
</Array>
2526
</Arg>
26-
<Call name="addLifeCycleListener">
27+
<Call name="addEventListener">
2728
<Arg>
2829
<New class="org.eclipse.jetty.maven.plugin.ServerConnectorListener">
2930
<Set name="fileName"><Property name="jetty.port.file" default="port.txt"/></Set>
3031
</New>
3132
</Arg>
3233
</Call>
33-
<Set name="host"><Property name="jetty.host" /></Set>
34-
<Set name="port"><Property name="jetty.port" default="0" />0</Set>
34+
<Set name="host" property="jetty.host"/>
35+
<Set name="port" property="jetty.port"/>
3536
<Set name="idleTimeout">30000</Set>
3637
</New>
3738
</Arg>

jetty-maven-plugin/src/it/jetty-run-mojo-jar-scan-it/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
</parent>
1111

1212

13-
<groupId>org.mehdi</groupId>
14-
<artifactId>jetty-issue</artifactId>
13+
<groupId>org.eclipse.jetty.its.jetty-run-mojo-jar-scan-it</groupId>
14+
<artifactId>jetty-jar-scan</artifactId>
1515
<packaging>pom</packaging>
1616
<version>1.0-SNAPSHOT</version>
1717
<modules>
@@ -22,8 +22,8 @@
2222
<dependencyManagement>
2323
<dependencies>
2424
<dependency>
25-
<groupId>org.mehdi</groupId>
26-
<artifactId>MyLibrary</artifactId>
25+
<groupId>org.eclipse.jetty.its.jetty-run-mojo-jar-scan-it</groupId>
26+
<artifactId>jetty-jar-scan-library</artifactId>
2727
<version>${project.version}</version>
2828
</dependency>
2929
</dependencies>

0 commit comments

Comments
 (0)