Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <oliver.lamy@gmail.com>
This commit is contained in:
Olivier Lamy 2022-05-26 10:30:01 +10:00 committed by GitHub
parent 38fcf7d52f
commit b274a3cceb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,13 +3,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>jetty-issue</artifactId>
<groupId>org.mehdi</groupId>
<groupId>org.eclipse.jetty.its.jetty-run-mojo-jar-scan-it</groupId>
<artifactId>jetty-jar-scan</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MyLibrary</artifactId>
<artifactId>jetty-jar-scan-library</artifactId>
<dependencies>
<dependency>

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

@ -3,13 +3,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>jetty-issue</artifactId>
<groupId>org.mehdi</groupId>
<groupId>org.eclipse.jetty.its.jetty-run-mojo-jar-scan-it</groupId>
<artifactId>jetty-jar-scan</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>MyWebApp</artifactId>
<artifactId>jetty-jar-scan-webapp</artifactId>
<packaging>jar</packaging>
<properties>
@ -23,8 +23,8 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mehdi</groupId>
<artifactId>MyLibrary</artifactId>
<groupId>org.eclipse.jetty.its.jetty-run-mojo-jar-scan-it</groupId>
<artifactId>jetty-jar-scan-library</artifactId>
</dependency>
</dependencies>
@ -44,13 +44,11 @@
</goals>
<configuration>
<systemProperties>
<systemProperty>
<name>jetty.port.file</name>
<value>${jetty.port.file}</value>
</systemProperty>
<jetty.port.file>${jetty.port.file}</jetty.port.file>
</systemProperties>
<nonBlocking>true</nonBlocking>
<jettyXml>${basedir}/src/config/jetty.xml</jettyXml>
<jettyXmls>
<jettyXml>${basedir}/src/config/jetty.xml</jettyXml>
</jettyXmls>
<contextXml>${basedir}/src/config/context.xml</contextXml>
<useTestScope>true</useTestScope>
<supportedPackagings>

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

@ -1,4 +1,5 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server">
<New id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
@ -23,15 +24,15 @@
</Item>
</Array>
</Arg>
<Call name="addLifeCycleListener">
<Call name="addEventListener">
<Arg>
<New class="org.eclipse.jetty.maven.plugin.ServerConnectorListener">
<Set name="fileName"><Property name="jetty.port.file" default="port.txt"/></Set>
</New>
</Arg>
</Call>
<Set name="host"><Property name="jetty.host" /></Set>
<Set name="port"><Property name="jetty.port" default="0" />0</Set>
<Set name="host" property="jetty.host"/>
<Set name="port" property="jetty.port"/>
<Set name="idleTimeout">30000</Set>
</New>
</Arg>

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

@ -10,8 +10,8 @@
</parent>
<groupId>org.mehdi</groupId>
<artifactId>jetty-issue</artifactId>
<groupId>org.eclipse.jetty.its.jetty-run-mojo-jar-scan-it</groupId>
<artifactId>jetty-jar-scan</artifactId>
<packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
<modules>
@ -22,8 +22,8 @@
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.mehdi</groupId>
<artifactId>MyLibrary</artifactId>
<groupId>org.eclipse.jetty.its.jetty-run-mojo-jar-scan-it</groupId>
<artifactId>jetty-jar-scan-library</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>