add jetty-ee8-home and unzip it in the jetty-home (#8283)

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
This commit is contained in:
Olivier Lamy 2022-07-12 12:04:26 +10:00 committed by GitHub
parent 49afcfb846
commit d164efb779
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 562 additions and 2 deletions

View File

@ -0,0 +1,503 @@
<?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/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.eclipse.jetty.ee8</groupId>
<artifactId>jetty-ee8</artifactId>
<version>12.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-ee8-home</artifactId>
<name>EE8 :: Jetty :: Home Assembly</name>
<packaging>pom</packaging>
<properties>
<assembly-directory>${basedir}/target/jetty-ee8-home</assembly-directory>
<source-assembly-directory>${basedir}/target/jetty-ee8-home-sources</source-assembly-directory>
<spotbugs.skip>true</spotbugs.skip>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>unpack-config-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>
org.eclipse.jetty.ee8, org.eclipse.jetty.ee8.demos
</includeGroupIds>
<excludeArtifactIds></excludeArtifactIds>
<classifier>config</classifier>
<failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
<excludes>META-INF/**,webapps/**,start.d/**,start.ini</excludes>
<outputDirectory>${assembly-directory}</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-lib-ee8-websocket-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>org.eclipse.jetty.websocket,org.eclipse.jetty.ee8.websocket</includeGroupIds>
<includeTypes>jar</includeTypes>
<outputDirectory>${assembly-directory}/lib/ee8-websocket</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-lib-ee8-websocket-src-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>org.eclipse.jetty.websocket,org.eclipse.jetty.ee8.websocket</includeGroupIds>
<includeTypes>jar</includeTypes>
<classifier>sources</classifier>
<outputDirectory>${source-assembly-directory}/lib/ee8-websocket</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-ee8-lib-jakarta-websocket-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>jakarta.websocket</includeGroupIds>
<includeTypes>jar</includeTypes>
<outputDirectory>${assembly-directory}/lib/ee8-websocket</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-ee8-lib-jakarta-websocket-src-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>jakarta.websocket</includeGroupIds>
<includeTypes>jar</includeTypes>
<classifier>sources</classifier>
<outputDirectory>${source-assembly-directory}/lib/ee8-websocket</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-lib-servlet-api-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-servlet-api</artifactId>
<version>${jetty.servlet.api.version}</version>
</artifactItem>
</artifactItems>
<outputDirectory>${assembly-directory}/lib</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-lib-servlet-api-src-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-servlet-api</artifactId>
<version>${jetty.servlet.api.version}</version>
<classifier>sources</classifier>
</artifactItem>
</artifactItems>
<outputDirectory>${source-assembly-directory}/lib</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-ee8-annotations-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>jakarta.annotation,org.ow2.asm</includeGroupIds>
<includeArtifactIds>jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis</includeArtifactIds>
<includeTypes>jar</includeTypes>
<outputDirectory>${assembly-directory}/lib/ee8-annotations</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-ee8-annotations-src-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>jakarta.annotation,org.ow2.asm</includeGroupIds>
<includeArtifactIds>jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis</includeArtifactIds>
<includeTypes>jar</includeTypes>
<classifier>sources</classifier>
<outputDirectory>${source-assembly-directory}/lib/ee8-annotations</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-ee8-jsp-src-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<prependGroupId>true</prependGroupId>
<includeGroupIds>org.mortbay.jasper,org.eclipse.jdt</includeGroupIds>
<includeArtifactIds>apache-jsp,apache-el,ecj</includeArtifactIds>
<includeTypes>jar</includeTypes>
<classifier>sources</classifier>
<outputDirectory>${source-assembly-directory}/lib/ee8-apache-jsp</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-ee8-jsp-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<prependGroupId>true</prependGroupId>
<includeGroupIds>org.mortbay.jasper,org.eclipse.jdt</includeGroupIds>
<includeArtifactIds>apache-jsp,apache-el,ecj</includeArtifactIds>
<includeTypes>jar</includeTypes>
<outputDirectory>${assembly-directory}/lib/ee8-apache-jsp</outputDirectory>
</configuration>
</execution>
<!-- <execution>-->
<!-- <id>copy-ee8-jstl-src-deps</id>-->
<!-- <phase>generate-resources</phase>-->
<!-- <goals>-->
<!-- <goal>copy-dependencies</goal>-->
<!-- </goals>-->
<!-- <configuration>-->
<!-- <prependGroupId>true</prependGroupId>-->
<!-- <includeGroupIds>jakarta.servlet.jsp.jstl,org.glassfish.web</includeGroupIds>-->
<!-- <includeArtifactIds>jakarta.servlet.jsp.jstl-api,jakarta.servlet.jsp.jstl</includeArtifactIds>-->
<!-- <includeTypes>jar</includeTypes>-->
<!-- <classifier>sources</classifier>-->
<!-- <outputDirectory>${source-assembly-directory}/lib/ee8-glassfish-jstl</outputDirectory>-->
<!-- </configuration>-->
<!-- </execution>-->
<!-- <execution>-->
<!-- <id>copy-ee8-jstl-deps</id>-->
<!-- <phase>generate-resources</phase>-->
<!-- <goals>-->
<!-- <goal>copy-dependencies</goal>-->
<!-- </goals>-->
<!-- <configuration>-->
<!-- <prependGroupId>true</prependGroupId>-->
<!-- <includeGroupIds>jakarta.servlet.jsp.jstl,org.glassfish.web</includeGroupIds>-->
<!-- <includeArtifactIds>jakarta.servlet.jsp.jstl-api,jakarta.servlet.jsp.jstl</includeArtifactIds>-->
<!-- <includeTypes>jar</includeTypes>-->
<!-- <outputDirectory>${assembly-directory}/lib/ee8-glassfish-jstl</outputDirectory>-->
<!-- </configuration>-->
<!-- </execution>-->
<!-- <execution>-->
<!-- <id>copy-ee8-jaspi-deps</id>-->
<!-- <phase>generate-resources</phase>-->
<!-- <goals>-->
<!-- <goal>copy-dependencies</goal>-->
<!-- </goals>-->
<!-- <configuration>-->
<!-- <includeGroupIds>jakarta.authentication</includeGroupIds>-->
<!-- <includeArtifactIds>jakarta.authentication-api</includeArtifactIds>-->
<!-- <includeTypes>jar</includeTypes>-->
<!-- <outputDirectory>${assembly-directory}/lib/ee8-jaspi</outputDirectory>-->
<!-- </configuration>-->
<!-- </execution>-->
<!-- <execution>-->
<!-- <id>copy-ee8-jaspi-src-deps</id>-->
<!-- <phase>generate-resources</phase>-->
<!-- <goals>-->
<!-- <goal>copy-dependencies</goal>-->
<!-- </goals>-->
<!-- <configuration>-->
<!-- <includeGroupIds>jakarta.authentication</includeGroupIds>-->
<!-- <includeArtifactIds>jakarta.authentication-api</includeArtifactIds>-->
<!-- <includeTypes>jar</includeTypes>-->
<!-- <classifier>sources</classifier>-->
<!-- <outputDirectory>${source-assembly-directory}/lib/ee8-jaspi</outputDirectory>-->
<!-- </configuration>-->
<!-- </execution>-->
<execution>
<id>copy-ee8-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>org.eclipse.jetty.ee8</includeGroupIds>
<excludeArtifactIds>websocket-core-client,websocket-core-common,websocket-core-server</excludeArtifactIds>
<excludeGroupIds>org.eclipse.jetty.ee8.demos,org.eclipse.jetty.ee8.websocket</excludeGroupIds>
<includeTypes>jar</includeTypes>
<outputDirectory>${assembly-directory}/lib</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-ee8-src-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>org.eclipse.jetty.ee8</includeGroupIds>
<includeTypes>jar</includeTypes>
<excludeGroupIds>org.eclipse.jetty.ee8.demos,org.eclipse.jetty.ee8.websocket</excludeGroupIds>
<classifier>sources</classifier>
<outputDirectory>${source-assembly-directory}/lib</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<tarLongFileMode>posix</tarLongFileMode>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
<executions>
<execution>
<id>binary</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>src/main/assembly/jetty-assembly.xml</descriptor>
</descriptors>
</configuration>
</execution>
<execution>
<id>sources</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>src/main/assembly/jetty-source-assembly.xml</descriptor>
</descriptors>
<appendAssemblyId>true</appendAssemblyId>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.eclipse.jetty.ee8</groupId>
<artifactId>jetty-ee8-bom</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-tree</artifactId>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-analysis</artifactId>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee8</groupId>-->
<!-- <artifactId>jetty-ee8-quickstart</artifactId>-->
<!-- </dependency>-->
<dependency>
<groupId>org.eclipse.jetty.ee8</groupId>
<artifactId>jetty-ee8-servlet</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee8</groupId>
<artifactId>jetty-ee8-servlets</artifactId>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee8.websocket</groupId>-->
<!-- <artifactId>jetty-ee8-websocket-servlet</artifactId>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee8.websocket</groupId>-->
<!-- <artifactId>jetty-ee8-websocket-jetty-server</artifactId>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee8.websocket</groupId>-->
<!-- <artifactId>jetty-ee8-websocket-jetty-client</artifactId>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee8.websocket</groupId>-->
<!-- <artifactId>jetty-ee8-websocket-jakarta-server</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>-->
<!-- <exclusions>-->
<!-- <exclusion>-->
<!-- <groupId>javax.el</groupId>-->
<!-- <artifactId>el-api</artifactId>-->
<!-- </exclusion>-->
<!-- <exclusion>-->
<!-- <groupId>jakarta.el</groupId>-->
<!-- <artifactId>jakarta.el-api</artifactId>-->
<!-- </exclusion>-->
<!-- </exclusions>-->
<!-- </dependency>-->
<dependency>
<groupId>org.eclipse.jetty.ee8</groupId>
<artifactId>jetty-ee8-plus</artifactId>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee8</groupId>-->
<!-- <artifactId>jetty-ee8-proxy</artifactId>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee8</groupId>-->
<!-- <artifactId>jetty-ee8-cdi</artifactId>-->
<!-- <optional>true</optional>-->
<!-- </dependency>-->
<dependency>
<groupId>org.eclipse.jetty.ee8</groupId>
<artifactId>jetty-ee8-jaas</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee8</groupId>
<artifactId>jetty-ee8-annotations</artifactId>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee8</groupId>-->
<!-- <artifactId>jetty-ee8-openid</artifactId>-->
<!-- <optional>true</optional>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee8</groupId>-->
<!-- <artifactId>jetty-ee8-jaspi</artifactId>-->
<!-- <optional>true</optional>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee8</groupId>-->
<!-- <artifactId>jetty-ee8-jndi</artifactId>-->
<!-- <optional>true</optional>-->
<!-- </dependency>-->
<!-- Demo ee8 Apps -->
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee8.demos</groupId>-->
<!-- <artifactId>jetty-ee8-demo-mock-resources</artifactId>-->
<!-- <version>${project.version}</version>-->
<!-- <classifier>config</classifier>-->
<!-- <type>jar</type>-->
<!-- <optional>true</optional>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee8.demos</groupId>-->
<!-- <artifactId>jetty-ee8-demo-jetty-webapp</artifactId>-->
<!-- <version>${project.version}</version>-->
<!-- <classifier>config</classifier>-->
<!-- <type>jar</type>-->
<!-- <optional>true</optional>-->
<!-- <exclusions>-->
<!-- <exclusion>-->
<!-- <groupId>javax.el</groupId>-->
<!-- <artifactId>el-api</artifactId>-->
<!-- </exclusion>-->
<!-- </exclusions>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee8.demos</groupId>-->
<!-- <artifactId>jetty-ee8-demo-jaas-webapp</artifactId>-->
<!-- <version>${project.version}</version>-->
<!-- <classifier>config</classifier>-->
<!-- <type>jar</type>-->
<!-- <optional>true</optional>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee8.demos</groupId>-->
<!-- <artifactId>jetty-ee8-demo-jndi-webapp</artifactId>-->
<!-- <version>${project.version}</version>-->
<!-- <classifier>config</classifier>-->
<!-- <type>jar</type>-->
<!-- <optional>true</optional>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee8.demos</groupId>-->
<!-- <artifactId>jetty-ee8-demo-spec-webapp</artifactId>-->
<!-- <version>${project.version}</version>-->
<!-- <classifier>config</classifier>-->
<!-- <type>jar</type>-->
<!-- <optional>true</optional>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee8.demos</groupId>-->
<!-- <artifactId>jetty-ee8-demo-async-rest-webapp</artifactId>-->
<!-- <version>${project.version}</version>-->
<!-- <classifier>config</classifier>-->
<!-- <type>jar</type>-->
<!-- <optional>true</optional>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee8.demos</groupId>-->
<!-- <artifactId>jetty-ee8-demo-proxy-webapp</artifactId>-->
<!-- <version>${project.version}</version>-->
<!-- <classifier>config</classifier>-->
<!-- <type>jar</type>-->
<!-- <optional>true</optional>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee8.demos</groupId>-->
<!-- <artifactId>jetty-ee8-demo-simple-webapp</artifactId>-->
<!-- <version>${project.version}</version>-->
<!-- <classifier>config</classifier>-->
<!-- <type>jar</type>-->
<!-- <optional>true</optional>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.eclipse.jetty.ee8.demos</groupId>-->
<!-- <artifactId>jetty-ee8-demo-jsp-webapp</artifactId>-->
<!-- <version>${project.version}</version>-->
<!-- <classifier>config</classifier>-->
<!-- <type>jar</type>-->
<!-- <optional>true</optional>-->
<!-- </dependency>-->
</dependencies>
</project>

View File

@ -0,0 +1,20 @@
<assembly>
<id>binary-assembly</id>
<formats>
<format>tar.gz</format>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>${assembly-directory}</directory>
<outputDirectory></outputDirectory>
<includes>
<include>**</include>
</includes>
<excludes>
<exclude>**/META-INF/**</exclude>
</excludes>
</fileSet>
</fileSets>
</assembly>

View File

@ -0,0 +1,17 @@
<assembly>
<id>sources</id>
<formats>
<format>tar.gz</format>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>${source-assembly-directory}</directory>
<outputDirectory></outputDirectory>
<includes>
<include>**</include>
</includes>
</fileSet>
</fileSets>
</assembly>

View File

@ -12,6 +12,6 @@ sessions
# FIXME should servlet api version be interpolated
[lib]
lib/jetty-jakarta-servlet-api-4.0.4.jar
lib/jetty-servlet-api-4.0.4.jar
lib/jetty-ee8-nested-${jetty.version}.jar
lib/jetty-ee8-servlet-${jetty.version}.jar

View File

@ -34,6 +34,7 @@
<module>jetty-ee8-annotations</module>
<module>jetty-ee8-websocket</module>
<module>jetty-ee8-bom</module>
<module>jetty-ee8-home</module>
</modules>
<build>
@ -225,5 +226,4 @@
</dependency>
</dependencies>
</dependencyManagement>
</project>

View File

@ -285,6 +285,12 @@
<version>${project.version}</version>
<type>zip</type>
</artifactItem>
<artifactItem>
<groupId>org.eclipse.jetty.ee8</groupId>
<artifactId>jetty-ee8-home</artifactId>
<version>${project.version}</version>
<type>zip</type>
</artifactItem>
</artifactItems>
<outputDirectory>${assembly-directory}</outputDirectory>
</configuration>
@ -417,6 +423,7 @@
<exclude>jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api</exclude>
<exclude>org.glassfish.web:jakarta.servlet.jsp.jstl</exclude>
<exclude>org.mortbay.jasper:apache-jsp</exclude>
<exclude>jakarta.transaction:jakarta.transaction-api</exclude>
</excludes>
</requireUpperBoundDeps>
</rules>
@ -429,6 +436,13 @@
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.eclipse.jetty.ee8</groupId>
<artifactId>jetty-ee8-bom</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee9</groupId>
<artifactId>jetty-ee9-bom</artifactId>
@ -517,6 +531,12 @@
<version>${project.version}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee8</groupId>
<artifactId>jetty-ee8-home</artifactId>
<version>${project.version}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-client</artifactId>