Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jetty-9.4.x' into jetty-9.4.x-1027-Multipart

This commit is contained in:
Greg Wilkins 2018-03-23 09:34:52 +11:00
parent 9d1809f43e 732a3c4d1c
commit 2cc26f0e71
149 changed files with 894 additions and 390 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Jenkinsfile vendored
View File

@ -85,6 +85,7 @@ def getFullBuild(jdk, os) {
maven: 'maven3',
jdk: "$jdk",
publisherStrategy: 'EXPLICIT',
//options: [invokerPublisher(disabled: false)],
globalMavenSettingsConfig: 'oss-settings.xml',
mavenLocalRepo: "${env.JENKINS_HOME}/${env.EXECUTOR_NUMBER}") {
//

94
VERSION.txt
View File

@ -1,4 +1,96 @@
jetty-9.4.9-SNAPSHOT
jetty-9.4.10-SNAPSHOT
jetty-9.4.9.v20180320 - 20 March 2018
+ 347 Avoid sending request using a connection that is idle timing out
+ 1416 GzipHandler generated ETag suffix has problems with If-Match header
logic
+ 1602 WebAppContext is started twice, once by deployer, again by lifecycle
+ 1614 AbstractNCSARequestLog does not extract the user from the http header
when it has not been authenticated
+ 1770 SniX509ExtendedKeyManager.chooseServerAlias() throws
NullPointerException when socket is null
+ 1797 JEP 238 - Multi-Release JAR files break bytecode scanning
+ 1832 Bad HTTP Close prevents proper TCP close
+ 1918 Scalable scheduler implementation
+ 1933 Use CLASSPATH for scanning java9 system classes
+ 1940 Embedded CDI: SessionScoped gives a NPE
+ 1949 Client-side problems with digest authentication
+ 1956 Store and report build information of Jetty
+ 1966 HttpMethod case sensitive
+ 1970 ManagedSelector can lose selector thread under high concurrent load
+ 1973 Implement minimum response data rate
+ 1983 Improve warning for incompatible ALPN processor
+ 1986 ServletContextHandler.Context addListener() methods support
session listeners
+ 2003 Do not submit blocking tasks as managed selector actions
+ 2006 ServletInputStream.isReady not registering interest when it should
+ 2010 SniX509ExtendedKeyManager causes exception: "FIPS mode: only SunJSSE
KeyManagers may be used"
+ 2014 Support unix domain sockets in HttpClient
+ 2015 jetty-alpn-conscrypt-server needs appropriate osgi headers in manifest
+ 2016 jetty-alpn-openjdk8-server needs correct osgi headers in manifest
+ 2019 Expose HttpClientTransport in JMX
+ 2020 Introduce a name for `HttpClient` instances
+ 2022 Fine grained RFC HTTP Compliance modes: including OWS prior to field
colon
+ 2028 Add osgi headers for alpn-java client and server
+ 2030 NPE in AnnotationConfiguration with DEBUG enabled
+ 2033 Improve HTTP/2 session and stream stall times report
+ 2034 Improve HTTP2Session dump
+ 2035 FlowControlStrategy keeps around reset streams
+ 2037 HTTP/2 stream reset leaves stream frames in the flusher
+ 2038 FileSessionDataStore.deleteAllFiles(File, String) can become slow
+ 2043 ConcurrentModificationException during annotation parsing
+ 2046 Server.stop not closing connections
+ 2050 Clarify ObjectMBean getObject[Name|Context]Basis() methods
+ 2079 Upgrade to apache jasper 8.5.24
+ 2080 Exclude more maven machinery dependencies from the jetty-maven-plugin
server path
+ 2081 No idle timeout exception when dispatch is delayed
+ 2088 Recycle HTTP/2 channels on the client
+ 2090 Jetty fails to start on OpenJDK 9: "Invalid Java version 9.0.1.3"
+ 2093 Correcting Bom managed dependencies that do not exist
+ 2114 Fix NPE in JettyHttpServerProvider
+ 2117 Allow to configure HttpClient default request Content-Type
+ 2130 Introduce thread pool module for simpler configuration of thread pool
in standalone
+ 2131 Introduce a monitored thread pool
+ 2136 maven & jetty-maven-plugin & offline
error:java.net.UnknownHostException: www.eclipse.org
+ 2148 Limit BufferUtil.toDetailString() raw character display to USASCII
7-bit printable characters
+ 2152 Produce jetty-home-source artifacts for Eclipse Jetty source jars
+ 2160 Digest authentication should use absolute path
+ 2164 Ensure all jetty modules that use ServiceLoader have correct OSGi
manifest headers
+ 2190 HTTP/2 close and GOAWAY behavior
+ 2203 Use GlobalWebAppConfigBinding rather than special methods on
DeploymentManager/WebAppProvider
+ 2209 jetty-maven-plugin deploy-war silently fails (unless the pom has war
packaging)
+ 2210 NPE at org.eclipse.jetty.client.HttpDestination.newExchangeQueue
+ 2218 Adding workaround for Windows NIO Selector Bug
+ 2232 Dependency Conflict: Conflicting JARs org.apache.maven:maven-project
+ 2255 Notify SSL handshake failures on write failures
+ 2275 jetty.server.ResourceService.doGet() + RequestDispatcher INCLUDE
+ 2278 Could not find artifact
org.eclipse.jetty.tests:test-webapps-parent:pom:9.4.8.v20171121
+ 2279 Jetty 9.4.x start.jar: "?=" in [ini] defeats Issue #1139 functionality
+ 2280 Default application/json to utf-8 encoding in encoding.properties
+ 2284 NPE from start.jar during JVM version parsing
+ 2288 Cleanup the statistics classes
+ 2291 Expose HTTP/2 close reason in dumps
+ 2293 HTTP/2 client multiplexed connection pool creates too many connections
+ 2297 HTTP/2 client transport should honor HttpClient.connectBlocking
+ 2298 Override the processor number with an environment variable
+ 2307 Error page can have null charset in content type
+ 2308 Type change in MonitorTask - int cannot be converted to
ThreadPoolExecutor
+ 2312 HTTP/2 Connection.Listener notified after first request
+ 2313 Dump HTTP/2 channel state
+ 2318 HttpParser.Listener.onBadMessage() should take BadMessageException
+ 2346 Missing stack traces in HTTPChannel.onException
+ 2358 Add ALPN module file for JDK 10
jetty-9.4.8.v20171121 - 21 November 2017
+ 212 HttpClient should support pluggable AuthenticationStore

2
aggregates/jetty-all-compact3/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
aggregates/jetty-all/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
apache-jsp/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apache-jsp</artifactId>

2
apache-jstl/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apache-jstl</artifactId>

2
examples/async-rest/async-rest-jar/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>example-async-rest</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty.example-async-rest</groupId>

2
examples/async-rest/async-rest-webapp/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>example-async-rest</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty.example-async-rest</groupId>

2
examples/async-rest/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.examples</groupId>
<artifactId>examples-parent</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
examples/embedded/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.examples</groupId>
<artifactId>examples-parent</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
examples/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.eclipse.jetty.examples</groupId>

2
jetty-alpn/jetty-alpn-client/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-parent</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-alpn-client</artifactId>

2
jetty-alpn/jetty-alpn-conscrypt-client/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-parent</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
jetty-alpn/jetty-alpn-conscrypt-server/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-parent</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
jetty-alpn/jetty-alpn-java-client/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-parent</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
jetty-alpn/jetty-alpn-java-server/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-parent</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
jetty-alpn/jetty-alpn-openjdk8-client/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-parent</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
jetty-alpn/jetty-alpn-openjdk8-server/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-parent</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
jetty-alpn/jetty-alpn-server/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-parent</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-alpn-server</artifactId>

2
jetty-alpn/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-alpn-parent</artifactId>

2
jetty-annotations/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-annotations</artifactId>

2
jetty-ant/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-ant</artifactId>

132
jetty-bom/pom.xml
View File

@ -2,7 +2,7 @@
<groupId>org.eclipse.jetty</groupId>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-bom</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
<name>Jetty :: Bom</name>
<description>Jetty BOM artifact</description>
<url>http://www.eclipse.org/jetty</url>
@ -94,331 +94,331 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>apache-jsp</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>apache-jstl</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-client</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-java-client</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-java-server</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-openjdk8-client</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-openjdk8-server</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-conscrypt-client</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-conscrypt-server</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-server</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-annotations</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-ant</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.cdi</groupId>
<artifactId>cdi-core</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.cdi</groupId>
<artifactId>cdi-servlet</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-client</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-continuation</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-deploy</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-distribution</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-distribution</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
<type>tar.gz</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.fcgi</groupId>
<artifactId>fcgi-client</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.fcgi</groupId>
<artifactId>fcgi-server</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.gcloud</groupId>
<artifactId>jetty-gcloud-session-manager</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-home</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-home</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
<type>tar.gz</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-client</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-common</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-hpack</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-http-client-transport</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-server</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http-spi</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-infinispan</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-hazelcast</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jaas</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jaspi</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jmx</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jndi</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.memcached</groupId>
<artifactId>jetty-memcached-sessions</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-nosql</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi-boot</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi-boot-jsp</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi-boot-warurl</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-httpservice</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-plus</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-proxy</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-quickstart</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-rewrite</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlets</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-spring</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-unixsocket</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util-ajax</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>javax-websocket-client-impl</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>javax-websocket-server-impl</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-api</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-client</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-common</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-server</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-servlet</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-xml</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>

2
jetty-cdi/cdi-2/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.cdi</groupId>
<artifactId>jetty-cdi-parent</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cdi-2</artifactId>

2
jetty-cdi/cdi-core/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.cdi</groupId>
<artifactId>jetty-cdi-parent</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cdi-core</artifactId>

2
jetty-cdi/cdi-full-servlet/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.cdi</groupId>
<artifactId>jetty-cdi-parent</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cdi-full-servlet</artifactId>

2
jetty-cdi/cdi-servlet/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.cdi</groupId>
<artifactId>jetty-cdi-parent</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cdi-servlet</artifactId>

2
jetty-cdi/cdi-websocket/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.cdi</groupId>
<artifactId>jetty-cdi-parent</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cdi-websocket</artifactId>

2
jetty-cdi/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty.cdi</groupId>

2
jetty-cdi/test-cdi-webapp/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>org.eclipse.jetty.cdi</groupId>
<artifactId>jetty-cdi-parent</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>test-cdi-webapp</artifactId>

2
jetty-client/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

16
jetty-client/src/main/java/org/eclipse/jetty/client/ConnectionPool.java
View File

@ -91,4 +91,20 @@ public interface ConnectionPool extends Closeable
*/
ConnectionPool newConnectionPool(HttpDestination destination);
}
/**
* Marks a connection pool as supporting multiplexed connections.
*/
interface Multiplexable
{
/**
* @return the max number of requests multiplexable on a single connection
*/
int getMaxMultiplex();
/**
* @param maxMultiplex the max number of requests multiplexable on a single connection
*/
void setMaxMultiplex(int maxMultiplex);
}
}

