diff options
| author | Jesse McConnell | 2012-05-24 13:59:42 +0000 |
|---|---|---|
| committer | Jesse McConnell | 2012-05-24 13:59:42 +0000 |
| commit | 87617a6d13a1a11881c83c4d42ea102a9baf5135 (patch) | |
| tree | bf853d3de1955b3480ea5365d573b934a9d91279 | |
| parent | 1eb73bae2dd14ab4cb086bce4645ac19334a98d0 (diff) | |
| parent | c8fe38733fc65c9d7ef6090338d77b3075e82b82 (diff) | |
| download | org.eclipse.jetty.project-87617a6d13a1a11881c83c4d42ea102a9baf5135.tar.gz org.eclipse.jetty.project-87617a6d13a1a11881c83c4d42ea102a9baf5135.tar.xz org.eclipse.jetty.project-87617a6d13a1a11881c83c4d42ea102a9baf5135.zip | |
Merge branch 'master' into release
75 files changed, 133 insertions, 111 deletions
diff --git a/VERSION.txt b/VERSION.txt index 6f720ef02d..0f63fb5e6b 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,33 +1,4 @@ -jetty-7.6.5-SNAPSHOT - -jetty-7.6.4.v20120522 - 22 May 2012 - + 367608 ignore the aysncrequestreadtest as it is known to fail and is waiting - for a fix - + 371853 Support bundleentry: protocol for webapp embedded as directory in - osgi bundle - + 373620 Add ch.qos.logback.access.jetty to the Import-Package for - jetty-osgi-boot-logback bundle - + 376152 apply context resources recursively - + 376801 Make JAAS login modules useable without jetty infrastructure - + 377391 Manifest updates to jetty-osgi-boot-logback - + 377492 NPE when deploying a Web Application Bundle with unresolved - Require-TldBundle - + 377550 set charset when content type is set - + 377587 ConnectHandler write will block on partial write - + 377610 New session not timed out if an old session is invalidated in scope - of same request - + 377709 Support for RequestParameterCallback missing - + 378242 Re-extract war on restart if incomplete extraction - + 378273 Remove default Bundle-Localization header - + 378487 Null out contextPath on Request.recycle - + 379015 Use factored jetty xml config files for defaults - + 379089 DefaultServlet ignores its resourceBase and uses context's - ResourceCollection when listing diretories - + 379194 ProxyServlet enhancement to enable easy creation of alternative - HttpClient implementations - + 380034 last modified times taken from JarEntry for JarFile resources - + 380212 Clear buffer if parsing fails due to full buffer - + 380222 JettyPolicyRuntimeTest failure +jetty-7.6.4-SNAPSHOT jetty-7.6.3.v20120416 - 16 April 2012 + 367172 Remove detection for slf4j NOPLogger diff --git a/example-jetty-embedded/pom.xml b/example-jetty-embedded/pom.xml index 49b6f185ff..c15912269d 100644 --- a/example-jetty-embedded/pom.xml +++ b/example-jetty-embedded/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>example-jetty-embedded</artifactId> diff --git a/jetty-aggregate/jetty-all-server/pom.xml b/jetty-aggregate/jetty-all-server/pom.xml index 87fb9c21ef..c24044396a 100644 --- a/jetty-aggregate/jetty-all-server/pom.xml +++ b/jetty-aggregate/jetty-all-server/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.eclipse.jetty.aggregate</groupId> <artifactId>jetty-aggregate-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-all-server</artifactId> diff --git a/jetty-aggregate/jetty-all/pom.xml b/jetty-aggregate/jetty-all/pom.xml index f0df1efb89..656d2e16a9 100644 --- a/jetty-aggregate/jetty-all/pom.xml +++ b/jetty-aggregate/jetty-all/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.eclipse.jetty.aggregate</groupId> <artifactId>jetty-aggregate-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-all</artifactId> diff --git a/jetty-aggregate/jetty-client/pom.xml b/jetty-aggregate/jetty-client/pom.xml index 75feea5ec6..e7a1a09e64 100644 --- a/jetty-aggregate/jetty-client/pom.xml +++ b/jetty-aggregate/jetty-client/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty.aggregate</groupId> <artifactId>jetty-aggregate-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-client</artifactId> diff --git a/jetty-aggregate/jetty-plus/pom.xml b/jetty-aggregate/jetty-plus/pom.xml index 1d00a213ae..f9e28d6a12 100644 --- a/jetty-aggregate/jetty-plus/pom.xml +++ b/jetty-aggregate/jetty-plus/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty.aggregate</groupId> <artifactId>jetty-aggregate-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-plus</artifactId> diff --git a/jetty-aggregate/jetty-server/pom.xml b/jetty-aggregate/jetty-server/pom.xml index 9c0cfbdcbb..15f152b926 100644 --- a/jetty-aggregate/jetty-server/pom.xml +++ b/jetty-aggregate/jetty-server/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty.aggregate</groupId> <artifactId>jetty-aggregate-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-server</artifactId> diff --git a/jetty-aggregate/jetty-servlet/pom.xml b/jetty-aggregate/jetty-servlet/pom.xml index f866c2a2fd..54f2391d6e 100644 --- a/jetty-aggregate/jetty-servlet/pom.xml +++ b/jetty-aggregate/jetty-servlet/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty.aggregate</groupId> <artifactId>jetty-aggregate-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-servlet</artifactId> diff --git a/jetty-aggregate/jetty-webapp/pom.xml b/jetty-aggregate/jetty-webapp/pom.xml index 1703390fa5..c6e66ac80c 100644 --- a/jetty-aggregate/jetty-webapp/pom.xml +++ b/jetty-aggregate/jetty-webapp/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty.aggregate</groupId> <artifactId>jetty-aggregate-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-webapp</artifactId> diff --git a/jetty-aggregate/jetty-websocket/pom.xml b/jetty-aggregate/jetty-websocket/pom.xml index ce1e034184..233e9d0172 100644 --- a/jetty-aggregate/jetty-websocket/pom.xml +++ b/jetty-aggregate/jetty-websocket/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty.aggregate</groupId> <artifactId>jetty-aggregate-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-websocket</artifactId> diff --git a/jetty-aggregate/pom.xml b/jetty-aggregate/pom.xml index 4dd94ad4aa..bd1452e40d 100644 --- a/jetty-aggregate/pom.xml +++ b/jetty-aggregate/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <groupId>org.eclipse.jetty.aggregate</groupId> <artifactId>jetty-aggregate-project</artifactId> diff --git a/jetty-ajp/pom.xml b/jetty-ajp/pom.xml index fb02708470..842231e5db 100644 --- a/jetty-ajp/pom.xml +++ b/jetty-ajp/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-ajp</artifactId> diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml index 6163d20f0f..6b82edee45 100644 --- a/jetty-annotations/pom.xml +++ b/jetty-annotations/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-annotations</artifactId> diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml index 878073e5b7..04b0d6dbfd 100644 --- a/jetty-client/pom.xml +++ b/jetty-client/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/jetty-continuation/pom.xml b/jetty-continuation/pom.xml index c820386412..f6718db861 100644 --- a/jetty-continuation/pom.xml +++ b/jetty-continuation/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-continuation</artifactId> diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml index de274f3fa2..ade37a8175 100644 --- a/jetty-deploy/pom.xml +++ b/jetty-deploy/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-deploy</artifactId> diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml index df5a7e227a..6be2b881c5 100644 --- a/jetty-distribution/pom.xml +++ b/jetty-distribution/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <artifactId>jetty-distribution</artifactId> <name>Jetty :: Distribution Assemblies</name> diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml index ed5eccb6f0..6c8f97b51c 100644 --- a/jetty-http-spi/pom.xml +++ b/jetty-http-spi/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-http-spi</artifactId> diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml index 273a6788b6..65fba1c430 100644 --- a/jetty-http/pom.xml +++ b/jetty-http/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>jetty-project</artifactId> <groupId>org.eclipse.jetty</groupId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-http</artifactId> diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml index bdb887567d..dd0e80447b 100644 --- a/jetty-io/pom.xml +++ b/jetty-io/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>jetty-project</artifactId> <groupId>org.eclipse.jetty</groupId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-io</artifactId> diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java b/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java index ca182eadde..a6f77729c6 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java @@ -283,12 +283,18 @@ public class SelectChannelEndPoint extends ChannelEndPoint implements AsyncEndPo if (idleTimestamp!=0 && _maxIdleTime>0) { - long idleForMs=now-idleTimestamp; + final long idleForMs=now-idleTimestamp; if (idleForMs>_maxIdleTime) { - onIdleExpired(idleForMs); - _idleTimestamp=now; + _manager.dispatch(new Runnable() + { + public void run() + { + onIdleExpired(idleForMs); + _idleTimestamp=System.currentTimeMillis(); + } + }); } } } diff --git a/jetty-io/src/test/java/org/eclipse/jetty/io/nio/SelectChannelEndPointTest.java b/jetty-io/src/test/java/org/eclipse/jetty/io/nio/SelectChannelEndPointTest.java index 3b781cd327..47e5f7daf5 100644 --- a/jetty-io/src/test/java/org/eclipse/jetty/io/nio/SelectChannelEndPointTest.java +++ b/jetty-io/src/test/java/org/eclipse/jetty/io/nio/SelectChannelEndPointTest.java @@ -5,6 +5,7 @@ import static org.hamcrest.Matchers.greaterThan; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import java.io.BufferedInputStream; @@ -24,6 +25,7 @@ import org.eclipse.jetty.io.AsyncEndPoint; import org.eclipse.jetty.io.ConnectedEndPoint; import org.eclipse.jetty.io.EndPoint; import org.eclipse.jetty.util.thread.QueuedThreadPool; +import org.hamcrest.Matchers; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -360,17 +362,17 @@ public class SelectChannelEndPointTest int b=client.getInputStream().read(); assertEquals(-1,b); long idle=System.currentTimeMillis()-start; - assertTrue(idle>400); - assertTrue(idle<2000); - - // But endpoint is still open. - assertTrue(_lastEndp.isOpen()); + assertThat(idle,Matchers.greaterThan(400L)); + assertThat(idle,Matchers.lessThan(3000L)); + if (_lastEndp.isOpen()) + { + // half close so wait another idle period + assertTrue(_lastEndp.isOutputShutdown()); + Thread.sleep(2000); + } - // Wait for another idle callback - Thread.sleep(2000); // endpoint is closed. - assertFalse(_lastEndp.isOpen()); } diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml index a65a529016..963500727e 100644 --- a/jetty-jaspi/pom.xml +++ b/jetty-jaspi/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-jaspi</artifactId> diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml index c109a0ebb7..21e9ad1023 100644 --- a/jetty-jmx/pom.xml +++ b/jetty-jmx/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-jmx</artifactId> diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml index e9db91778e..071c17397a 100644 --- a/jetty-jndi/pom.xml +++ b/jetty-jndi/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-jndi</artifactId> diff --git a/jetty-jsp/pom.xml b/jetty-jsp/pom.xml index 2a57dcdfb2..0730264312 100644 --- a/jetty-jsp/pom.xml +++ b/jetty-jsp/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-jsp</artifactId> diff --git a/jetty-monitor/pom.xml b/jetty-monitor/pom.xml index d8b0479c0f..098733f136 100644 --- a/jetty-monitor/pom.xml +++ b/jetty-monitor/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-monitor</artifactId> diff --git a/jetty-nested/pom.xml b/jetty-nested/pom.xml index 1ed8c94dd2..794e7d7972 100644 --- a/jetty-nested/pom.xml +++ b/jetty-nested/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <artifactId>jetty-nested</artifactId> <name>Jetty :: Nested</name> diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml index 37f5ad162d..03cb5ea46a 100644 --- a/jetty-nosql/pom.xml +++ b/jetty-nosql/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-nosql</artifactId> diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml index 6b8c5fe6ad..bee9bed4ef 100644 --- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty.osgi</groupId> <artifactId>jetty-osgi-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/jetty-osgi/jetty-osgi-boot-logback/pom.xml b/jetty-osgi/jetty-osgi-boot-logback/pom.xml index a9df7b0f4a..fe248eb72b 100644 --- a/jetty-osgi/jetty-osgi-boot-logback/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-logback/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty.osgi</groupId> <artifactId>jetty-osgi-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml index df266b2923..95a494ab95 100644 --- a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty.osgi</groupId> <artifactId>jetty-osgi-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/jetty-osgi/jetty-osgi-boot/pom.xml b/jetty-osgi/jetty-osgi-boot/pom.xml index 3083ed6d13..884816ebba 100644 --- a/jetty-osgi/jetty-osgi-boot/pom.xml +++ b/jetty-osgi/jetty-osgi-boot/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty.osgi</groupId> <artifactId>jetty-osgi-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/jetty-osgi/jetty-osgi-equinoxtools/pom.xml b/jetty-osgi/jetty-osgi-equinoxtools/pom.xml index e1a90d1af3..f7a2a05a6f 100644 --- a/jetty-osgi/jetty-osgi-equinoxtools/pom.xml +++ b/jetty-osgi/jetty-osgi-equinoxtools/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty.osgi</groupId> <artifactId>jetty-osgi-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/jetty-osgi/jetty-osgi-httpservice/pom.xml b/jetty-osgi/jetty-osgi-httpservice/pom.xml index a146cce128..a84e59ed65 100644 --- a/jetty-osgi/jetty-osgi-httpservice/pom.xml +++ b/jetty-osgi/jetty-osgi-httpservice/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty.osgi</groupId> <artifactId>jetty-osgi-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml index 45b7b12afa..9f0ce59808 100644 --- a/jetty-osgi/pom.xml +++ b/jetty-osgi/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.eclipse.jetty.osgi</groupId> diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml index bf5116d494..1e792c1463 100644 --- a/jetty-osgi/test-jetty-osgi/pom.xml +++ b/jetty-osgi/test-jetty-osgi/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty.osgi</groupId> <artifactId>jetty-osgi-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/jetty-overlay-deployer/pom.xml b/jetty-overlay-deployer/pom.xml index ec829d9dd0..6d8bd25e02 100644 --- a/jetty-overlay-deployer/pom.xml +++ b/jetty-overlay-deployer/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-overlay-deployer</artifactId> diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml index a72fcd0f31..ca5b0747f1 100644 --- a/jetty-plus/pom.xml +++ b/jetty-plus/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-plus</artifactId> diff --git a/jetty-policy/pom.xml b/jetty-policy/pom.xml index d264981bf6..e0c9ca78e2 100644 --- a/jetty-policy/pom.xml +++ b/jetty-policy/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <artifactId>jetty-policy</artifactId> <name>Jetty :: Policy Tool</name> diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml index 6663495d9b..062bc9db4e 100644 --- a/jetty-rewrite/pom.xml +++ b/jetty-rewrite/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-rewrite</artifactId> diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml index f37c531e0d..03892990d7 100644 --- a/jetty-security/pom.xml +++ b/jetty-security/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-security</artifactId> diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java index c21768fde1..dcd91498f3 100644 --- a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java +++ b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java @@ -77,6 +77,7 @@ public class FormAuthenticator extends LoginAuthenticator private String _formLoginPage; private String _formLoginPath; private boolean _dispatch; + private boolean _alwaysSaveUri; public FormAuthenticator() { @@ -95,6 +96,26 @@ public class FormAuthenticator extends LoginAuthenticator /* ------------------------------------------------------------ */ /** + * If true, uris that cause a redirect to a login page will always + * be remembered. If false, only the first uri that leads to a login + * page redirect is remembered. + * See https://bugs.eclipse.org/bugs/show_bug.cgi?id=379909 + * @param alwaysSave + */ + public void setAlwaysSaveUri (boolean alwaysSave) + { + _alwaysSaveUri = alwaysSave; + } + + + /* ------------------------------------------------------------ */ + public boolean getAlwaysSaveUri () + { + return _alwaysSaveUri; + } + + /* ------------------------------------------------------------ */ + /** * @see org.eclipse.jetty.security.authentication.LoginAuthenticator#setConfiguration(org.eclipse.jetty.security.Authenticator.AuthConfiguration) */ @Override @@ -279,9 +300,9 @@ public class FormAuthenticator extends LoginAuthenticator // remember the current URI synchronized (session) { - // But only if it is not set already - if (session.getAttribute(__J_URI)==null) - { + // But only if it is not set already, or we save every uri that leads to a login form redirect + if (session.getAttribute(__J_URI)==null || _alwaysSaveUri) + { StringBuffer buf = request.getRequestURL(); if (request.getQueryString() != null) buf.append("?").append(request.getQueryString()); diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml index 00f3e96c0c..47a4ff96d6 100644 --- a/jetty-server/pom.xml +++ b/jetty-server/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-server</artifactId> diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml index 47ef14183b..f68a81a591 100644 --- a/jetty-servlet/pom.xml +++ b/jetty-servlet/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>jetty-project</artifactId> <groupId>org.eclipse.jetty</groupId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-servlet</artifactId> diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml index 7eb2ed147d..552f0d4d39 100644 --- a/jetty-servlets/pom.xml +++ b/jetty-servlets/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>jetty-project</artifactId> <groupId>org.eclipse.jetty</groupId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-servlets</artifactId> diff --git a/jetty-spdy/pom.xml b/jetty-spdy/pom.xml index d40c65db93..eee670770c 100644 --- a/jetty-spdy/pom.xml +++ b/jetty-spdy/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/jetty-spdy/spdy-core/pom.xml b/jetty-spdy/spdy-core/pom.xml index aeac9d6393..a9331322d4 100644 --- a/jetty-spdy/spdy-core/pom.xml +++ b/jetty-spdy/spdy-core/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.eclipse.jetty.spdy</groupId> <artifactId>spdy-parent</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/jetty-spdy/spdy-jetty-http-webapp/pom.xml b/jetty-spdy/spdy-jetty-http-webapp/pom.xml index ae083e13c1..b6b43d8319 100644 --- a/jetty-spdy/spdy-jetty-http-webapp/pom.xml +++ b/jetty-spdy/spdy-jetty-http-webapp/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.eclipse.jetty.spdy</groupId> <artifactId>spdy-parent</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>spdy-jetty-http-webapp</artifactId> diff --git a/jetty-spdy/spdy-jetty-http/pom.xml b/jetty-spdy/spdy-jetty-http/pom.xml index 6b59875b8b..70de14966a 100644 --- a/jetty-spdy/spdy-jetty-http/pom.xml +++ b/jetty-spdy/spdy-jetty-http/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.eclipse.jetty.spdy</groupId> <artifactId>spdy-parent</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>spdy-jetty-http</artifactId> diff --git a/jetty-spdy/spdy-jetty/pom.xml b/jetty-spdy/spdy-jetty/pom.xml index 31a7790f7e..7476bf972e 100644 --- a/jetty-spdy/spdy-jetty/pom.xml +++ b/jetty-spdy/spdy-jetty/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.eclipse.jetty.spdy</groupId> <artifactId>spdy-parent</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>spdy-jetty</artifactId> diff --git a/jetty-start/pom.xml b/jetty-start/pom.xml index 662273d6b6..adde237fae 100644 --- a/jetty-start/pom.xml +++ b/jetty-start/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-start</artifactId> diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml index 4bfb39db73..252ffee9b3 100644 --- a/jetty-util/pom.xml +++ b/jetty-util/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-util</artifactId> diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml index b677ea5556..1fe22fbcd5 100644 --- a/jetty-webapp/pom.xml +++ b/jetty-webapp/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-webapp</artifactId> diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml index b9126299af..5188100893 100644 --- a/jetty-websocket/pom.xml +++ b/jetty-websocket/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>jetty-project</artifactId> <groupId>org.eclipse.jetty</groupId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml index d173f2eb55..aee1a9fa65 100644 --- a/jetty-xml/pom.xml +++ b/jetty-xml/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-xml</artifactId> @@ -6,7 +6,7 @@ <version>19</version> </parent> <artifactId>jetty-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> <name>Jetty :: Project</name> <url>${jetty.url}</url> <packaging>pom</packaging> diff --git a/test-continuation/pom.xml b/test-continuation/pom.xml index 0d274cca9d..4f919a1271 100644 --- a/test-continuation/pom.xml +++ b/test-continuation/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>test-continuation</artifactId> diff --git a/test-jetty-nested/pom.xml b/test-jetty-nested/pom.xml index d931026182..b25512b400 100644 --- a/test-jetty-nested/pom.xml +++ b/test-jetty-nested/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <artifactId>test-jetty-nested</artifactId> <name>Jetty :: Nested Test</name> diff --git a/test-jetty-servlet/pom.xml b/test-jetty-servlet/pom.xml index 69f8ee0b33..a3b5737007 100644 --- a/test-jetty-servlet/pom.xml +++ b/test-jetty-servlet/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>test-jetty-servlet</artifactId> diff --git a/test-jetty-webapp/pom.xml b/test-jetty-webapp/pom.xml index e244453ee0..a3ef0ae684 100644 --- a/test-jetty-webapp/pom.xml +++ b/test-jetty-webapp/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>test-jetty-webapp</artifactId> diff --git a/test-jetty-webapp/src/main/config/contexts/test.xml b/test-jetty-webapp/src/main/config/contexts/test.xml index 3c36173b13..32e5b40584 100644 --- a/test-jetty-webapp/src/main/config/contexts/test.xml +++ b/test-jetty-webapp/src/main/config/contexts/test.xml @@ -61,6 +61,11 @@ detected. --> </New> </Set> + <Set name="authenticator"> + <New class="org.eclipse.jetty.security.authentication.FormAuthenticator"> + <Set name="alwaysSaveUri">true</Set> + </New> + </Set> <Set name="checkWelcomeFiles">true</Set> </Get> diff --git a/test-jetty-webapp/src/main/webapp/WEB-INF/web.xml b/test-jetty-webapp/src/main/webapp/WEB-INF/web.xml index 0c633bd765..f995d0162d 100644 --- a/test-jetty-webapp/src/main/webapp/WEB-INF/web.xml +++ b/test-jetty-webapp/src/main/webapp/WEB-INF/web.xml @@ -268,6 +268,16 @@ <security-constraint> <web-resource-collection> + <web-resource-name>Auth2</web-resource-name> + <url-pattern>/auth2/*</url-pattern> + </web-resource-collection> + <auth-constraint> + <role-name>*</role-name> + </auth-constraint> + </security-constraint> + + <security-constraint> + <web-resource-collection> <web-resource-name>Any User</web-resource-name> <url-pattern>/dump/auth/*</url-pattern> <url-pattern>*.htm</url-pattern> diff --git a/test-jetty-webapp/src/main/webapp/auth.html b/test-jetty-webapp/src/main/webapp/auth.html index 1f64b2bc67..1b1de1157c 100644 --- a/test-jetty-webapp/src/main/webapp/auth.html +++ b/test-jetty-webapp/src/main/webapp/auth.html @@ -12,6 +12,7 @@ This page contains several links to test the authentication constraints: <ul> <li><a href="auth/file.txt">auth/file.txt</a> - Forbidden</li> <li><a href="auth/relax.txt">auth/relax.txt</a> - Allowed</li> +<li><a href="auth2">auth2/index.html</a> - Authenticated (tests FormAuthenticator.setAlwaysSaveUri()) </li> <li><a href="dump/auth/noaccess/info">dump/auth/noaccess/*</a> - Forbidden</li> <li><a href="dump/auth/relax/info">dump/auth/relax/*</a> - Allowed</li> <li><a href="dump/auth/info">dump/auth/*</a> - Authenticated any user</li> diff --git a/test-jetty-webapp/src/main/webapp/auth2/index.html b/test-jetty-webapp/src/main/webapp/auth2/index.html new file mode 100644 index 0000000000..f46164c410 --- /dev/null +++ b/test-jetty-webapp/src/main/webapp/auth2/index.html @@ -0,0 +1,6 @@ +<html> + <body> + <h1>YAY!</h1> + <p>You have successfully authenticated. You can use this url in conjunction with any of the other urls that lead to a login form to test which urls are saved on entry to the login form.</p> + </body> +</html> diff --git a/tests/pom.xml b/tests/pom.xml index 8a0876d42e..aaea5512e7 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <groupId>org.eclipse.jetty.tests</groupId> <artifactId>tests-parent</artifactId> diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml index de349e5013..d0de471efb 100644 --- a/tests/test-integration/pom.xml +++ b/tests/test-integration/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.eclipse.jetty.tests</groupId> <artifactId>tests-parent</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>test-integration</artifactId> diff --git a/tests/test-loginservice/pom.xml b/tests/test-loginservice/pom.xml index 7aaffe15f8..88f150a4ce 100644 --- a/tests/test-loginservice/pom.xml +++ b/tests/test-loginservice/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.eclipse.jetty.tests</groupId> <artifactId>tests-parent</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <artifactId>test-loginservice</artifactId> <name>Jetty Tests :: Login Service</name> diff --git a/tests/test-sessions/pom.xml b/tests/test-sessions/pom.xml index 6375c7c2b1..7ce3782b0c 100644 --- a/tests/test-sessions/pom.xml +++ b/tests/test-sessions/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.eclipse.jetty.tests</groupId> <artifactId>tests-parent</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <artifactId>test-sessions-parent</artifactId> <name>Jetty Tests :: Sessions :: Parent</name> diff --git a/tests/test-sessions/test-hash-sessions/pom.xml b/tests/test-sessions/test-hash-sessions/pom.xml index 36ba5ff195..fc2204d598 100644 --- a/tests/test-sessions/test-hash-sessions/pom.xml +++ b/tests/test-sessions/test-hash-sessions/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.eclipse.jetty.tests</groupId> <artifactId>test-sessions-parent</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <artifactId>test-hash-sessions</artifactId> <name>Jetty Tests :: Sessions :: Hash</name> diff --git a/tests/test-sessions/test-jdbc-sessions/pom.xml b/tests/test-sessions/test-jdbc-sessions/pom.xml index caa2092dba..a980dbd723 100644 --- a/tests/test-sessions/test-jdbc-sessions/pom.xml +++ b/tests/test-sessions/test-jdbc-sessions/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.eclipse.jetty.tests</groupId> <artifactId>test-sessions-parent</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <artifactId>test-jdbc-sessions</artifactId> <name>Jetty Tests :: Sessions :: JDBC</name> diff --git a/tests/test-sessions/test-mongodb-sessions/pom.xml b/tests/test-sessions/test-mongodb-sessions/pom.xml index fecbbb21c6..62856443b3 100644 --- a/tests/test-sessions/test-mongodb-sessions/pom.xml +++ b/tests/test-sessions/test-mongodb-sessions/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.eclipse.jetty.tests</groupId> <artifactId>test-sessions-parent</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <artifactId>test-mongodb-sessions</artifactId> <name>Jetty Tests :: Sessions :: Mongo</name> diff --git a/tests/test-sessions/test-sessions-common/pom.xml b/tests/test-sessions/test-sessions-common/pom.xml index 3c9282b55b..89f2b87388 100644 --- a/tests/test-sessions/test-sessions-common/pom.xml +++ b/tests/test-sessions/test-sessions-common/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.eclipse.jetty.tests</groupId> <artifactId>test-sessions-parent</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <artifactId>test-sessions-common</artifactId> <name>Jetty Tests :: Sessions :: Common</name> diff --git a/tests/test-webapps/pom.xml b/tests/test-webapps/pom.xml index e276950c00..fdcba81b39 100644 --- a/tests/test-webapps/pom.xml +++ b/tests/test-webapps/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.eclipse.jetty.tests</groupId> <artifactId>tests-parent</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <artifactId>test-webapps-parent</artifactId> <name>Jetty Tests :: WebApps :: Parent</name> diff --git a/tests/test-webapps/test-webapp-rfc2616/pom.xml b/tests/test-webapps/test-webapp-rfc2616/pom.xml index 15a04594ff..55800ea2d0 100644 --- a/tests/test-webapps/test-webapp-rfc2616/pom.xml +++ b/tests/test-webapps/test-webapp-rfc2616/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.eclipse.jetty.tests</groupId> <artifactId>test-webapps-parent</artifactId> - <version>7.6.5-SNAPSHOT</version> + <version>7.6.4-SNAPSHOT</version> </parent> <artifactId>test-webapp-rfc2616</artifactId> <name>Jetty Tests :: WebApp :: RFC2616</name> |