From ea8139e94a6918b6edb2a3a1e8e83af45f0057ab Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Sat, 13 Apr 2024 10:33:30 +0200 Subject: [PATCH] Issue #11642 restore Jetty ee8 runner (#11650) * Issue #11642 restore Jetty ee8 runner --------- Signed-off-by: Olivier Lamy --- jetty-ee10/jetty-ee10-runner/pom.xml | 46 ++--- .../pom.xml | 6 +- .../src/it/demo-simple-webapp-runner/pom.xml | 6 +- .../src/it/test-jar-manifest/pom.xml | 2 +- .../src/it/test-jar-manifest/postbuild.groovy | 2 +- .../it/IntegrationTestJettyRunner.java | 2 +- jetty-ee8/jetty-ee8-runner/pom.xml | 173 ++++++++++++++++++ .../invoker.properties | 1 + .../pom.xml | 139 ++++++++++++++ .../invoker.properties | 1 + .../src/it/demo-simple-webapp-runner/pom.xml | 139 ++++++++++++++ .../jetty-ee8-runner/src/it/settings.xml | 36 ++++ .../it/test-jar-manifest/invoker.properties | 1 + .../src/it/test-jar-manifest/pom.xml | 59 ++++++ .../src/it/test-jar-manifest/postbuild.groovy | 11 ++ .../src/main/resources/META-INF/MANIFEST.MF | 0 .../main/resources/jetty-logging.properties | 2 + .../it/IntegrationTestJettyRunner.java | 65 +++++++ jetty-ee8/pom.xml | 7 + .../jetty-ee9-demo-embedded/pom.xml | 1 - jetty-ee9/jetty-ee9-runner/pom.xml | 46 ++--- .../pom.xml | 2 +- .../src/it/demo-simple-webapp-runner/pom.xml | 2 +- .../src/it/test-jar-manifest/pom.xml | 2 +- 24 files changed, 692 insertions(+), 59 deletions(-) create mode 100644 jetty-ee8/jetty-ee8-runner/pom.xml create mode 100644 jetty-ee8/jetty-ee8-runner/src/it/demo-simple-webapp-runner-with-path/invoker.properties create mode 100644 jetty-ee8/jetty-ee8-runner/src/it/demo-simple-webapp-runner-with-path/pom.xml create mode 100644 jetty-ee8/jetty-ee8-runner/src/it/demo-simple-webapp-runner/invoker.properties create mode 100644 jetty-ee8/jetty-ee8-runner/src/it/demo-simple-webapp-runner/pom.xml create mode 100644 jetty-ee8/jetty-ee8-runner/src/it/settings.xml create mode 100644 jetty-ee8/jetty-ee8-runner/src/it/test-jar-manifest/invoker.properties create mode 100644 jetty-ee8/jetty-ee8-runner/src/it/test-jar-manifest/pom.xml create mode 100644 jetty-ee8/jetty-ee8-runner/src/it/test-jar-manifest/postbuild.groovy create mode 100644 jetty-ee8/jetty-ee8-runner/src/main/resources/META-INF/MANIFEST.MF create mode 100644 jetty-ee8/jetty-ee8-runner/src/main/resources/jetty-logging.properties create mode 100644 jetty-ee8/jetty-ee8-runner/src/test/java/org/eclipse/jetty/ee9/maven/jettyrunner/it/IntegrationTestJettyRunner.java diff --git a/jetty-ee10/jetty-ee10-runner/pom.xml b/jetty-ee10/jetty-ee10-runner/pom.xml index e0833dd4a9af..a05afb51b4f9 100644 --- a/jetty-ee10/jetty-ee10-runner/pom.xml +++ b/jetty-ee10/jetty-ee10-runner/pom.xml @@ -127,43 +127,43 @@ org.apache.maven.plugins - maven-jar-plugin + maven-invoker-plugin + + ${it.debug} + true + org.eclipse.jetty.maven.its.ee10.runner + + ${maven.dependency.plugin.version} + ${maven.surefire.plugin.version} + ${hamcrest.version} + + + clean + + + integration-test - test-jar + install + integration-test + verify + integration-test - - + diff --git a/jetty-ee10/jetty-ee10-runner/src/it/demo-simple-webapp-runner-with-path/pom.xml b/jetty-ee10/jetty-ee10-runner/src/it/demo-simple-webapp-runner-with-path/pom.xml index 90e452f1b428..c502d323e12d 100644 --- a/jetty-ee10/jetty-ee10-runner/src/it/demo-simple-webapp-runner-with-path/pom.xml +++ b/jetty-ee10/jetty-ee10-runner/src/it/demo-simple-webapp-runner-with-path/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.eclipse.jetty.its - jetty-runner-it-test-demo-simple-webapp + jetty-runner-ee10-it-test-demo-simple-webapp 1.0.0-SNAPSHOT war @@ -29,7 +29,7 @@ org.eclipse.jetty.ee10.demos - demo-simple-webapp + jetty-ee10-demo-simple-webapp @project.version@ war @@ -74,7 +74,7 @@ org.eclipse.jetty.ee10.demos - demo-simple-webapp + jetty-ee10-demo-simple-webapp @project.version@ war false diff --git a/jetty-ee10/jetty-ee10-runner/src/it/demo-simple-webapp-runner/pom.xml b/jetty-ee10/jetty-ee10-runner/src/it/demo-simple-webapp-runner/pom.xml index d4183471d066..7eedf1db0b9c 100644 --- a/jetty-ee10/jetty-ee10-runner/src/it/demo-simple-webapp-runner/pom.xml +++ b/jetty-ee10/jetty-ee10-runner/src/it/demo-simple-webapp-runner/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.eclipse.jetty.its - jetty-runner-it-test-demo-simple-webapp + jetty-runner-ee10-it-test-demo-simple-webapp 1.0.0-SNAPSHOT war @@ -29,7 +29,7 @@ org.eclipse.jetty.ee10.demos - demo-simple-webapp + jetty-ee10-demo-simple-webapp @project.version@ war @@ -74,7 +74,7 @@ org.eclipse.jetty.ee10.demos - demo-simple-webapp + jetty-ee10-demo-simple-webapp @project.version@ war false diff --git a/jetty-ee10/jetty-ee10-runner/src/it/test-jar-manifest/pom.xml b/jetty-ee10/jetty-ee10-runner/src/it/test-jar-manifest/pom.xml index 956487ed9959..fae6044f2ea3 100644 --- a/jetty-ee10/jetty-ee10-runner/src/it/test-jar-manifest/pom.xml +++ b/jetty-ee10/jetty-ee10-runner/src/it/test-jar-manifest/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.eclipse.jetty.its - jetty-runner-it-test + jetty-runner-ee10-it-test 1.0.0-SNAPSHOT war diff --git a/jetty-ee10/jetty-ee10-runner/src/it/test-jar-manifest/postbuild.groovy b/jetty-ee10/jetty-ee10-runner/src/it/test-jar-manifest/postbuild.groovy index c21ad606fb08..4f4f8fe9d19c 100644 --- a/jetty-ee10/jetty-ee10-runner/src/it/test-jar-manifest/postbuild.groovy +++ b/jetty-ee10/jetty-ee10-runner/src/it/test-jar-manifest/postbuild.groovy @@ -8,4 +8,4 @@ JarFile jar = new JarFile( artifact ); Attributes manifest = jar.getManifest().getMainAttributes(); -assert manifest.getValue( new Attributes.Name( "Main-Class" ) ).equals( "org.eclipse.jetty.runner.Runner" ) +assert manifest.getValue( new Attributes.Name( "Main-Class" ) ).equals( "org.eclipse.jetty.ee10.runner.Runner" ) diff --git a/jetty-ee10/jetty-ee10-runner/src/test/java/org/eclipse/jetty/ee10/maven/jettyrunner/it/IntegrationTestJettyRunner.java b/jetty-ee10/jetty-ee10-runner/src/test/java/org/eclipse/jetty/ee10/maven/jettyrunner/it/IntegrationTestJettyRunner.java index 31c3a0ab5b52..cae885d8ab30 100644 --- a/jetty-ee10/jetty-ee10-runner/src/test/java/org/eclipse/jetty/ee10/maven/jettyrunner/it/IntegrationTestJettyRunner.java +++ b/jetty-ee10/jetty-ee10-runner/src/test/java/org/eclipse/jetty/ee10/maven/jettyrunner/it/IntegrationTestJettyRunner.java @@ -38,7 +38,7 @@ public void testGet() throws Exception httpClient.start(); ContentResponse response = httpClient.newRequest(serverUri).send(); String res = response.getContentAsString(); - assertThat(res, Matchers.containsString("Hello World!")); + assertThat(res, Matchers.containsString("Hello World EE10!")); } finally { diff --git a/jetty-ee8/jetty-ee8-runner/pom.xml b/jetty-ee8/jetty-ee8-runner/pom.xml new file mode 100644 index 000000000000..76b91c96a827 --- /dev/null +++ b/jetty-ee8/jetty-ee8-runner/pom.xml @@ -0,0 +1,173 @@ + + + 4.0.0 + + org.eclipse.jetty.ee8 + jetty-ee8 + 12.0.9-SNAPSHOT + + jetty-ee8-runner + EE8 :: Runner + + + target/distribution + ${project.groupId}.runner + jetty-ee9-runner + + true + + + + + org.eclipse.jetty + jetty-jndi + + + org.eclipse.jetty.ee8 + jetty-ee8-annotations + + + org.eclipse.jetty.ee8 + jetty-ee8-apache-jsp + + + org.eclipse.jetty.ee8 + jetty-ee8-glassfish-jstl + + + org.eclipse.jetty.ee8 + jetty-ee8-plus + + + jakarta.el + jakarta.el-api + + + + + org.eclipse.jetty.ee8.websocket + jetty-ee8-websocket-jetty-server + + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + runtime + + + org.eclipse.jetty + jetty-client + test + + + org.eclipse.jetty.ee8.demos + jetty-ee8-demo-simple-webapp + war + test + + + + + + + + org.apache.felix + maven-bundle-plugin + + + true + + + + org.apache.maven.plugins + maven-jar-plugin + + + + org.eclipse.jetty.ee8.runner.Runner + + + Jetty Runner + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack-dependencies + + unpack-dependencies + + prepare-package + + ** + **/MANIFEST.MF, + META-INF/LICENSE, + META-INF/*.RSA, + META-INF/*.DSA, + META-INF/*.SF, + module-info.class, + readme.txt, + MANIFEST.MF, + about.html, + ecj.1 + ${project.build.directory}/classes + false + true + compile + + + + + + + org.apache.maven.plugins + maven-invoker-plugin + + ${it.debug} + true + org.eclipse.jetty.maven.its.ee8.runner + + ${maven.dependency.plugin.version} + ${maven.surefire.plugin.version} + ${hamcrest.version} + + + clean + + + + + integration-test + + install + integration-test + verify + + integration-test + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + test-jar + + + + + + + diff --git a/jetty-ee8/jetty-ee8-runner/src/it/demo-simple-webapp-runner-with-path/invoker.properties b/jetty-ee8/jetty-ee8-runner/src/it/demo-simple-webapp-runner-with-path/invoker.properties new file mode 100644 index 000000000000..fd18ebccf104 --- /dev/null +++ b/jetty-ee8/jetty-ee8-runner/src/it/demo-simple-webapp-runner-with-path/invoker.properties @@ -0,0 +1 @@ +invoker.goals = test diff --git a/jetty-ee8/jetty-ee8-runner/src/it/demo-simple-webapp-runner-with-path/pom.xml b/jetty-ee8/jetty-ee8-runner/src/it/demo-simple-webapp-runner-with-path/pom.xml new file mode 100644 index 000000000000..ac803fd0f44a --- /dev/null +++ b/jetty-ee8/jetty-ee8-runner/src/it/demo-simple-webapp-runner-with-path/pom.xml @@ -0,0 +1,139 @@ + + + + 4.0.0 + + org.eclipse.jetty.its + jetty-runner-ee8-it-test-demo-simple-webapp + 1.0.0-SNAPSHOT + war + + + UTF-8 + + + + + + org.eclipse.jetty.ee8 + jetty-ee8-runner + @project.version@ + + + org.eclipse.jetty.ee8 + jetty-ee8-runner + @project.version@ + tests + test-jar + test + + + org.eclipse.jetty.ee8.demos + jetty-ee8-demo-simple-webapp + @project.version@ + war + + + org.eclipse.jetty + jetty-client + @project.version@ + test + + + org.hamcrest + hamcrest-core + @hamcrest.version@ + test + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + @maven.dependency.plugin.version@ + + + copy-jetty-runner + generate-resources + + copy + + + + + org.eclipse.jetty.ee8 + jetty-ee8-runner + @project.version@ + jar + false + ${project.build.directory}/ + jetty-runner.jar + + + org.eclipse.jetty.ee8.demos + jetty-ee8-demo-simple-webapp + @project.version@ + war + false + ${project.build.directory} + demo-simple-webapp.war + + + false + true + + + + + + org.codehaus.mojo + exec-maven-plugin + @maven.exec.plugin.version@ + + + + exec + + generate-test-resources + + ${project.build.directory}/jetty-runner.log + true + ${java.home}/bin/java + + -jar + ${project.build.directory}/jetty-runner.jar + --out + ${project.build.directory}/jetty-runner.out + --port + 0 + --path + french-chocolate-rocks + --server-uri-file + ${project.build.directory}/server-uri.txt + ${project.build.directory}/demo-simple-webapp.war + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + @maven.surefire.plugin.version@ + + + IntegrationTest*.java + + + + + org.eclipse.jetty.ee8:jetty-ee8-runner + + + + + + diff --git a/jetty-ee8/jetty-ee8-runner/src/it/demo-simple-webapp-runner/invoker.properties b/jetty-ee8/jetty-ee8-runner/src/it/demo-simple-webapp-runner/invoker.properties new file mode 100644 index 000000000000..fd18ebccf104 --- /dev/null +++ b/jetty-ee8/jetty-ee8-runner/src/it/demo-simple-webapp-runner/invoker.properties @@ -0,0 +1 @@ +invoker.goals = test diff --git a/jetty-ee8/jetty-ee8-runner/src/it/demo-simple-webapp-runner/pom.xml b/jetty-ee8/jetty-ee8-runner/src/it/demo-simple-webapp-runner/pom.xml new file mode 100644 index 000000000000..c50b0b02fb4e --- /dev/null +++ b/jetty-ee8/jetty-ee8-runner/src/it/demo-simple-webapp-runner/pom.xml @@ -0,0 +1,139 @@ + + + + 4.0.0 + + org.eclipse.jetty.its + jetty-runner-ee8-it-test-demo-simple-webapp + 1.0.0-SNAPSHOT + war + + + UTF-8 + + + + + + org.eclipse.jetty.ee8 + jetty-ee8-runner + @project.version@ + + + org.eclipse.jetty.ee8 + jetty-ee8-runner + @project.version@ + tests + test-jar + test + + + org.eclipse.jetty.ee8.demos + jetty-ee8-demo-simple-webapp + @project.version@ + war + + + org.eclipse.jetty + jetty-client + @project.version@ + test + + + org.hamcrest + hamcrest-core + @hamcrest.version@ + test + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + @maven.dependency.plugin.version@ + + + copy-jetty-runner + generate-resources + + copy + + + + + org.eclipse.jetty.ee8 + jetty-ee8-runner + @project.version@ + jar + false + ${project.build.directory}/ + jetty-runner.jar + + + org.eclipse.jetty.ee8.demos + jetty-ee8-demo-simple-webapp + @project.version@ + war + false + ${project.build.directory} + demo-simple-webapp.war + + + false + true + + + + + + org.codehaus.mojo + exec-maven-plugin + @maven.exec.plugin.version@ + + + + exec + + generate-test-resources + + ${project.build.directory}/jetty-runner.log + true + ${java.home}/bin/java + + + + -jar + ${project.build.directory}/jetty-runner.jar + --out + ${project.build.directory}/jetty-runner.out + --port + 0 + --server-uri-file + ${project.build.directory}/server-uri.txt + ${project.build.directory}/demo-simple-webapp.war + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + @maven.surefire.plugin.version@ + + + IntegrationTest*.java + + + + + org.eclipse.jetty.ee8:jetty-ee8-runner + + + + + + diff --git a/jetty-ee8/jetty-ee8-runner/src/it/settings.xml b/jetty-ee8/jetty-ee8-runner/src/it/settings.xml new file mode 100644 index 000000000000..d64bdb89034a --- /dev/null +++ b/jetty-ee8/jetty-ee8-runner/src/it/settings.xml @@ -0,0 +1,36 @@ + + + + + + it-repo + + true + + + + local.central + @localRepositoryUrl@ + + true + + + true + + + + + + local.central + @localRepositoryUrl@ + + true + + + true + + + + + + diff --git a/jetty-ee8/jetty-ee8-runner/src/it/test-jar-manifest/invoker.properties b/jetty-ee8/jetty-ee8-runner/src/it/test-jar-manifest/invoker.properties new file mode 100644 index 000000000000..86f8ef2b7513 --- /dev/null +++ b/jetty-ee8/jetty-ee8-runner/src/it/test-jar-manifest/invoker.properties @@ -0,0 +1 @@ +invoker.goals = generate-resources diff --git a/jetty-ee8/jetty-ee8-runner/src/it/test-jar-manifest/pom.xml b/jetty-ee8/jetty-ee8-runner/src/it/test-jar-manifest/pom.xml new file mode 100644 index 000000000000..80cede0a0797 --- /dev/null +++ b/jetty-ee8/jetty-ee8-runner/src/it/test-jar-manifest/pom.xml @@ -0,0 +1,59 @@ + + + + 4.0.0 + + org.eclipse.jetty.its + jetty-runner-ee8-it-test + 1.0.0-SNAPSHOT + war + + + UTF-8 + + + + + + org.eclipse.jetty.ee8 + jetty-ee8-runner + @project.version@ + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + @maven.dependency.plugin.version@ + + + copy-jetty-runner + generate-resources + + copy + + + + + org.eclipse.jetty.ee8 + jetty-ee8-runner + @project.version@ + jar + false + ${project.build.directory}/ + jetty-runner.jar + + + false + true + + + + + + + + diff --git a/jetty-ee8/jetty-ee8-runner/src/it/test-jar-manifest/postbuild.groovy b/jetty-ee8/jetty-ee8-runner/src/it/test-jar-manifest/postbuild.groovy new file mode 100644 index 000000000000..757aef59549f --- /dev/null +++ b/jetty-ee8/jetty-ee8-runner/src/it/test-jar-manifest/postbuild.groovy @@ -0,0 +1,11 @@ +import java.util.jar.Attributes +import java.util.jar.JarFile + +File artifact = new File( basedir, "target/jetty-runner.jar" ) +assert artifact.exists() + +JarFile jar = new JarFile( artifact ); + +Attributes manifest = jar.getManifest().getMainAttributes(); + +assert manifest.getValue( new Attributes.Name( "Main-Class" ) ).equals( "org.eclipse.jetty.ee8.runner.Runner" ) diff --git a/jetty-ee8/jetty-ee8-runner/src/main/resources/META-INF/MANIFEST.MF b/jetty-ee8/jetty-ee8-runner/src/main/resources/META-INF/MANIFEST.MF new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/jetty-ee8/jetty-ee8-runner/src/main/resources/jetty-logging.properties b/jetty-ee8/jetty-ee8-runner/src/main/resources/jetty-logging.properties new file mode 100644 index 000000000000..1de0a5d8bb8d --- /dev/null +++ b/jetty-ee8/jetty-ee8-runner/src/main/resources/jetty-logging.properties @@ -0,0 +1,2 @@ +# Jetty Logging using jetty-slf4j-impl +org.eclipse.jetty.LEVEL=INFO \ No newline at end of file diff --git a/jetty-ee8/jetty-ee8-runner/src/test/java/org/eclipse/jetty/ee9/maven/jettyrunner/it/IntegrationTestJettyRunner.java b/jetty-ee8/jetty-ee8-runner/src/test/java/org/eclipse/jetty/ee9/maven/jettyrunner/it/IntegrationTestJettyRunner.java new file mode 100644 index 000000000000..c4ba3da4e7a4 --- /dev/null +++ b/jetty-ee8/jetty-ee8-runner/src/test/java/org/eclipse/jetty/ee9/maven/jettyrunner/it/IntegrationTestJettyRunner.java @@ -0,0 +1,65 @@ +// +// ======================================================================== +// Copyright (c) 1995 Mort Bay Consulting Pty Ltd and others. +// +// This program and the accompanying materials are made available under the +// terms of the Eclipse Public License v. 2.0 which is available at +// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 +// which is available at https://www.apache.org/licenses/LICENSE-2.0. +// +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 +// ======================================================================== +// + +package org.eclipse.jetty.ee9.maven.jettyrunner.it; + +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.List; + +import org.eclipse.jetty.client.ContentResponse; +import org.eclipse.jetty.client.HttpClient; +import org.hamcrest.Matchers; +import org.junit.jupiter.api.Test; + +import static java.util.concurrent.TimeUnit.MINUTES; +import static org.hamcrest.MatcherAssert.assertThat; + +public class IntegrationTestJettyRunner +{ + @Test + public void testGet() throws Exception + { + String serverUri = findServerUri(); + HttpClient httpClient = new HttpClient(); + try + { + httpClient.start(); + ContentResponse response = httpClient.newRequest(serverUri).send(); + String res = response.getContentAsString(); + assertThat(res, Matchers.containsString("Hello World EE8!")); + } + finally + { + httpClient.stop(); + } + } + + private String findServerUri() throws Exception + { + long now = System.currentTimeMillis(); + + while (System.currentTimeMillis() - now < MINUTES.toMillis(2)) + { + Path portTxt = Paths.get("target", "server-uri.txt"); + if (Files.exists(portTxt)) + { + List lines = Files.readAllLines(portTxt); + return lines.get(0); + } + } + + throw new Exception("cannot find started Jetty"); + } +} diff --git a/jetty-ee8/pom.xml b/jetty-ee8/pom.xml index 7792d37d4c20..5e6e14fcbd59 100644 --- a/jetty-ee8/pom.xml +++ b/jetty-ee8/pom.xml @@ -29,6 +29,7 @@ jetty-ee8-plus jetty-ee8-proxy jetty-ee8-quickstart + jetty-ee8-runner jetty-ee8-security jetty-ee8-servlet jetty-ee8-servlets @@ -158,6 +159,12 @@ jetty-ee8-demo-mock-resources ${project.version} + + org.eclipse.jetty.ee8.demos + jetty-ee8-demo-simple-webapp + ${project.version} + war + org.eclipse.jetty.ee8.demos jetty-ee8-demo-web-fragment diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-embedded/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-embedded/pom.xml index f1255a05f47c..148c3badb9f9 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-embedded/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-embedded/pom.xml @@ -114,7 +114,6 @@ org.eclipse.jetty.ee9.demos jetty-ee9-demo-simple-webapp - ${project.version} war diff --git a/jetty-ee9/jetty-ee9-runner/pom.xml b/jetty-ee9/jetty-ee9-runner/pom.xml index c276375a6349..cd00a9dbca29 100644 --- a/jetty-ee9/jetty-ee9-runner/pom.xml +++ b/jetty-ee9/jetty-ee9-runner/pom.xml @@ -129,43 +129,43 @@ org.apache.maven.plugins - maven-jar-plugin + maven-invoker-plugin + + ${it.debug} + true + org.eclipse.jetty.maven.its.ee9.runner + + ${maven.dependency.plugin.version} + ${maven.surefire.plugin.version} + ${hamcrest.version} + + + clean + + + integration-test - test-jar + install + integration-test + verify + integration-test - - + diff --git a/jetty-ee9/jetty-ee9-runner/src/it/demo-simple-webapp-runner-with-path/pom.xml b/jetty-ee9/jetty-ee9-runner/src/it/demo-simple-webapp-runner-with-path/pom.xml index 291083123e65..3db0110b9354 100644 --- a/jetty-ee9/jetty-ee9-runner/src/it/demo-simple-webapp-runner-with-path/pom.xml +++ b/jetty-ee9/jetty-ee9-runner/src/it/demo-simple-webapp-runner-with-path/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.eclipse.jetty.its - jetty-runner-it-test-demo-simple-webapp + jetty-runner-ee9-it-test-demo-simple-webapp 1.0.0-SNAPSHOT war diff --git a/jetty-ee9/jetty-ee9-runner/src/it/demo-simple-webapp-runner/pom.xml b/jetty-ee9/jetty-ee9-runner/src/it/demo-simple-webapp-runner/pom.xml index ef643d9cdfb3..bf532a34beda 100644 --- a/jetty-ee9/jetty-ee9-runner/src/it/demo-simple-webapp-runner/pom.xml +++ b/jetty-ee9/jetty-ee9-runner/src/it/demo-simple-webapp-runner/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.eclipse.jetty.its - jetty-runner-it-test-demo-simple-webapp + jetty-runner-ee9-it-test-demo-simple-webapp 1.0.0-SNAPSHOT war diff --git a/jetty-ee9/jetty-ee9-runner/src/it/test-jar-manifest/pom.xml b/jetty-ee9/jetty-ee9-runner/src/it/test-jar-manifest/pom.xml index 8aaf7d447828..da0e02168732 100644 --- a/jetty-ee9/jetty-ee9-runner/src/it/test-jar-manifest/pom.xml +++ b/jetty-ee9/jetty-ee9-runner/src/it/test-jar-manifest/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.eclipse.jetty.its - jetty-runner-it-test + jetty-runner-ee9-it-test 1.0.0-SNAPSHOT war