6
jetty-client/src/main/java/org/eclipse/jetty/client/HttpChannel.java
View File

@ -70,10 +70,14 @@ public abstract class HttpChannel
}
if (abort)
{
exchange.getRequest().abort(new UnsupportedOperationException("Pipelined requests not supported"));
}
else
{
if (LOG.isDebugEnabled())
LOG.debug("{} associated {} to {}", exchange, result, this);
}
return result;
}

4
jetty-client/src/main/java/org/eclipse/jetty/client/MultiplexConnectionPool.java
View File

@ -36,7 +36,7 @@ import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.util.thread.Sweeper;
public class MultiplexConnectionPool extends AbstractConnectionPool implements Sweeper.Sweepable
public class MultiplexConnectionPool extends AbstractConnectionPool implements ConnectionPool.Multiplexable, Sweeper.Sweepable
{
private static final Logger LOG = Log.getLogger(MultiplexConnectionPool.class);
@ -80,6 +80,7 @@ public class MultiplexConnectionPool extends AbstractConnectionPool implements S
lock.unlock();
}
@Override
public int getMaxMultiplex()
{
lock();
@ -93,6 +94,7 @@ public class MultiplexConnectionPool extends AbstractConnectionPool implements S
}
}
@Override
public void setMaxMultiplex(int maxMultiplex)
{
lock();

8
jetty-client/src/main/java/org/eclipse/jetty/client/MultiplexHttpDestination.java
View File

@ -28,15 +28,15 @@ public abstract class MultiplexHttpDestination extends HttpDestination
public int getMaxRequestsPerConnection()
{
ConnectionPool connectionPool = getConnectionPool();
if (connectionPool instanceof MultiplexConnectionPool)
return ((MultiplexConnectionPool)connectionPool).getMaxMultiplex();
if (connectionPool instanceof ConnectionPool.Multiplexable)
return ((ConnectionPool.Multiplexable)connectionPool).getMaxMultiplex();
return 1;
}
public void setMaxRequestsPerConnection(int maxRequestsPerConnection)
{
ConnectionPool connectionPool = getConnectionPool();
if (connectionPool instanceof MultiplexConnectionPool)
((MultiplexConnectionPool)connectionPool).setMaxMultiplex(maxRequestsPerConnection);
if (connectionPool instanceof ConnectionPool.Multiplexable)
((ConnectionPool.Multiplexable)connectionPool).setMaxMultiplex(maxRequestsPerConnection);
}
}

