diff options
Diffstat (limited to 'jetty-distribution/pom.xml')
| -rw-r--r-- | jetty-distribution/pom.xml | 194 |
1 files changed, 68 insertions, 126 deletions
diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml index c1eabd99fa..f106ee4fe3 100644 --- a/jetty-distribution/pom.xml +++ b/jetty-distribution/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>9.2.15-SNAPSHOT</version> + <version>9.3.7-SNAPSHOT</version> </parent> <artifactId>jetty-distribution</artifactId> <name>Jetty :: Distribution Assemblies</name> @@ -11,7 +11,7 @@ <packaging>pom</packaging> <properties> <assembly-directory>${basedir}/target/distribution</assembly-directory> - <jetty-setuid-version>1.0.1</jetty-setuid-version> + <jetty-setuid-version>1.0.3</jetty-setuid-version> </properties> <build> <plugins> @@ -53,6 +53,18 @@ </tasks> </configuration> </execution> + <execution> + <id>removeKeystore</id> + <phase>process-resources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <delete file="${assembly-directory}/etc/keystore" /> + </tasks> + </configuration> + </execution> </executions> </plugin> <plugin> @@ -206,28 +218,6 @@ </execution> <execution> - <id>unpack-setuid-config</id> - <phase>process-resources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.eclipse.jetty.toolchain.setuid</groupId> - <artifactId>jetty-setuid-java</artifactId> - <version>${jetty-setuid-version}</version> - <classifier>config</classifier> - <type>jar</type> - <overWrite>true</overWrite> - <outputDirectory>${assembly-directory}</outputDirectory> - </artifactItem> - </artifactItems> - <excludes>META-INF/**</excludes> - </configuration> - </execution> - - <execution> <id>unpack-test-jaas-config</id> <phase>process-resources</phase> <goals> @@ -301,8 +291,8 @@ </goals> <configuration> <includeGroupIds>org.eclipse.jetty</includeGroupIds> - <excludeGroupIds>org.eclipse.jetty.orbit,org.eclipse.jetty.spdy,org.eclipse.jetty.websocket,org.eclipse.jetty.fcgi,org.eclipse.jetty.toolchain,org.apache.taglibs</excludeGroupIds> - <excludeArtifactIds>jetty-all,jetty-jsp,apache-jsp,apache-jstl,jetty-start,jetty-monitor,jetty-spring</excludeArtifactIds> + <excludeGroupIds>org.eclipse.jetty.orbit,org.eclipse.jetty.http2,org.eclipse.jetty.websocket,org.eclipse.jetty.fcgi,org.eclipse.jetty.toolchain,org.apache.taglibs</excludeGroupIds> + <excludeArtifactIds>jetty-all,apache-jsp,apache-jstl,jetty-start,jetty-monitor,jetty-spring</excludeArtifactIds> <includeTypes>jar</includeTypes> <outputDirectory>${assembly-directory}/lib</outputDirectory> </configuration> @@ -321,6 +311,19 @@ </configuration> </execution> <execution> + <id>copy-lib-http2-deps</id> + <phase>generate-resources</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <includeGroupIds>org.eclipse.jetty.http2</includeGroupIds> + <includeArtifactIds>http2-hpack,http2-common,http2-server</includeArtifactIds> + <includeTypes>jar</includeTypes> + <outputDirectory>${assembly-directory}/lib/http2</outputDirectory> + </configuration> + </execution> + <execution> <id>copy-lib-fcgi-deps</id> <phase>generate-resources</phase> <goals> @@ -392,32 +395,6 @@ </configuration> </execution> <execution> - <id>unpack-spdy</id> - <phase>process-resources</phase> - <goals> - <goal>unpack-dependencies</goal> - </goals> - <configuration> - <includeGroupIds>org.eclipse.jetty.spdy</includeGroupIds> - <classifier>config</classifier> - <failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact> - <excludes>META-INF/**</excludes> - <outputDirectory>${assembly-directory}</outputDirectory> - </configuration> - </execution> - <execution> - <id>copy-lib-spdy-deps</id> - <phase>process-resources</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <includeGroupIds>org.eclipse.jetty.spdy</includeGroupIds> - <includeTypes>jar</includeTypes> - <outputDirectory>${assembly-directory}/lib/spdy</outputDirectory> - </configuration> - </execution> - <execution> <id>copy-annotations-deps</id> <phase>generate-resources</phase> <goals> @@ -458,27 +435,14 @@ </configuration> </execution> <execution> - <id>copy-glassfish-jsp-deps</id> - <phase>generate-resources</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <includeGroupIds>org.eclipse.jetty.orbit,org.glassfish.web, org.glassfish, javax.el, javax.servlet.jsp, org.eclipse.jetty.toolchain, org.eclipse.jetty</includeGroupIds> - <includeArtifactIds>org.eclipse.jdt.core, javax.servlet.jsp-api, javax.servlet.jsp, jetty-jsp-jdt, javax.el-api, javax.el, jetty-jsp</includeArtifactIds> - <includeTypes>jar</includeTypes> - <outputDirectory>${assembly-directory}/lib/jsp</outputDirectory> - </configuration> - </execution> - <execution> <id>copy-apache-jsp-deps</id> <phase>generate-resources</phase> <goals> <goal>copy-dependencies</goal> </goals> <configuration> - <includeGroupIds>org.eclipse.jetty,org.eclipse.jetty.toolchain,org.mortbay.jasper,org.eclipse.jetty.orbit</includeGroupIds> - <includeArtifactIds>apache-jsp,apache-el,org.eclipse.jdt.core</includeArtifactIds> + <includeGroupIds>org.eclipse.jetty,org.eclipse.jetty.toolchain,org.mortbay.jasper,org.eclipse.jetty.orbit,org.eclipse.jdt.core.compiler</includeGroupIds> + <includeArtifactIds>apache-jsp,apache-el,ecj</includeArtifactIds> <includeTypes>jar</includeTypes> <prependGroupId>true</prependGroupId> <outputDirectory>${assembly-directory}/lib/apache-jsp</outputDirectory> @@ -499,19 +463,6 @@ </configuration> </execution> <execution> - <id>copy-jstl-impl</id> - <phase>generate-resources</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <includeGroupIds>org.glassfish.web</includeGroupIds> - <includeArtifactIds>javax.servlet.jsp.jstl</includeArtifactIds> - <includeTypes>jar</includeTypes> - <outputDirectory>${assembly-directory}/lib/jsp</outputDirectory> - </configuration> - </execution> - <execution> <id>copy-apache-jstl-deps</id> <phase>generate-resources</phase> <goals> @@ -566,7 +517,22 @@ <arguments> <argument>jetty.home=${assembly-directory}</argument> <argument>jetty.base=${assembly-directory}</argument> - <argument>--add-to-start=server,deploy,websocket,ext,resources,jsp,jstl,http</argument> + <argument>--add-to-start=deploy,websocket,ext,resources,jsp,jstl,http</argument> + </arguments> + </configuration> + <goals> + <goal>java</goal> + </goals> + </execution> + <execution> + <id>setup demo-base-ini</id> + <phase>process-classes</phase> + <configuration> + <mainClass>org.eclipse.jetty.start.Main</mainClass> + <arguments> + <argument>jetty.home=${assembly-directory}</argument> + <argument>jetty.base=${assembly-directory}/demo-base</argument> + <argument>--add-to-start=continuation,deploy,websocket,ext,resources,client,annotations,jndi,servlets</argument> </arguments> </configuration> <goals> @@ -574,14 +540,13 @@ </goals> </execution> <execution> - <id>setup demo-base</id> + <id>setup demo-base-startd</id> <phase>process-classes</phase> <configuration> <mainClass>org.eclipse.jetty.start.Main</mainClass> <arguments> <argument>jetty.home=${assembly-directory}</argument> <argument>jetty.base=${assembly-directory}/demo-base</argument> - <argument>--add-to-start=server,continuation,deploy,websocket,ext,resources,client,annotations,jndi,servlets</argument> <argument>--add-to-startd=jsp,jstl,http,https</argument> </arguments> </configuration> @@ -649,28 +614,6 @@ </dependency> <dependency> - <groupId>org.glassfish.web</groupId> - <artifactId>javax.servlet.jsp.jstl</artifactId> - </dependency> - - <dependency> - <groupId>org.glassfish.web</groupId> - <artifactId>javax.servlet.jsp</artifactId> - </dependency> - <dependency> - <groupId>org.eclipse.jetty.toolchain</groupId> - <artifactId>jetty-jsp-jdt</artifactId> - </dependency> - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>javax.servlet.jsp-api</artifactId> - </dependency> - <dependency> - <groupId>org.glassfish</groupId> - <artifactId>javax.el</artifactId> - </dependency> - - <dependency> <groupId>org.ow2.asm</groupId> <artifactId>asm</artifactId> </dependency> @@ -739,11 +682,6 @@ </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-jsp</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> <artifactId>apache-jsp</artifactId> <version>${project.version}</version> </dependency> @@ -790,8 +728,13 @@ </dependency> --> <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-cdi</artifactId> + <groupId>org.eclipse.jetty.cdi</groupId> + <artifactId>cdi-servlet</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.cdi</groupId> + <artifactId>cdi-websocket</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -810,40 +753,39 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.eclipse.jetty.spdy</groupId> - <artifactId>spdy-core</artifactId> + <groupId>org.eclipse.jetty.http2</groupId> + <artifactId>http2-server</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.eclipse.jetty.spdy</groupId> - <artifactId>spdy-server</artifactId> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-alpn-server</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.eclipse.jetty.spdy</groupId> - <artifactId>spdy-http-server</artifactId> + <groupId>org.eclipse.jetty.example-async-rest</groupId> + <artifactId>example-async-rest-webapp</artifactId> <version>${project.version}</version> + <type>war</type> </dependency> <dependency> - <groupId>org.eclipse.jetty.spdy</groupId> - <artifactId>spdy-example-webapp</artifactId> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-jaspi</artifactId> <version>${project.version}</version> - <type>war</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-alpn-server</artifactId> + <artifactId>jetty-infinispan</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.eclipse.jetty.example-async-rest</groupId> - <artifactId>example-async-rest-webapp</artifactId> + <groupId>org.eclipse.jetty.gcloud</groupId> + <artifactId>gcloud-session-manager</artifactId> <version>${project.version}</version> - <type>war</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-jaspi</artifactId> + <artifactId>jetty-nosql</artifactId> <version>${project.version}</version> </dependency> </dependencies> |