Skip to content

Commit

Permalink
Issue #11642 restore Jetty ee8 runner (#11650)
Browse files Browse the repository at this point in the history
* Issue #11642 restore Jetty ee8 runner
---------

Signed-off-by: Olivier Lamy <[email protected]>
  • Loading branch information
olamy authored Apr 13, 2024
1 parent 30bee71 commit ea8139e
Show file tree
Hide file tree
Showing 24 changed files with 692 additions and 59 deletions.
46 changes: 23 additions & 23 deletions jetty-ee10/jetty-ee10-runner/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -127,43 +127,43 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<artifactId>maven-invoker-plugin</artifactId>
<configuration>
<debug>${it.debug}</debug>
<addTestClassPath>true</addTestClassPath>
<junitPackageName>org.eclipse.jetty.maven.its.ee10.runner</junitPackageName>
<scriptVariables>
<maven.dependency.plugin.version>${maven.dependency.plugin.version}</maven.dependency.plugin.version>
<maven.surefire.plugin.version>${maven.surefire.plugin.version}</maven.surefire.plugin.version>
<hamcrest.version>${hamcrest.version}</hamcrest.version>
</scriptVariables>
<goals>
<goal>clean</goal>
</goals>
</configuration>
<executions>
<execution>
<id>integration-test</id>
<goals>
<goal>test-jar</goal>
<goal>install</goal>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
<phase>integration-test</phase>
</execution>
</executions>
</plugin>
<!-- TODO -->
<!-- plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<id>integration-test</id>
<phase>integration-test</phase>
<goals>
<goal>install</goal>
<goal>integration-test</goal>
<goal>verify</goal>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
<configuration>
<debug>${it.debug}</debug>
<addTestClassPath>true</addTestClassPath>
<scriptVariables>
<maven.dependency.plugin.version>${maven.dependency.plugin.version}</maven.dependency.plugin.version>
<maven.surefire.plugin.version>${maven.surefire.plugin.version}</maven.surefire.plugin.version>
<hamcrest.version>${hamcrest.version}</hamcrest.version>
</scriptVariables>
<goals>
<goal>clean</goal>
</goals>
</configuration>
</plugin -->
</plugin>
</plugins>
</build>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>

<groupId>org.eclipse.jetty.its</groupId>
<artifactId>jetty-runner-it-test-demo-simple-webapp</artifactId>
<artifactId>jetty-runner-ee10-it-test-demo-simple-webapp</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>war</packaging>

Expand All @@ -29,7 +29,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.demos</groupId>
<artifactId>demo-simple-webapp</artifactId>
<artifactId>jetty-ee10-demo-simple-webapp</artifactId>
<version>@project.version@</version>
<type>war</type>
</dependency>
Expand Down Expand Up @@ -74,7 +74,7 @@
</artifactItem>
<artifactItem>
<groupId>org.eclipse.jetty.ee10.demos</groupId>
<artifactId>demo-simple-webapp</artifactId>
<artifactId>jetty-ee10-demo-simple-webapp</artifactId>
<version>@project.version@</version>
<type>war</type>
<overWrite>false</overWrite>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>

<groupId>org.eclipse.jetty.its</groupId>
<artifactId>jetty-runner-it-test-demo-simple-webapp</artifactId>
<artifactId>jetty-runner-ee10-it-test-demo-simple-webapp</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>war</packaging>

Expand All @@ -29,7 +29,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10.demos</groupId>
<artifactId>demo-simple-webapp</artifactId>
<artifactId>jetty-ee10-demo-simple-webapp</artifactId>
<version>@project.version@</version>
<type>war</type>
</dependency>
Expand Down Expand Up @@ -74,7 +74,7 @@
</artifactItem>
<artifactItem>
<groupId>org.eclipse.jetty.ee10.demos</groupId>
<artifactId>demo-simple-webapp</artifactId>
<artifactId>jetty-ee10-demo-simple-webapp</artifactId>
<version>@project.version@</version>
<type>war</type>
<overWrite>false</overWrite>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>

<groupId>org.eclipse.jetty.its</groupId>
<artifactId>jetty-runner-it-test</artifactId>
<artifactId>jetty-runner-ee10-it-test</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>war</packaging>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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" )
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
173 changes: 173 additions & 0 deletions jetty-ee8/jetty-ee8-runner/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,173 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.eclipse.jetty.ee8</groupId>
<artifactId>jetty-ee8</artifactId>
<version>12.0.9-SNAPSHOT</version>
</parent>
<artifactId>jetty-ee8-runner</artifactId>
<name>EE8 :: Runner</name>

<properties>
<assembly-directory>target/distribution</assembly-directory>
<bundle-symbolic-name>${project.groupId}.runner</bundle-symbolic-name>
<ee9.module>jetty-ee9-runner</ee9.module>
<!-- too many external dependencies to fix... :) -->
<spotbugs.skip>true</spotbugs.skip>
</properties>

<dependencies>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jndi</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee8</groupId>
<artifactId>jetty-ee8-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee8</groupId>
<artifactId>jetty-ee8-apache-jsp</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee8</groupId>
<artifactId>jetty-ee8-glassfish-jstl</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee8</groupId>
<artifactId>jetty-ee8-plus</artifactId>
<exclusions>
<exclusion>
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee8.websocket</groupId>
<artifactId>jetty-ee8-websocket-jetty-server</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-slf4j-impl</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-client</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee8.demos</groupId>
<artifactId>jetty-ee8-demo-simple-webapp</artifactId>
<type>war</type>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<!-- jetty-runner is not an OSGi component -->
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifest>
<mainClass>org.eclipse.jetty.ee8.runner.Runner</mainClass>
</manifest>
<manifestEntries>
<Comment>Jetty Runner</Comment>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>unpack-dependencies</id>
<goals>
<goal>unpack-dependencies</goal>
</goals>
<phase>prepare-package</phase>
<configuration>
<includes>**</includes>
<excludes>**/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</excludes>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
<includeScope>compile</includeScope>
</configuration>
</execution>
</executions>
</plugin>
<!-- TODO -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<configuration>
<debug>${it.debug}</debug>
<addTestClassPath>true</addTestClassPath>
<junitPackageName>org.eclipse.jetty.maven.its.ee8.runner</junitPackageName>
<scriptVariables>
<maven.dependency.plugin.version>${maven.dependency.plugin.version}</maven.dependency.plugin.version>
<maven.surefire.plugin.version>${maven.surefire.plugin.version}</maven.surefire.plugin.version>
<hamcrest.version>${hamcrest.version}</hamcrest.version>
</scriptVariables>
<goals>
<goal>clean</goal>
</goals>
</configuration>
<executions>
<execution>
<id>integration-test</id>
<goals>
<goal>install</goal>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
<phase>integration-test</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
invoker.goals = test
Loading

0 comments on commit ea8139e

Please sign in to comment.