71
jetty-client/src/main/java/org/eclipse/jetty/client/RoundRobinConnectionPool.java
View File

@ -29,17 +29,42 @@ import org.eclipse.jetty.util.annotation.ManagedObject;
import org.eclipse.jetty.util.component.ContainerLifeCycle;
@ManagedObject
public class RoundRobinConnectionPool extends AbstractConnectionPool
public class RoundRobinConnectionPool extends AbstractConnectionPool implements ConnectionPool.Multiplexable
{
private final List<Entry> entries;
private int maxMultiplex;
private int index;
public RoundRobinConnectionPool(Destination destination, int maxConnections, Callback requester)
{
this(destination, maxConnections, requester, 1);
}
public RoundRobinConnectionPool(Destination destination, int maxConnections, Callback requester, int maxMultiplex)
{
super(destination, maxConnections, requester);
entries = new ArrayList<>(maxConnections);
for (int i = 0; i < maxConnections; ++i)
entries.add(new Entry());
this.maxMultiplex = maxMultiplex;
}
@Override
public int getMaxMultiplex()
{
synchronized (this)
{
return maxMultiplex;
}
}
@Override
public void setMaxMultiplex(int maxMultiplex)
{
synchronized (this)
{
this.maxMultiplex = maxMultiplex;
}
}
@Override
@ -78,10 +103,10 @@ public class RoundRobinConnectionPool extends AbstractConnectionPool
if (entry.connection == null)
break;
if (!entry.active)
if (entry.active < getMaxMultiplex())
{
entry.active = true;
entry.used++;
++entry.active;
++entry.used;
connection = entry.connection;
index += offset + 1;
if (index >= capacity)
@ -103,7 +128,7 @@ public class RoundRobinConnectionPool extends AbstractConnectionPool
for (Entry entry : entries)
{
if (entry.connection == connection)
return entry.active;
return entry.active > 0;
}
return false;
}
@ -112,56 +137,60 @@ public class RoundRobinConnectionPool extends AbstractConnectionPool
@Override
public boolean release(Connection connection)
{
boolean active = false;
boolean found = false;
boolean idle = false;
synchronized (this)
{
for (Entry entry : entries)
{
if (entry.connection == connection)
{
entry.active = false;
active = true;
found = true;
int active = --entry.active;
idle = active == 0;
break;
}
}
}
if (active)
if (!found)
return false;
released(connection);
if (idle)
return idle(connection, isClosed());
return true;
}
@Override
public boolean remove(Connection connection)
{
boolean active = false;
boolean removed = false;
boolean found = false;
synchronized (this)
{
for (Entry entry : entries)
{
if (entry.connection == connection)
{
active = entry.active;
found = true;
entry.reset();
removed = true;
break;
}
}
}
if (active)
if (found)
{
released(connection);
if (removed)
removed(connection);
return removed;
}
return found;
}
@Override
public void dump(Appendable out, String indent) throws IOException
{
List<Entry> connections = new ArrayList<>();
List<Entry> connections;
synchronized (this)
{
connections.addAll(entries);
connections = new ArrayList<>(entries);
}
ContainerLifeCycle.dumpObject(out, this);
ContainerLifeCycle.dump(out, indent, connections);
@ -179,7 +208,7 @@ public class RoundRobinConnectionPool extends AbstractConnectionPool
if (entry.connection != null)
{
++present;
if (entry.active)
if (entry.active > 0)
++active;
}
}
@ -196,13 +225,13 @@ public class RoundRobinConnectionPool extends AbstractConnectionPool
private static class Entry
{
private Connection connection;
private boolean active;
private int active;
private long used;
private void reset()
{
connection = null;
active = false;
active = 0;
used = 0;
}

24
jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpReceiverOverHTTP.java
View File

@ -42,6 +42,7 @@ public class HttpReceiverOverHTTP extends HttpReceiver implements HttpParser.Res
private final HttpParser parser;
private ByteBuffer buffer;
private boolean shutdown;
private boolean complete;
public HttpReceiverOverHTTP(HttpChannelOverHTTP channel)
{
@ -168,13 +169,22 @@ public class HttpReceiverOverHTTP extends HttpReceiver implements HttpParser.Res
{
while (true)
{
// Must parse even if the buffer is fully consumed, to allow the
// parser to advance from asynchronous content to response complete.
boolean handle = parser.parseNext(buffer);
boolean complete = this.complete;
this.complete = false;
if (LOG.isDebugEnabled())
LOG.debug("Parsed {}, remaining {} {}", handle, buffer.remaining(), parser);
if (handle || !buffer.hasRemaining())
return handle;
if (handle)
return true;
if (!buffer.hasRemaining())
return false;
if (complete)
{
if (LOG.isDebugEnabled())
LOG.debug("Discarding unexpected content after response: {}", BufferUtil.toDetailString(buffer));
BufferUtil.clear(buffer);
return false;
}
}
}
@ -298,11 +308,15 @@ public class HttpReceiverOverHTTP extends HttpReceiver implements HttpParser.Res
if (exchange == null)
return false;
int status = exchange.getResponse().getStatus();
if (status != HttpStatus.CONTINUE_100)
complete = true;
boolean proceed = responseSuccess(exchange);
if (!proceed)
return true;
int status = exchange.getResponse().getStatus();
if (status == HttpStatus.SWITCHING_PROTOCOLS_101)
return true;

64
jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTest.java
View File

@ -1648,6 +1648,70 @@ public class HttpClientTest extends AbstractHttpClientServerTest
Assert.assertEquals(200, response.getStatus());
}
@Test
public void test204WithContent() throws Exception
{
// This test only works with clear-text HTTP.
Assume.assumeTrue(sslContextFactory == null);
try (ServerSocket server = new ServerSocket(0))
{
startClient();
client.setMaxConnectionsPerDestination(1);
int idleTimeout = 2000;
client.setIdleTimeout(idleTimeout);
Request request = client.newRequest("localhost", server.getLocalPort())
.scheme(scheme)
.timeout(5, TimeUnit.SECONDS);
FutureResponseListener listener = new FutureResponseListener(request);
request.send(listener);
try (Socket socket = server.accept())
{
socket.setSoTimeout(idleTimeout / 2);
InputStream input = socket.getInputStream();
consume(input, false);
// Send a bad response.
String httpResponse = "" +
"HTTP/1.1 204 No Content\r\n" +
"\r\n" +
"No Content";
OutputStream output = socket.getOutputStream();
output.write(httpResponse.getBytes(StandardCharsets.UTF_8));
output.flush();
ContentResponse response = listener.get(5, TimeUnit.SECONDS);
Assert.assertEquals(204, response.getStatus());
byte[] responseContent = response.getContent();
Assert.assertNotNull(responseContent);
Assert.assertEquals(0, responseContent.length);
// Send another request to verify we have handled the wrong response correctly.
request = client.newRequest("localhost", server.getLocalPort())
.scheme(scheme)
.timeout(5, TimeUnit.SECONDS);
listener = new FutureResponseListener(request);
request.send(listener);
consume(input, false);
httpResponse = "" +
"HTTP/1.1 200 OK\r\n" +
"Content-Length: 0\r\n" +
"\r\n";
output.write(httpResponse.getBytes(StandardCharsets.UTF_8));
output.flush();
response = listener.get(5, TimeUnit.SECONDS);
Assert.assertEquals(200, response.getStatus());
}
}
}
private void assertCopyRequest(Request original)
{
Request copy = client.copyRequest((HttpRequest) original, original.getURI());

99
jetty-client/src/test/java/org/eclipse/jetty/client/RoundRobinConnectionPoolTest.java
View File

@ -1,99 +0,0 @@
//
// ========================================================================
// Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
// ------------------------------------------------------------------------
// All rights reserved. This program and the accompanying materials
// are made available under the terms of the Eclipse Public License v1.0
// and Apache License v2.0 which accompanies this distribution.
//
// The Eclipse Public License is available at
// http://www.eclipse.org/legal/epl-v10.html
//
// The Apache License v2.0 is available at
// http://www.opensource.org/licenses/apache2.0.php
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//
package org.eclipse.jetty.client;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.eclipse.jetty.client.api.ContentResponse;
import org.eclipse.jetty.http.HttpStatus;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.hamcrest.Matchers;
import org.junit.Assert;
import org.junit.Test;
public class RoundRobinConnectionPoolTest extends AbstractHttpClientServerTest
{
public RoundRobinConnectionPoolTest(SslContextFactory sslContextFactory)
{
super(sslContextFactory);
}
@Test
public void testRoundRobin() throws Exception
{
AtomicBoolean record = new AtomicBoolean();
List<Integer> remotePorts = new ArrayList<>();
start(new EmptyServerHandler()
{
@Override
protected void service(String target, Request jettyRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{
if (record.get())
remotePorts.add(request.getRemotePort());
}
});
int maxConnections = 3;
client.getTransport().setConnectionPoolFactory(destination -> new RoundRobinConnectionPool(destination, maxConnections, destination));
// Prime the connections, so that they are all opened
// before we actually test the round robin behavior.
String host = "localhost";
int port = connector.getLocalPort();
for (int i = 0; i < maxConnections; ++i)
{
ContentResponse response = client.newRequest(host, port)
.scheme(scheme)
.timeout(5, TimeUnit.SECONDS)
.send();
Assert.assertEquals(HttpStatus.OK_200, response.getStatus());
}
record.set(true);
int requests = 2 * maxConnections - 1;
for (int i = 0; i < requests; ++i)
{
ContentResponse response = client.newRequest(host, port)
.scheme(scheme)
.timeout(5, TimeUnit.SECONDS)
.send();
Assert.assertEquals(HttpStatus.OK_200, response.getStatus());
}
Assert.assertThat(remotePorts.size(), Matchers.equalTo(requests));
for (int i = 0; i < requests; ++i)
{
int base = i % maxConnections;
int expected = remotePorts.get(base);
int candidate = remotePorts.get(i);
Assert.assertThat(client.dump() + System.lineSeparator() + remotePorts.toString(), expected, Matchers.equalTo(candidate));
if (i > 0)
Assert.assertThat(remotePorts.get(i - 1), Matchers.not(Matchers.equalTo(candidate)));
}
}
}

2
jetty-continuation/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-continuation</artifactId>

2
jetty-deploy/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-deploy</artifactId>

2
jetty-distribution/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-distribution</artifactId>

2
jetty-documentation/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<artifactId>jetty-documentation</artifactId>
<name>Jetty :: Documentation</name>

2
jetty-fcgi/fcgi-client/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>org.eclipse.jetty.fcgi</groupId>
<artifactId>fcgi-parent</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
jetty-fcgi/fcgi-server/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>org.eclipse.jetty.fcgi</groupId>
<artifactId>fcgi-parent</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
jetty-fcgi/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
jetty-gcloud/jetty-gcloud-session-manager/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.jetty.gcloud</groupId>
<artifactId>gcloud-parent</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
jetty-gcloud/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<artifactId>jetty-project</artifactId>
<groupId>org.eclipse.jetty</groupId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
jetty-hazelcast/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
jetty-home/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<artifactId>jetty-project</artifactId>
<groupId>org.eclipse.jetty</groupId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-home</artifactId>

2
jetty-http-spi/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-http-spi</artifactId>

2
jetty-http/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<artifactId>jetty-project</artifactId>
<groupId>org.eclipse.jetty</groupId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-http</artifactId>

2
jetty-http2/http2-alpn-tests/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-parent</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
jetty-http2/http2-client/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-parent</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
jetty-http2/http2-common/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-parent</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
jetty-http2/http2-hpack/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-parent</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
jetty-http2/http2-http-client-transport/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-parent</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

29
jetty-http2/http2-http-client-transport/src/test/java/org/eclipse/jetty/http2/client/http/HttpClientTransportOverHTTP2Test.java
View File

@ -25,6 +25,7 @@ import java.net.ServerSocket;
import java.net.Socket;
import java.net.SocketTimeoutException;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@ -534,6 +535,34 @@ public class HttpClientTransportOverHTTP2Test extends AbstractTest
}
}
@Test
public void test204WithContent() throws Exception
{
byte[] bytes = "No Content".getBytes(StandardCharsets.UTF_8);
start(new ServerSessionListener.Adapter()
{
@Override
public Stream.Listener onNewStream(Stream stream, HeadersFrame frame)
{
int streamId = stream.getId();
MetaData.Response response = new MetaData.Response(HttpVersion.HTTP_2, HttpStatus.NO_CONTENT_204, new HttpFields());
HeadersFrame responseFrame = new HeadersFrame(streamId, response, null, false);
Callback.Completable callback = new Callback.Completable();
stream.headers(responseFrame, callback);
callback.thenRun(() -> stream.data(new DataFrame(streamId, ByteBuffer.wrap(bytes), true), Callback.NOOP));
return null;
}
});
ContentResponse response = client.newRequest("localhost", connector.getLocalPort())
.timeout(5, TimeUnit.SECONDS)
.send();
Assert.assertEquals(HttpStatus.NO_CONTENT_204, response.getStatus());
// No logic on the client to discard content for no-content status codes.
Assert.assertArrayEquals(bytes, response.getContent());
}
@Ignore
@Test
public void testExternalServer() throws Exception

2
jetty-http2/http2-server/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-parent</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
jetty-http2/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<artifactId>jetty-project</artifactId>
<groupId>org.eclipse.jetty</groupId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
jetty-infinispan/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-infinispan</artifactId>

2
jetty-io/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<artifactId>jetty-project</artifactId>
<groupId>org.eclipse.jetty</groupId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-io</artifactId>

2
jetty-jaas/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-jaas</artifactId>

2
jetty-jaspi/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-jaspi</artifactId>

2
jetty-jmx/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-jmx</artifactId>

2
jetty-jndi/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-jndi</artifactId>

48
jetty-jspc-maven-plugin/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-jspc-maven-plugin</artifactId>
@ -10,6 +10,7 @@
<name>Jetty :: Jetty JSPC Maven Plugin</name>
<properties>
<bundle-symbolic-name>${project.groupId}.jspc.plugin</bundle-symbolic-name>
<it.debug>false</it.debug>
</properties>
<build>
<plugins>
@ -96,6 +97,12 @@
<artifactId>apache-jstl</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlets</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<reporting>
<plugins>
@ -120,4 +127,43 @@
</plugin>
</plugins>
</reporting>
<profiles>
<profile>
<id>run-its</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<executions>
<execution>
<id>integration-test</id>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
<configuration>
<debug>${it.debug}</debug>
<addTestClassPath>true</addTestClassPath>
<projectsDirectory>src/it</projectsDirectory>
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
<pomIncludes>
<pomInclude>*/pom.xml</pomInclude>
</pomIncludes>
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
<settingsFile>src/it/settings.xml</settingsFile>
<scriptVariables>
<surefireVersion>${surefireVersion}</surefireVersion>
</scriptVariables>
<goals>
<goal>clean</goal>
</goals>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>

36
jetty-jspc-maven-plugin/src/it/settings.xml Normal file
View File

@ -0,0 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<settings>
<profiles>
<profile>
<id>it-repo</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<repositories>
<repository>
<id>local.central</id>
<url>@localRepositoryUrl@</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>local.central</id>
<url>@localRepositoryUrl@</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</profile>
</profiles>
</settings>

3
jetty-jspc-maven-plugin/src/it/simple-jsp-fail/invoker.properties Normal file
View File

@ -0,0 +1,3 @@
invoker.goals = test -fae
invoker.buildResult = failure
invoker.debug = true

43
jetty-jspc-maven-plugin/src/it/simple-jsp-fail/pom.xml Normal file
View File

@ -0,0 +1,43 @@
<?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">
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty.its.jspc</groupId>
<artifactId>simple-jsp-fail</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Jetty :: Simple Jsp Fail</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<maven-war-plugin-version>3.0.0</maven-war-plugin-version>
<jetty.version>@project.version@</jetty.version>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jspc-maven-plugin</artifactId>
<version>${jetty.version}</version>
<executions>
<execution>
<goals>
<goal>jspc</goal>
</goals>
<phase>compile</phase>
<configuration>
<webAppSourceDirectory>src/main/jsp</webAppSourceDirectory>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

3
jetty-jspc-maven-plugin/src/it/simple-jsp-fail/postbuild.groovy Normal file
View File

@ -0,0 +1,3 @@
System.out.println( "running postbuild.groovy" )

23
jetty-jspc-maven-plugin/src/it/simple-jsp-fail/src/main/jsp/foo.jsp Normal file
View File

@ -0,0 +1,23 @@
<html><head>
<%@ page import="java.util.Enumeration" %>
</head><body>
<h1>JSP Dump</h1>
<table border="1">
<tr><th>Request URI:</th><td><%= request.getFoo() %></td></tr>
<tr><th>ServletPath:</th><td><%= request.getServletPath() %></td></tr>
<tr><th>PathInfo:</th><td><%= request.getPathInfo() %></td></tr>
<%
Enumeration e =request.getParameterNames();
while(e.hasMoreElements())
{
String name = (String)e.nextElement();
%>
<tr>
<th>getParameter("<%= name %>")</th>
<td><%= request.getParameter(name) %></td></tr>
<% } %>
</table>
</body></html>

2
jetty-jspc-maven-plugin/src/it/simple-jsp/invoker.properties Normal file
View File

@ -0,0 +1,2 @@
invoker.goals = test -fae
invoker.debug = true

39
jetty-jspc-maven-plugin/src/it/simple-jsp/pom.xml Normal file
View File

@ -0,0 +1,39 @@
<?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">
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty.its.jspc</groupId>
<artifactId>simple-jsp</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Jetty :: Simple Jsp</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<jetty.version>@project.version@</jetty.version>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jspc-maven-plugin</artifactId>
<version>${jetty.version}</version>
<executions>
<execution>
<goals>
<goal>jspc</goal>
</goals>
<phase>compile</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

3
jetty-jspc-maven-plugin/src/it/simple-jsp/postbuild.groovy Normal file
View File

@ -0,0 +1,3 @@
System.out.println( "running postbuild.groovy" )

23
jetty-jspc-maven-plugin/src/it/simple-jsp/src/main/webapp/foo.jsp Normal file
View File

@ -0,0 +1,23 @@
<html><head>
<%@ page import="java.util.Enumeration" %>
</head><body>
<h1>JSP Dump</h1>
<table border="1">
<tr><th>Request URI:</th><td><%= request.getRequestURI() %></td></tr>
<tr><th>ServletPath:</th><td><%= request.getServletPath() %></td></tr>
<tr><th>PathInfo:</th><td><%= request.getPathInfo() %></td></tr>
<%
Enumeration e =request.getParameterNames();
while(e.hasMoreElements())
{
String name = (String)e.nextElement();
%>
<tr>
<th>getParameter("<%= name %>")</th>
<td><%= request.getParameter(name) %></td></tr>
<% } %>
</table>
</body></html>

15
jetty-maven-plugin/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-maven-plugin</artifactId>
@ -211,7 +211,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<version>3.0.1</version>
<executions>
<execution>
<id>integration-test</id>
@ -265,18 +264,6 @@
</plugin>
</plugins>
</build>
<pluginRepositories>
<pluginRepository>
<id>apache.snaphots</id>
<url>https://repository.apache.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</profile>
</profiles>
</project>

2
jetty-memcached/jetty-memcached-sessions/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>org.eclipse.jetty.memcached</groupId>
<artifactId>memcached-parent</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
jetty-memcached/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<artifactId>jetty-project</artifactId>
<groupId>org.eclipse.jetty</groupId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
jetty-nosql/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-nosql</artifactId>

2
jetty-osgi/jetty-osgi-alpn/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi-project</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-osgi-alpn</artifactId>

2
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi-project</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-osgi-boot-jsp</artifactId>

2
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi-project</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
jetty-osgi/jetty-osgi-boot/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi-project</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-osgi-boot</artifactId>

2
jetty-osgi/jetty-osgi-httpservice/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi-project</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-httpservice</artifactId>

2
jetty-osgi/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
jetty-osgi/test-jetty-osgi-context/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi-project</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>test-jetty-osgi-context</artifactId>

2
jetty-osgi/test-jetty-osgi-fragment/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi-project</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
jetty-osgi/test-jetty-osgi-server/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi-project</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>test-jetty-osgi-server</artifactId>

2
jetty-osgi/test-jetty-osgi-webapp/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi-project</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
jetty-osgi/test-jetty-osgi/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi-project</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
jetty-plus/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-plus</artifactId>

2
jetty-proxy/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-proxy</artifactId>

2
jetty-quickstart/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty</groupId>

2
jetty-rewrite/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-rewrite</artifactId>

2
jetty-runner/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-runner</artifactId>

2
jetty-security/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-security</artifactId>

2
jetty-server/pom.xml
View File

@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-server</artifactId>

2
jetty-servlet/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<artifactId>jetty-project</artifactId>
<groupId>org.eclipse.jetty</groupId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-servlet</artifactId>

2
jetty-servlets/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<artifactId>jetty-project</artifactId>
<groupId>org.eclipse.jetty</groupId>
<version>9.4.9-SNAPSHOT</version>
<version>9.4.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-servlets</artifactId>

Some files were not shown because too many files have changed in this diff Show More