jetty.project/jetty-home/pom.xml

892 lines
34 KiB
XML
Raw Normal View History

<?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>
<artifactId>jetty-project</artifactId>
<groupId>org.eclipse.jetty</groupId>
2023-12-15 15:49:33 -05:00
<version>10.0.20-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-home</artifactId>
<name>Jetty :: Home Assembly</name>
<packaging>pom</packaging>
<properties>
<assembly-directory>${basedir}/target/jetty-home</assembly-directory>
<source-assembly-directory>${basedir}/target/jetty-home-sources</source-assembly-directory>
<jetty-setuid-version>1.0.4</jetty-setuid-version>
Jetty 9.4.x optimize parser warning from logs and add spotbug (#5735) * enable spotbugs in CI Signed-off-by: olivier lamy <oliver.lamy@gmail.com> record issues Signed-off-by: olivier lamy <oliver.lamy@gmail.com> use warning new generation Signed-off-by: olivier lamy <oliver.lamy@gmail.com> activate errorprone Signed-off-by: olivier lamy <oliver.lamy@gmail.com> fix Jenkinsfile Signed-off-by: olivier lamy <oliver.lamy@gmail.com> do not run spotbugs for jetty-runner as we do not want to fix all dependencies bugs :) Signed-off-by: olivier lamy <oliver.lamy@gmail.com> junit should allow empty results Signed-off-by: olivier lamy <oliver.lamy@gmail.com> maven console can be use only once... Signed-off-by: olivier lamy <oliver.lamy@gmail.com> one liner Signed-off-by: olivier lamy <oliver.lamy@gmail.com> recordissues only once Signed-off-by: olivier lamy <oliver.lamy@gmail.com> force id Signed-off-by: olivier lamy <oliver.lamy@gmail.com> aggregate results Signed-off-by: olivier lamy <oliver.lamy@gmail.com> configure a name for aggregated reports Signed-off-by: olivier lamy <oliver.lamy@gmail.com> mo more -T3 no need anymore of remote session test profile Signed-off-by: olivier lamy <oliver.lamy@gmail.com> I want to see what failing tests look like with new report. Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com> skip spotbugs for jetty-jmh Signed-off-by: olivier lamy <oliver.lamy@gmail.com> get rid of findbugs as we now have spotbugs Signed-off-by: olivier lamy <oliver.lamy@gmail.com> Revert "I want to see what failing tests look like with new report." This reverts commit df0d13e4c53d7461872e1f925ec06bd36e4a66c9. activate errorProne parser Signed-off-by: olivier lamy <oliver.lamy@gmail.com> make pmd quiet for CI Signed-off-by: olivier lamy <oliver.lamy@gmail.com> remove -fae flag and do not display transfer progress Signed-off-by: olivier lamy <oliver.lamy@gmail.com> try junitParser() to see what it does Signed-off-by: olivier lamy <oliver.lamy@gmail.com> junit parser is a bad idea... Signed-off-by: olivier lamy <oliver.lamy@gmail.com> increase timeout Signed-off-by: olivier lamy <oliver.lamy@gmail.com> no -T2 for javadoc Signed-off-by: olivier lamy <oliver.lamy@gmail.com> fix skip spotbugs and pmd verbose Signed-off-by: olivier lamy <oliver.lamy@gmail.com> * remove -T options Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-10 20:47:26 -05:00
<spotbugs.skip>true</spotbugs.skip>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-base-assembly-tree</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<useBuildFilters>false</useBuildFilters>
<includeEmptyDirs>true</includeEmptyDirs>
<outputDirectory>${assembly-directory}</outputDirectory>
<encoding>UTF-8</encoding>
<useDefaultDelimiters>false</useDefaultDelimiters>
<delimiters>
<delimiter>@</delimiter>
</delimiters>
<resources>
<resource>
<directory>${basedir}/src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
2022-11-14 16:51:27 -05:00
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>copy</id>
<phase>generate-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>${project.version}</version>
<classifier>version</classifier>
<type>txt</type>
<overWrite>true</overWrite>
<outputDirectory>${assembly-directory}/</outputDirectory>
<destFileName>VERSION.txt</destFileName>
</artifactItem>
<artifactItem>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-start</artifactId>
<version>${project.version}</version>
<classifier>shaded</classifier>
<type>jar</type>
<overWrite>true</overWrite>
<includes>**</includes>
<outputDirectory>${assembly-directory}</outputDirectory>
<destFileName>start.jar</destFileName>
</artifactItem>
</artifactItems>
</configuration>
</execution>
<execution>
<id>copy-setuid-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.eclipse.jetty.toolchain.setuid</groupId>
<artifactId>jetty-setuid-java</artifactId>
<version>${jetty-setuid-version}</version>
<type>jar</type>
<overWrite>true</overWrite>
<outputDirectory>${assembly-directory}/lib/setuid</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.eclipse.jetty.toolchain.setuid</groupId>
<artifactId>libsetuid-linux</artifactId>
<version>${jetty-setuid-version}</version>
<type>so</type>
<overWrite>true</overWrite>
<outputDirectory>${assembly-directory}/lib/setuid</outputDirectory>
<destFileName>libsetuid-linux.so</destFileName>
</artifactItem>
<artifactItem>
<groupId>org.eclipse.jetty.toolchain.setuid</groupId>
<artifactId>libsetuid-osx</artifactId>
<version>${jetty-setuid-version}</version>
<type>so</type>
<overWrite>true</overWrite>
<outputDirectory>${assembly-directory}/lib/setuid</outputDirectory>
<destFileName>libsetuid-osx.so</destFileName>
</artifactItem>
</artifactItems>
</configuration>
</execution>
<execution>
<id>copy-lib-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>jakarta.transaction,org.eclipse.jetty</includeGroupIds>
<excludeGroupIds>
org.eclipse.jetty.demo,org.eclipse.jetty.orbit,org.eclipse.jetty.http2,org.eclipse.jetty.http3,org.eclipse.jetty.quic,org.eclipse.jetty.websocket,org.eclipse.jetty.fcgi,org.eclipse.jetty.toolchain,org.apache.taglibs
</excludeGroupIds>
<excludeArtifactIds>
2022-12-05 16:47:43 -05:00
apache-jsp,apache-jstl,jetty-start,jetty-slf4j-impl,javadoc
</excludeArtifactIds>
<includeTypes>jar</includeTypes>
<outputDirectory>${assembly-directory}/lib</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-lib-src-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>jakarta.transaction,org.eclipse.jetty</includeGroupIds>
<excludeGroupIds>
org.eclipse.jetty.orbit,org.eclipse.jetty.http2,org.eclipse.jetty.http3,org.eclipse.jetty.quic,org.eclipse.jetty.websocket,org.eclipse.jetty.fcgi,org.eclipse.jetty.toolchain,org.apache.taglibs
</excludeGroupIds>
<excludeArtifactIds>
apache-jsp,apache-jstl,jetty-start
</excludeArtifactIds>
<includeTypes>jar</includeTypes>
<classifier>sources</classifier>
<outputDirectory>${source-assembly-directory}/lib</outputDirectory>
</configuration>
</execution>
Issue #4572 - Replace Jetty Logging with SLF4J * Introducing jetty-slf4j-impl * Make Jetty use org.slf4j * Removed most of org.eclipse.jetty.util.log classes * Left org.eclipse.jetty.util.log.Log and org.eclipse.jetty.util.log.Logger but as simple bridge classes that are deprecated * Migrated code using org.eclipse.jetty.util.log.StacklessLogging to org.eclipse.jetty.logging.StacklessLogging found in the jetty-slf4j-impl * Moved logging start modules from jetty-util to jetty-home * Simplified logging start modules * Updated code that was using StdErrLog directly * Updating module-info.java for org.slf4j * removing org.eclipse.jetty.util.log.class references * jetty-start supports manually declared default provider + and we use it to default "logging" to the "logging-jetty" provider * Cleaning up jetty-maven-plugin and IT testing for Logging * Using old slf4j for it testing * Updating compiler config to show Xlint:exports warnings * Updating console-capture and logging-noop * Adding slf4j bridge (capture) jetty modules * Updates to jetty logging module locations * Changing reference to slf4j dependent mod * Process requested enabled modules in topological order * Limiting inclusions in shaded jetty-start + Also adding note to jetty-util classes that are used by jetty-start * Default logging level on baseline logging config is INFO (not DEBUG) * Changing from system to server classes in logging * Updating other modules to use new logging names Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-02-24 14:20:51 -05:00
<execution>
<id>copy-lib-logging-deps</id>
<phase>generate-resources</phase>
Issue #4572 - Replace Jetty Logging with SLF4J * Introducing jetty-slf4j-impl * Make Jetty use org.slf4j * Removed most of org.eclipse.jetty.util.log classes * Left org.eclipse.jetty.util.log.Log and org.eclipse.jetty.util.log.Logger but as simple bridge classes that are deprecated * Migrated code using org.eclipse.jetty.util.log.StacklessLogging to org.eclipse.jetty.logging.StacklessLogging found in the jetty-slf4j-impl * Moved logging start modules from jetty-util to jetty-home * Simplified logging start modules * Updated code that was using StdErrLog directly * Updating module-info.java for org.slf4j * removing org.eclipse.jetty.util.log.class references * jetty-start supports manually declared default provider + and we use it to default "logging" to the "logging-jetty" provider * Cleaning up jetty-maven-plugin and IT testing for Logging * Using old slf4j for it testing * Updating compiler config to show Xlint:exports warnings * Updating console-capture and logging-noop * Adding slf4j bridge (capture) jetty modules * Updates to jetty logging module locations * Changing reference to slf4j dependent mod * Process requested enabled modules in topological order * Limiting inclusions in shaded jetty-start + Also adding note to jetty-util classes that are used by jetty-start * Default logging level on baseline logging config is INFO (not DEBUG) * Changing from system to server classes in logging * Updating other modules to use new logging names Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-02-24 14:20:51 -05:00
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>org.eclipse.jetty,org.slf4j</includeGroupIds>
<includeArtifactIds>jetty-slf4j-impl,slf4j-api</includeArtifactIds>
<includeTypes>jar</includeTypes>
<outputDirectory>${assembly-directory}/lib/logging</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-lib-logging-src-deps</id>
<phase>generate-resources</phase>
Issue #4572 - Replace Jetty Logging with SLF4J * Introducing jetty-slf4j-impl * Make Jetty use org.slf4j * Removed most of org.eclipse.jetty.util.log classes * Left org.eclipse.jetty.util.log.Log and org.eclipse.jetty.util.log.Logger but as simple bridge classes that are deprecated * Migrated code using org.eclipse.jetty.util.log.StacklessLogging to org.eclipse.jetty.logging.StacklessLogging found in the jetty-slf4j-impl * Moved logging start modules from jetty-util to jetty-home * Simplified logging start modules * Updated code that was using StdErrLog directly * Updating module-info.java for org.slf4j * removing org.eclipse.jetty.util.log.class references * jetty-start supports manually declared default provider + and we use it to default "logging" to the "logging-jetty" provider * Cleaning up jetty-maven-plugin and IT testing for Logging * Using old slf4j for it testing * Updating compiler config to show Xlint:exports warnings * Updating console-capture and logging-noop * Adding slf4j bridge (capture) jetty modules * Updates to jetty logging module locations * Changing reference to slf4j dependent mod * Process requested enabled modules in topological order * Limiting inclusions in shaded jetty-start + Also adding note to jetty-util classes that are used by jetty-start * Default logging level on baseline logging config is INFO (not DEBUG) * Changing from system to server classes in logging * Updating other modules to use new logging names Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-02-24 14:20:51 -05:00
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>org.eclipse.jetty,org.slf4j</includeGroupIds>
<includeArtifactIds>jetty-slf4j-impl,slf4j-api</includeArtifactIds>
<includeTypes>jar</includeTypes>
<classifier>sources</classifier>
<outputDirectory>${source-assembly-directory}/lib/logging</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-lib-websocket-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>org.eclipse.jetty.websocket</includeGroupIds>
<includeTypes>jar</includeTypes>
<outputDirectory>${assembly-directory}/lib/websocket</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-lib-websocket-src-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>org.eclipse.jetty.websocket</includeGroupIds>
<includeTypes>jar</includeTypes>
<classifier>sources</classifier>
<outputDirectory>${source-assembly-directory}/lib/websocket</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-lib-javax-websocket-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>org.eclipse.jetty.toolchain</includeGroupIds>
<includeArtifactIds>jetty-javax-websocket-api</includeArtifactIds>
<includeTypes>jar</includeTypes>
<outputDirectory>${assembly-directory}/lib/websocket</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-lib-javax-websocket-src-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>org.eclipse.jetty.toolchain</includeGroupIds>
<includeArtifactIds>jetty-javax-websocket-api</includeArtifactIds>
<includeTypes>jar</includeTypes>
<classifier>sources</classifier>
<outputDirectory>${source-assembly-directory}/lib/websocket</outputDirectory>
</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-http2-src-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>
<classifier>sources</classifier>
<outputDirectory>${source-assembly-directory}/lib/http2</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-lib-http3-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>org.eclipse.jetty.http3,org.eclipse.jetty.quic,org.eclipse.jetty.quiche</includeGroupIds>
<includeArtifactIds>http3-server,http3-common,http3-qpack,quic-server,quic-common,quic-quiche-common,quic-quiche-jna,quic-quiche-foreign-incubator,jetty-quiche-native</includeArtifactIds>
<includeTypes>jar</includeTypes>
<outputDirectory>${assembly-directory}/lib/http3</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-lib-http3-src-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>org.eclipse.jetty.http3</includeGroupIds>
<includeArtifactIds>http3-server</includeArtifactIds>
<includeTypes>jar</includeTypes>
<classifier>sources</classifier>
<outputDirectory>${source-assembly-directory}/lib/http3</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-lib-fcgi-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>org.eclipse.jetty.fcgi</includeGroupIds>
<includeTypes>jar</includeTypes>
<outputDirectory>${assembly-directory}/lib/fcgi</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-lib-fcgi-src-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>org.eclipse.jetty.fcgi</includeGroupIds>
<includeTypes>jar</includeTypes>
<classifier>sources</classifier>
<outputDirectory>${source-assembly-directory}/lib/fcgi</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-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>
<overWrite>true</overWrite>
<outputDirectory>${assembly-directory}/lib</outputDirectory>
<destFileName>jetty-servlet-api-${jetty.servlet.api.version}.jar</destFileName>
</artifactItem>
</artifactItems>
</configuration>
</execution>
<execution>
<id>copy-servlet-src-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>org.eclipse.jetty.toolchain</includeGroupIds>
<includeTypes>jar</includeTypes>
<classifier>sources</classifier>
<outputDirectory>${source-assembly-directory}/lib/servlet-api</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-annotations-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>jakarta.annotation,org.eclipse.jetty.orbit,org.ow2.asm</includeGroupIds>
<includeArtifactIds>jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis</includeArtifactIds>
<includeTypes>jar</includeTypes>
<outputDirectory>${assembly-directory}/lib/annotations</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-annotations-src-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>jakarta.annotation,org.eclipse.jetty.orbit,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/annotations</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-apache-jsp-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>
2017-10-19 00:08:02 -04:00
org.eclipse.jetty,org.eclipse.jetty.toolchain,org.mortbay.jasper,org.eclipse.jdt
</includeGroupIds>
<includeArtifactIds>apache-jsp,apache-el,ecj</includeArtifactIds>
<includeTypes>jar</includeTypes>
<prependGroupId>true</prependGroupId>
<outputDirectory>${assembly-directory}/lib/apache-jsp</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-apache-jsp-src-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.jdt
</includeGroupIds>
<includeArtifactIds>apache-jsp,apache-el,ecj</includeArtifactIds>
<includeTypes>jar</includeTypes>
<classifier>sources</classifier>
<prependGroupId>true</prependGroupId>
<outputDirectory>${source-assembly-directory}/lib/apache-jsp</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-apache-jstl-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<excludeGroupIds>org.glassfish.web</excludeGroupIds>
<includeArtifactIds>taglibs-standard-spec,taglibs-standard-impl</includeArtifactIds>
<prependGroupId>true</prependGroupId>
<includeTypes>jar</includeTypes>
<outputDirectory>${assembly-directory}/lib/apache-jstl</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-apache-jstl-src-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<excludeGroupIds>org.glassfish.web</excludeGroupIds>
<includeArtifactIds>taglibs-standard-spec,taglibs-standard-impl</includeArtifactIds>
<prependGroupId>true</prependGroupId>
<includeTypes>jar</includeTypes>
<classifier>sources</classifier>
<outputDirectory>${source-assembly-directory}/lib/apache-jstl</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-jaspi-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>jakarta.security.auth.message</includeGroupIds>
<includeArtifactIds>jakarta.security.auth.message-api</includeArtifactIds>
<includeTypes>jar</includeTypes>
<outputDirectory>${assembly-directory}/lib/jaspi</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-jaspi-src-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>jakarta.security.auth.message</includeGroupIds>
<includeArtifactIds>jakarta.security.auth.message-api</includeArtifactIds>
<includeTypes>jar</includeTypes>
<classifier>sources</classifier>
<outputDirectory>${source-assembly-directory}/lib/jaspi</outputDirectory>
</configuration>
</execution>
<execution>
<id>unpack-config-deps</id>
<phase>generate-resources</phase>
<goals>
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>
org.eclipse.jetty, org.eclipse.jetty.websocket, org.eclipse.jetty.demos
</includeGroupIds>
<excludeArtifactIds>infinispan-embedded,infinispan-remote,jetty-test-helper,alpn-api,jakarta.security.auth.message-api,javax.activation</excludeArtifactIds>
<classifier>config</classifier>
<failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
<excludes>META-INF/**,webapps/**,start.d/**,start.ini</excludes>
<outputDirectory>${assembly-directory}</outputDirectory>
</configuration>
</execution>
<execution>
<id>unpack-infinispan-config</id>
<phase>generate-resources</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.eclipse.jetty</groupId>
<artifactId>infinispan-embedded</artifactId>
<version>${project.version}</version>
<classifier>config</classifier>
<type>jar</type>
</artifactItem>
<artifactItem>
<groupId>org.eclipse.jetty</groupId>
<artifactId>infinispan-remote</artifactId>
<version>${project.version}</version>
<classifier>config</classifier>
<type>jar</type>
</artifactItem>
</artifactItems>
<excludes>META-INF/**</excludes>
<outputDirectory>${assembly-directory}</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>set jetty.sh</id>
<phase>process-resources</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<chmod dir="${assembly-directory}/bin" perm="755" includes="**/*.sh" />
</target>
</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>
<overrideUid>0</overrideUid>
<overrideGid>0</overrideGid>
<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>
<dependencies>
<!-- Orbit Deps -->
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.mail.glassfish</artifactId>
</dependency>
<dependency>
<groupId>jakarta.security.auth.message</groupId>
<artifactId>jakarta.security.auth.message-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
</dependency>
<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>
<!-- jetty deps -->
Issue #4572 - Replace Jetty Logging with SLF4J * Introducing jetty-slf4j-impl * Make Jetty use org.slf4j * Removed most of org.eclipse.jetty.util.log classes * Left org.eclipse.jetty.util.log.Log and org.eclipse.jetty.util.log.Logger but as simple bridge classes that are deprecated * Migrated code using org.eclipse.jetty.util.log.StacklessLogging to org.eclipse.jetty.logging.StacklessLogging found in the jetty-slf4j-impl * Moved logging start modules from jetty-util to jetty-home * Simplified logging start modules * Updated code that was using StdErrLog directly * Updating module-info.java for org.slf4j * removing org.eclipse.jetty.util.log.class references * jetty-start supports manually declared default provider + and we use it to default "logging" to the "logging-jetty" provider * Cleaning up jetty-maven-plugin and IT testing for Logging * Using old slf4j for it testing * Updating compiler config to show Xlint:exports warnings * Updating console-capture and logging-noop * Adding slf4j bridge (capture) jetty modules * Updates to jetty logging module locations * Changing reference to slf4j dependent mod * Process requested enabled modules in topological order * Limiting inclusions in shaded jetty-start + Also adding note to jetty-util classes that are used by jetty-start * Default logging level on baseline logging config is INFO (not DEBUG) * Changing from system to server classes in logging * Updating other modules to use new logging names Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-02-24 14:20:51 -05:00
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-slf4j-impl</artifactId>
<scope>test</scope>
Issue #4572 - Replace Jetty Logging with SLF4J * Introducing jetty-slf4j-impl * Make Jetty use org.slf4j * Removed most of org.eclipse.jetty.util.log classes * Left org.eclipse.jetty.util.log.Log and org.eclipse.jetty.util.log.Logger but as simple bridge classes that are deprecated * Migrated code using org.eclipse.jetty.util.log.StacklessLogging to org.eclipse.jetty.logging.StacklessLogging found in the jetty-slf4j-impl * Moved logging start modules from jetty-util to jetty-home * Simplified logging start modules * Updated code that was using StdErrLog directly * Updating module-info.java for org.slf4j * removing org.eclipse.jetty.util.log.class references * jetty-start supports manually declared default provider + and we use it to default "logging" to the "logging-jetty" provider * Cleaning up jetty-maven-plugin and IT testing for Logging * Using old slf4j for it testing * Updating compiler config to show Xlint:exports warnings * Updating console-capture and logging-noop * Adding slf4j bridge (capture) jetty modules * Updates to jetty logging module locations * Changing reference to slf4j dependent mod * Process requested enabled modules in topological order * Limiting inclusions in shaded jetty-start + Also adding note to jetty-util classes that are used by jetty-start * Default logging level on baseline logging config is INFO (not DEBUG) * Changing from system to server classes in logging * Updating other modules to use new logging names Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-02-24 14:20:51 -05:00
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-deploy</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jmx</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-quickstart</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-start</artifactId>
<classifier>shaded</classifier>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlets</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-servlet</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-jetty-server</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-jetty-client</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-javax-server</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>apache-jsp</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>apache-jstl</artifactId>
<exclusions>
<exclusion>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-plus</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-client</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-proxy</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-unixdomain-server</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-unixsocket-server</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.fcgi</groupId>
<artifactId>fcgi-server</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
<optional>true</optional>
</dependency>
<dependency>
Issue #3804 - Update Decorator integration for various CDI implementations (#3838) * Jetty Issue #3804 WELD-2587 Support CDI integration: + cdi2 module exposes jetty APIs + cdi module uses DecorationListener Signed-off-by: Greg Wilkins <gregw@webtide.com> * Jetty Issue #3804 WELD-2587 Remove DecoratingListener tests from test-jetty-webapp Signed-off-by: Greg Wilkins <gregw@webtide.com> * improve CDI test Signed-off-by: Greg Wilkins <gregw@webtide.com> * Jetty Issue #3804 WELD-2587 Reverted test to use released CDI and cdi2 module for now. To test new mechanism, you need to build the weld snapshot locally, rebuild and switch to cdi module Signed-off-by: Greg Wilkins <gregw@webtide.com> * remove cdi2 webapp references Signed-off-by: Greg Wilkins <gregw@webtide.com> * document attribute Signed-off-by: Greg Wilkins <gregw@webtide.com> * improved documentation Signed-off-by: Greg Wilkins <gregw@webtide.com> * logging Signed-off-by: Greg Wilkins <gregw@webtide.com> * improved javadoc Signed-off-by: Greg Wilkins <gregw@webtide.com> * Fixed version Signed-off-by: Greg Wilkins <gregw@webtide.com> * Reverted to also provide the DecoratingListener in the decorate module. Renamed cdi-demo to weld-cdi-demo Signed-off-by: Greg Wilkins <gregw@webtide.com> * revert from Weld SNAPSHOT Signed-off-by: Greg Wilkins <gregw@webtide.com> * test all 3 weld integrations Signed-off-by: Greg Wilkins <gregw@webtide.com> * updated destory implementation to release creationalcontext Signed-off-by: Greg Wilkins <gregw@webtide.com> * reverted to released Weld version Signed-off-by: Greg Wilkins <gregw@webtide.com> * Issue #3804 CDI integration dispose and release context in destroy Signed-off-by: Greg Wilkins <gregw@webtide.com> * Improved CDI module documentation Signed-off-by: Greg Wilkins <gregw@webtide.com> * WIP on OWB Signed-off-by: Greg Wilkins <gregw@webtide.com> * Updates from review Parameterised CDITests Signed-off-by: Greg Wilkins <gregw@webtide.com> * share webapp resources for cdi webapp test Signed-off-by: olivier lamy <oliver.lamy@gmail.com> * Initialize OWB with a SCI so that listeners can be decorated Signed-off-by: Greg Wilkins <gregw@webtide.com> * Added OwbDecorator so that cdi2 module can be tested with OWB Signed-off-by: Greg Wilkins <gregw@webtide.com> * Lookup attribute name Signed-off-by: Greg Wilkins <gregw@webtide.com> * Cleanups Signed-off-by: Greg Wilkins <gregw@webtide.com> * Cleanup from Review Don't do lazy bindings Signed-off-by: Greg Wilkins <gregw@webtide.com> * Cleanup from Review Treat partial CDI same as no CDI Signed-off-by: Greg Wilkins <gregw@webtide.com> * fix maven it test no more need of weld-servlet Signed-off-by: olivier lamy <oliver.lamy@gmail.com> * cleanup it parent pom removing non needed weld servlet Signed-off-by: olivier lamy <oliver.lamy@gmail.com> * upgraded to Weld 3.1.2.Final Signed-off-by: Greg Wilkins <gregw@webtide.com> * Cleanup from Review Signed-off-by: Greg Wilkins <gregw@webtide.com> * Cleanup from Review Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-08-07 22:04:07 -04:00
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-cdi</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jaas</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-rewrite</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-server</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http3</groupId>
<artifactId>http3-server</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-server</artifactId>
</dependency>
Issue #215 Conscrypt module for SSL and ALPN Squash of the following commits: commit 53e503b48d290e2ff83b214fd81572bf4cacd9ab Merge: cc4ed73 d77ba82 Author: Greg Wilkins <gregw@webtide.com> Date: Thu Sep 21 07:27:45 2017 +1000 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-215-conscrypt-alpn commit cc4ed73ae45e69addbb31221a860dd0984d92ac5 Author: Greg Wilkins <gregw@webtide.com> Date: Thu Sep 21 07:26:45 2017 +1000 Issue #215 Conscrypt module debug commit f640693f7ef61f8012d1454b2ed364740b330a6e Author: Simone Bordet <simone.bordet@gmail.com> Date: Wed Sep 20 18:23:51 2017 +0200 Issue #215 - Consider native ALPN/SSL provider. Fixed server-side ALPN negotiation for Conscrypt. commit 669e992624a0f8f23103c70ba895b877dcec2404 Author: Simone Bordet <simone.bordet@gmail.com> Date: Wed Sep 20 16:56:20 2017 +0200 Issue #215 - Consider native ALPN/SSL provider. Fixed client-side ALPN negotiation for Conscrypt. commit aa873263d73c19461890bd1f9a417c796412b3d2 Author: Simone Bordet <simone.bordet@gmail.com> Date: Wed Sep 20 15:26:45 2017 +0200 Issue #215 - Consider native ALPN/SSL provider. Code cleanups. Changed ALPNProcessor.init(boolean) to init(). Removed unnecessary try/catches and simplified exception handling. commit db9b169c35da956bcc42013f9bb8acddd7238d14 Author: Greg Wilkins <gregw@webtide.com> Date: Wed Sep 20 18:07:30 2017 +1000 Issue #215 Conscrypt SSL pom cleanups commit 096572e029352428275e86a964fa92dbeee19a65 Author: Greg Wilkins <gregw@webtide.com> Date: Wed Sep 20 15:57:20 2017 +1000 Issue #215 Conscrypt SSL ALPN cleanups commit b3c1bcb1fa9a7e15517a348270738e24c7b0a820 Merge: c836708 effec06 Author: Greg Wilkins <gregw@webtide.com> Date: Wed Sep 20 15:46:13 2017 +1000 Merge branch 'jetty-9.4.x' into jetty-9.4.x-215-conscrypt-alpn commit c836708a9bcd5fb61ed26302eb7d71b618cce329 Merge: de039d4 d9ecd5e Author: Greg Wilkins <gregw@webtide.com> Date: Wed Sep 20 14:56:06 2017 +1000 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-215-conscrypt-alpn commit de039d42f23f9caa239e5ddee0242b9a83a45441 Author: Greg Wilkins <gregw@webtide.com> Date: Tue Sep 19 17:19:49 2017 +1000 Fix #1823 MimeTypes for ResourceHandler mp4 commit ff1e08434415cd6d909715547c2a54dbd0fc5dee Author: Greg Wilkins <gregw@webtide.com> Date: Tue Sep 19 14:21:39 2017 +1000 Issue #215 commit 3bb63147ebf4967698f51a65f009d80010038b20 Author: Greg Wilkins <gregw@webtide.com> Date: Tue Sep 19 14:08:05 2017 +1000 Issue #215 Use conscrypt 1.0.0.RC10 uber jar commit 8b18099fde67f12d0e98d0b414568c9b76835459 Merge: 06f6530 eee4117 Author: Greg Wilkins <gregw@webtide.com> Date: Tue Sep 19 10:35:43 2017 +1000 Merge branch 'jetty-9.4.x' into jetty-9.4.x-conscrypt-alpn commit 06f65305d536250c5dfa2aaa84ffacdac113c8fc Author: Greg Wilkins <gregw@webtide.com> Date: Thu Sep 14 16:04:05 2017 +1000 Issue #215 Conscrypt ALPN provider First attempt at client support commit 32d77461935263da86fb363233af0aa5a159d1fc Author: Greg Wilkins <gregw@webtide.com> Date: Thu Sep 14 09:48:43 2017 +1000 Issue #215 Conscrypt ALPN provider commit bc051dca5e3ea7fed6ddb3a25ba5cecbd1c5b18b Merge: 573c9f0 6c47126 Author: Greg Wilkins <gregw@webtide.com> Date: Thu Sep 14 08:49:10 2017 +1000 Merge branch 'jetty-9.4.x' into jetty-9.4.x-conscrypt-alpn commit 573c9f060172b2863b0b0a94c1ec2fb9a8762fa2 Merge: 47e22fe 3399fd3 Author: Greg Wilkins <gregw@webtide.com> Date: Wed Sep 13 15:24:27 2017 +1000 Merge branch 'jetty-9.4.x' into jetty-9.4.x-conscrypt-alpn commit 47e22fe2e4f8e3cc71f3117ad7d789dc3ea56675 Merge: 63ffa2b 187f37d Author: Greg Wilkins <gregw@webtide.com> Date: Wed Sep 13 11:04:24 2017 +1000 Merge branch 'jetty-9.4.x' into jetty-9.4.x-conscrypt-alpn commit 63ffa2bdc13fa85d02459855a3f8e0de4f4b4f1b Merge: cf1443d a0cb424 Author: Greg Wilkins <gregw@webtide.com> Date: Tue Sep 12 09:04:45 2017 +1000 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-conscrypt-alpn commit cf1443d3ab71ac1aec7f153c233e869a3d6f783f Author: Greg Wilkins <gregw@webtide.com> Date: Tue Sep 12 09:03:52 2017 +1000 Issue #215 Conscrypt ALPN provider commit a37aec327274042e1007f4146a3c3ec06fb424d9 Author: Greg Wilkins <gregw@webtide.com> Date: Thu Sep 7 21:19:28 2017 +1000 Issue #215 Conscrypt ALPN provider commit 6d7f39b2b0e53570afa61be5abfef2a352f80cf3 Author: Greg Wilkins <gregw@webtide.com> Date: Thu Sep 7 18:22:19 2017 +1000 Issue #215 Conscrypt ALPN provider commit a7d0f46b57091550724242693559d786180896ff Author: Greg Wilkins <gregw@webtide.com> Date: Thu Sep 7 18:16:35 2017 +1000 Issue #215 Conscrypt ALPN provider
2017-09-20 17:34:25 -04:00
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-java-server</artifactId>
Issue #215 Conscrypt module for SSL and ALPN Squash of the following commits: commit 53e503b48d290e2ff83b214fd81572bf4cacd9ab Merge: cc4ed73 d77ba82 Author: Greg Wilkins <gregw@webtide.com> Date: Thu Sep 21 07:27:45 2017 +1000 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-215-conscrypt-alpn commit cc4ed73ae45e69addbb31221a860dd0984d92ac5 Author: Greg Wilkins <gregw@webtide.com> Date: Thu Sep 21 07:26:45 2017 +1000 Issue #215 Conscrypt module debug commit f640693f7ef61f8012d1454b2ed364740b330a6e Author: Simone Bordet <simone.bordet@gmail.com> Date: Wed Sep 20 18:23:51 2017 +0200 Issue #215 - Consider native ALPN/SSL provider. Fixed server-side ALPN negotiation for Conscrypt. commit 669e992624a0f8f23103c70ba895b877dcec2404 Author: Simone Bordet <simone.bordet@gmail.com> Date: Wed Sep 20 16:56:20 2017 +0200 Issue #215 - Consider native ALPN/SSL provider. Fixed client-side ALPN negotiation for Conscrypt. commit aa873263d73c19461890bd1f9a417c796412b3d2 Author: Simone Bordet <simone.bordet@gmail.com> Date: Wed Sep 20 15:26:45 2017 +0200 Issue #215 - Consider native ALPN/SSL provider. Code cleanups. Changed ALPNProcessor.init(boolean) to init(). Removed unnecessary try/catches and simplified exception handling. commit db9b169c35da956bcc42013f9bb8acddd7238d14 Author: Greg Wilkins <gregw@webtide.com> Date: Wed Sep 20 18:07:30 2017 +1000 Issue #215 Conscrypt SSL pom cleanups commit 096572e029352428275e86a964fa92dbeee19a65 Author: Greg Wilkins <gregw@webtide.com> Date: Wed Sep 20 15:57:20 2017 +1000 Issue #215 Conscrypt SSL ALPN cleanups commit b3c1bcb1fa9a7e15517a348270738e24c7b0a820 Merge: c836708 effec06 Author: Greg Wilkins <gregw@webtide.com> Date: Wed Sep 20 15:46:13 2017 +1000 Merge branch 'jetty-9.4.x' into jetty-9.4.x-215-conscrypt-alpn commit c836708a9bcd5fb61ed26302eb7d71b618cce329 Merge: de039d4 d9ecd5e Author: Greg Wilkins <gregw@webtide.com> Date: Wed Sep 20 14:56:06 2017 +1000 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-215-conscrypt-alpn commit de039d42f23f9caa239e5ddee0242b9a83a45441 Author: Greg Wilkins <gregw@webtide.com> Date: Tue Sep 19 17:19:49 2017 +1000 Fix #1823 MimeTypes for ResourceHandler mp4 commit ff1e08434415cd6d909715547c2a54dbd0fc5dee Author: Greg Wilkins <gregw@webtide.com> Date: Tue Sep 19 14:21:39 2017 +1000 Issue #215 commit 3bb63147ebf4967698f51a65f009d80010038b20 Author: Greg Wilkins <gregw@webtide.com> Date: Tue Sep 19 14:08:05 2017 +1000 Issue #215 Use conscrypt 1.0.0.RC10 uber jar commit 8b18099fde67f12d0e98d0b414568c9b76835459 Merge: 06f6530 eee4117 Author: Greg Wilkins <gregw@webtide.com> Date: Tue Sep 19 10:35:43 2017 +1000 Merge branch 'jetty-9.4.x' into jetty-9.4.x-conscrypt-alpn commit 06f65305d536250c5dfa2aaa84ffacdac113c8fc Author: Greg Wilkins <gregw@webtide.com> Date: Thu Sep 14 16:04:05 2017 +1000 Issue #215 Conscrypt ALPN provider First attempt at client support commit 32d77461935263da86fb363233af0aa5a159d1fc Author: Greg Wilkins <gregw@webtide.com> Date: Thu Sep 14 09:48:43 2017 +1000 Issue #215 Conscrypt ALPN provider commit bc051dca5e3ea7fed6ddb3a25ba5cecbd1c5b18b Merge: 573c9f0 6c47126 Author: Greg Wilkins <gregw@webtide.com> Date: Thu Sep 14 08:49:10 2017 +1000 Merge branch 'jetty-9.4.x' into jetty-9.4.x-conscrypt-alpn commit 573c9f060172b2863b0b0a94c1ec2fb9a8762fa2 Merge: 47e22fe 3399fd3 Author: Greg Wilkins <gregw@webtide.com> Date: Wed Sep 13 15:24:27 2017 +1000 Merge branch 'jetty-9.4.x' into jetty-9.4.x-conscrypt-alpn commit 47e22fe2e4f8e3cc71f3117ad7d789dc3ea56675 Merge: 63ffa2b 187f37d Author: Greg Wilkins <gregw@webtide.com> Date: Wed Sep 13 11:04:24 2017 +1000 Merge branch 'jetty-9.4.x' into jetty-9.4.x-conscrypt-alpn commit 63ffa2bdc13fa85d02459855a3f8e0de4f4b4f1b Merge: cf1443d a0cb424 Author: Greg Wilkins <gregw@webtide.com> Date: Tue Sep 12 09:04:45 2017 +1000 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-conscrypt-alpn commit cf1443d3ab71ac1aec7f153c233e869a3d6f783f Author: Greg Wilkins <gregw@webtide.com> Date: Tue Sep 12 09:03:52 2017 +1000 Issue #215 Conscrypt ALPN provider commit a37aec327274042e1007f4146a3c3ec06fb424d9 Author: Greg Wilkins <gregw@webtide.com> Date: Thu Sep 7 21:19:28 2017 +1000 Issue #215 Conscrypt ALPN provider commit 6d7f39b2b0e53570afa61be5abfef2a352f80cf3 Author: Greg Wilkins <gregw@webtide.com> Date: Thu Sep 7 18:22:19 2017 +1000 Issue #215 Conscrypt ALPN provider commit a7d0f46b57091550724242693559d786180896ff Author: Greg Wilkins <gregw@webtide.com> Date: Thu Sep 7 18:16:35 2017 +1000 Issue #215 Conscrypt ALPN provider
2017-09-20 17:34:25 -04:00
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-openid</artifactId>
<optional>true</optional>
</dependency>
Issue #215 Conscrypt module for SSL and ALPN Squash of the following commits: commit 53e503b48d290e2ff83b214fd81572bf4cacd9ab Merge: cc4ed73 d77ba82 Author: Greg Wilkins <gregw@webtide.com> Date: Thu Sep 21 07:27:45 2017 +1000 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-215-conscrypt-alpn commit cc4ed73ae45e69addbb31221a860dd0984d92ac5 Author: Greg Wilkins <gregw@webtide.com> Date: Thu Sep 21 07:26:45 2017 +1000 Issue #215 Conscrypt module debug commit f640693f7ef61f8012d1454b2ed364740b330a6e Author: Simone Bordet <simone.bordet@gmail.com> Date: Wed Sep 20 18:23:51 2017 +0200 Issue #215 - Consider native ALPN/SSL provider. Fixed server-side ALPN negotiation for Conscrypt. commit 669e992624a0f8f23103c70ba895b877dcec2404 Author: Simone Bordet <simone.bordet@gmail.com> Date: Wed Sep 20 16:56:20 2017 +0200 Issue #215 - Consider native ALPN/SSL provider. Fixed client-side ALPN negotiation for Conscrypt. commit aa873263d73c19461890bd1f9a417c796412b3d2 Author: Simone Bordet <simone.bordet@gmail.com> Date: Wed Sep 20 15:26:45 2017 +0200 Issue #215 - Consider native ALPN/SSL provider. Code cleanups. Changed ALPNProcessor.init(boolean) to init(). Removed unnecessary try/catches and simplified exception handling. commit db9b169c35da956bcc42013f9bb8acddd7238d14 Author: Greg Wilkins <gregw@webtide.com> Date: Wed Sep 20 18:07:30 2017 +1000 Issue #215 Conscrypt SSL pom cleanups commit 096572e029352428275e86a964fa92dbeee19a65 Author: Greg Wilkins <gregw@webtide.com> Date: Wed Sep 20 15:57:20 2017 +1000 Issue #215 Conscrypt SSL ALPN cleanups commit b3c1bcb1fa9a7e15517a348270738e24c7b0a820 Merge: c836708 effec06 Author: Greg Wilkins <gregw@webtide.com> Date: Wed Sep 20 15:46:13 2017 +1000 Merge branch 'jetty-9.4.x' into jetty-9.4.x-215-conscrypt-alpn commit c836708a9bcd5fb61ed26302eb7d71b618cce329 Merge: de039d4 d9ecd5e Author: Greg Wilkins <gregw@webtide.com> Date: Wed Sep 20 14:56:06 2017 +1000 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-215-conscrypt-alpn commit de039d42f23f9caa239e5ddee0242b9a83a45441 Author: Greg Wilkins <gregw@webtide.com> Date: Tue Sep 19 17:19:49 2017 +1000 Fix #1823 MimeTypes for ResourceHandler mp4 commit ff1e08434415cd6d909715547c2a54dbd0fc5dee Author: Greg Wilkins <gregw@webtide.com> Date: Tue Sep 19 14:21:39 2017 +1000 Issue #215 commit 3bb63147ebf4967698f51a65f009d80010038b20 Author: Greg Wilkins <gregw@webtide.com> Date: Tue Sep 19 14:08:05 2017 +1000 Issue #215 Use conscrypt 1.0.0.RC10 uber jar commit 8b18099fde67f12d0e98d0b414568c9b76835459 Merge: 06f6530 eee4117 Author: Greg Wilkins <gregw@webtide.com> Date: Tue Sep 19 10:35:43 2017 +1000 Merge branch 'jetty-9.4.x' into jetty-9.4.x-conscrypt-alpn commit 06f65305d536250c5dfa2aaa84ffacdac113c8fc Author: Greg Wilkins <gregw@webtide.com> Date: Thu Sep 14 16:04:05 2017 +1000 Issue #215 Conscrypt ALPN provider First attempt at client support commit 32d77461935263da86fb363233af0aa5a159d1fc Author: Greg Wilkins <gregw@webtide.com> Date: Thu Sep 14 09:48:43 2017 +1000 Issue #215 Conscrypt ALPN provider commit bc051dca5e3ea7fed6ddb3a25ba5cecbd1c5b18b Merge: 573c9f0 6c47126 Author: Greg Wilkins <gregw@webtide.com> Date: Thu Sep 14 08:49:10 2017 +1000 Merge branch 'jetty-9.4.x' into jetty-9.4.x-conscrypt-alpn commit 573c9f060172b2863b0b0a94c1ec2fb9a8762fa2 Merge: 47e22fe 3399fd3 Author: Greg Wilkins <gregw@webtide.com> Date: Wed Sep 13 15:24:27 2017 +1000 Merge branch 'jetty-9.4.x' into jetty-9.4.x-conscrypt-alpn commit 47e22fe2e4f8e3cc71f3117ad7d789dc3ea56675 Merge: 63ffa2b 187f37d Author: Greg Wilkins <gregw@webtide.com> Date: Wed Sep 13 11:04:24 2017 +1000 Merge branch 'jetty-9.4.x' into jetty-9.4.x-conscrypt-alpn commit 63ffa2bdc13fa85d02459855a3f8e0de4f4b4f1b Merge: cf1443d a0cb424 Author: Greg Wilkins <gregw@webtide.com> Date: Tue Sep 12 09:04:45 2017 +1000 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-conscrypt-alpn commit cf1443d3ab71ac1aec7f153c233e869a3d6f783f Author: Greg Wilkins <gregw@webtide.com> Date: Tue Sep 12 09:03:52 2017 +1000 Issue #215 Conscrypt ALPN provider commit a37aec327274042e1007f4146a3c3ec06fb424d9 Author: Greg Wilkins <gregw@webtide.com> Date: Thu Sep 7 21:19:28 2017 +1000 Issue #215 Conscrypt ALPN provider commit 6d7f39b2b0e53570afa61be5abfef2a352f80cf3 Author: Greg Wilkins <gregw@webtide.com> Date: Thu Sep 7 18:22:19 2017 +1000 Issue #215 Conscrypt ALPN provider commit a7d0f46b57091550724242693559d786180896ff Author: Greg Wilkins <gregw@webtide.com> Date: Thu Sep 7 18:16:35 2017 +1000 Issue #215 Conscrypt ALPN provider
2017-09-20 17:34:25 -04:00
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-conscrypt-server</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jaspi</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>infinispan-embedded</artifactId>
<version>${project.version}</version>
<type>pom</type>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>infinispan-embedded-query</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>infinispan-remote</artifactId>
<version>${project.version}</version>
<type>pom</type>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>org.wildfly.common</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>infinispan-remote-query</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-hazelcast</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.gcloud</groupId>
<artifactId>jetty-gcloud-session-manager</artifactId>
<optional>true</optional>
</dependency>
2016-06-15 20:31:36 -04:00
<dependency>
<groupId>org.eclipse.jetty.memcached</groupId>
<artifactId>jetty-memcached-sessions</artifactId>
<optional>true</optional>
2016-06-15 20:31:36 -04:00
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-nosql</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-keystore</artifactId>
<optional>true</optional>
</dependency>
<!-- Demo Apps -->
<dependency>
<groupId>org.eclipse.jetty.demos</groupId>
<artifactId>demo-mock-resources</artifactId>
<version>${project.version}</version>
<classifier>config</classifier>
<type>jar</type>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.demos</groupId>
<artifactId>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.demos</groupId>
<artifactId>demo-jaas-webapp</artifactId>
<version>${project.version}</version>
<classifier>config</classifier>
<type>jar</type>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.demos</groupId>
<artifactId>demo-jndi-webapp</artifactId>
<version>${project.version}</version>
<classifier>config</classifier>
<type>jar</type>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.demos</groupId>
<artifactId>demo-spec-webapp</artifactId>
<version>${project.version}</version>
<classifier>config</classifier>
<type>jar</type>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.demos</groupId>
<artifactId>demo-async-rest-webapp</artifactId>
<version>${project.version}</version>
<classifier>config</classifier>
<type>jar</type>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.demos</groupId>
<artifactId>demo-proxy-webapp</artifactId>
<version>${project.version}</version>
<classifier>config</classifier>
<type>jar</type>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.demos</groupId>
<artifactId>demo-simple-webapp</artifactId>
<version>${project.version}</version>
<classifier>config</classifier>
<type>jar</type>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.demos</groupId>
<artifactId>demo-jsp-webapp</artifactId>
<version>${project.version}</version>
<classifier>config</classifier>
<type>jar</type>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<optional>true</optional>
</dependency>
</dependencies>
2016-06-15 20:31:36 -04:00
</project>