Merge branch 'jetty-9.3.x'

11 files changed, 20 insertions, 5 deletions

diff --git a/VERSION.txt b/VERSION.txt
index d63ae5a19c..643741997a 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1,5 +1,20 @@
 jetty-9.4.0-SNAPSHOT
 
+jetty-9.3.7.RC1 - 13 January 2016
+ + 481986 Dead JSR 356 Server Session still being tracked after
+   Session/Connection closure
+ + 484616 Outdated version of javaee_web_services_client_1_2.xsd
+ + 485031 two PathWatcher threads running after automatically restarting webapp
+ + 485063 After stopping JettyWebAppContext, it still contains reference to old
+   WebAppClassLoader via ServerContainer bean
+ + 485064 HashSessionManager leaks ScheduledExecutorScheduler with reference to
+   un-deployed webapp
+ + 485376 Multiple charset attributes in Content-Type
+ + 485535 jetty.sh results in FAILED when running service restart
+ + 485663 NullPointerException in WebSocketSession during upgrade with DEBUG
+   logging
+ + 485712 Quickstart web.xml is absolute
+
 jetty-9.3.7.RC0 - 05 January 2016
  + 458745 Async ISE in async Echo
  + 481567 permessage-deflate causing data-dependent ju.zip.DataFormatException:
diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
index 9878feb1ce..f68e7294c9 100644
--- a/jetty-distribution/pom.xml
+++ b/jetty-distribution/pom.xml
@@ -785,7 +785,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.gcloud</groupId>
-      <artifactId>gcloud-session-manager</artifactId>
+      <artifactId>jetty-gcloud-session-manager</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
diff --git a/jetty-gcloud/gcloud-session-manager/pom.xml b/jetty-gcloud/jetty-gcloud-session-manager/pom.xml
index 5110e61e4d..3953a5a9c3 100644
--- a/jetty-gcloud/gcloud-session-manager/pom.xml
+++ b/jetty-gcloud/jetty-gcloud-session-manager/pom.xml
@@ -7,7 +7,7 @@
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>gcloud-session-manager</artifactId>
+  <artifactId>jetty-gcloud-session-manager</artifactId>
   <name>Jetty :: GCloud :: Session Manager</name>
 
   <dependencies>
diff --git a/jetty-gcloud/gcloud-session-manager/src/main/config/etc/jetty-gcloud-sessions.xml b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/jetty-gcloud-sessions.xml
index b1b9a844db..b1b9a844db 100644
--- a/jetty-gcloud/gcloud-session-manager/src/main/config/etc/jetty-gcloud-sessions.xml
+++ b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/jetty-gcloud-sessions.xml
diff --git a/jetty-gcloud/gcloud-session-manager/src/main/config/modules/gcloud-sessions.mod b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud-sessions.mod
index 3a6aaef03a..6bd5e67538 100644
--- a/jetty-gcloud/gcloud-session-manager/src/main/config/modules/gcloud-sessions.mod
+++ b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud-sessions.mod
@@ -40,7 +40,7 @@ maven://com.google.api-client/google-api-client/1.15.0-rc|lib/gcloud/google-api-
 maven://com.google.apis/google-api-services-datastore/v1beta2-rev23-1.19.0|lib/gcloud/google-api-services-datastore-v1beta2-rev23-1.19.0.jar
 
 [lib]
-lib/gcloud-session-manager-${jetty.version}.jar
+lib/jetty-gcloud-session-manager-${jetty.version}.jar
 lib/gcloud/*.jar
 
 [xml]
diff --git a/jetty-gcloud/gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudConfiguration.java b/jetty-gcloud/jetty-gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudConfiguration.java
index 9dc103581b..9dc103581b 100644
--- a/jetty-gcloud/gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudConfiguration.java
+++ b/jetty-gcloud/jetty-gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudConfiguration.java
diff --git a/jetty-gcloud/gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudSessionIdManager.java b/jetty-gcloud/jetty-gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudSessionIdManager.java
index 7c2a81e107..7c2a81e107 100644
--- a/jetty-gcloud/gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudSessionIdManager.java
+++ b/jetty-gcloud/jetty-gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudSessionIdManager.java
diff --git a/jetty-gcloud/gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudSessionManager.java b/jetty-gcloud/jetty-gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudSessionManager.java
index c38b2b867b..c38b2b867b 100644
--- a/jetty-gcloud/gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudSessionManager.java
+++ b/jetty-gcloud/jetty-gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudSessionManager.java
diff --git a/jetty-gcloud/gcloud-session-manager/src/test/java/org/eclipse/jetty/gcloud/session/GCloudSessionTester.java b/jetty-gcloud/jetty-gcloud-session-manager/src/test/java/org/eclipse/jetty/gcloud/session/GCloudSessionTester.java
index ac58dd4b4c..ac58dd4b4c 100644
--- a/jetty-gcloud/gcloud-session-manager/src/test/java/org/eclipse/jetty/gcloud/session/GCloudSessionTester.java
+++ b/jetty-gcloud/jetty-gcloud-session-manager/src/test/java/org/eclipse/jetty/gcloud/session/GCloudSessionTester.java
diff --git a/jetty-gcloud/pom.xml b/jetty-gcloud/pom.xml
index 75d9bad29d..3d571b8a56 100644
--- a/jetty-gcloud/pom.xml
+++ b/jetty-gcloud/pom.xml
@@ -17,7 +17,7 @@
   </properties>
 
   <modules>
-    <module>gcloud-session-manager</module>
+    <module>jetty-gcloud-session-manager</module>
   </modules>
 
 </project>
diff --git a/tests/test-sessions/test-gcloud-sessions/pom.xml b/tests/test-sessions/test-gcloud-sessions/pom.xml
index 6ea0c976c7..d64e0cd077 100644
--- a/tests/test-sessions/test-gcloud-sessions/pom.xml
+++ b/tests/test-sessions/test-gcloud-sessions/pom.xml
@@ -54,7 +54,7 @@
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty.gcloud</groupId>
-            <artifactId>gcloud-session-manager</artifactId>
+            <artifactId>jetty-gcloud-session-manager</artifactId>
             <version>${project.version}</version>
          </dependency>
     <dependency>