Emmanuel Bourg · Emmanuel Bourg · Emmanuel Bourg · Emmanuel Bourg · Emmanuel Bourg · 0423416c
--- a/VERSION.txt
+++ b/VERSION.txt
+jetty-9.2.26.v20180806 - 06 August 2018
+ + 2777 Workaround for Conscrypt's ssl == null
+
 jetty-9.2.25.v20180606 - 06 June 2018
 + 2114 Fix NPE in JettyHttpServerProvider
 + 2135 Android 8.1 needs direct buffers for SSL/TLS to work

--- a/aggregates/jetty-all/pom.xml
+++ b/aggregates/jetty-all/pom.xml
@@ -2,7 +2,7 @@
  <parent>
    <groupId>org.eclipse.jetty</groupId>
    <artifactId>jetty-project</artifactId>
-    <version>9.2.25.v20180606</version>
+    <version>9.2.26.v20180806</version>
    <relativePath>../../pom.xml</relativePath>
  </parent>
  <modelVersion>4.0.0</modelVersion>

--- a/apache-jsp/pom.xml
+++ b/apache-jsp/pom.xml
@@ -2,7 +2,7 @@
  <parent>
    <groupId>org.eclipse.jetty</groupId>
    <artifactId>jetty-project</artifactId>
-    <version>9.2.25.v20180606</version>
+    <version>9.2.26.v20180806</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <artifactId>apache-jsp</artifactId>

--- a/apache-jstl/pom.xml
+++ b/apache-jstl/pom.xml
@@ -2,7 +2,7 @@
  <parent>
    <groupId>org.eclipse.jetty</groupId>
    <artifactId>jetty-project</artifactId>
-    <version>9.2.25.v20180606</version>
+    <version>9.2.26.v20180806</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <artifactId>apache-jstl</artifactId>

--- a/debian/changelog
+++ b/debian/changelog
+jetty9 (9.2.26-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release
+  * Fixed the Maven rule for tomcat-jaspic-api (Closes: #907147)
+  * Standards-Version updated to 4.2.1
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Wed, 05 Sep 2018 13:11:13 +0200
+
 jetty9 (9.2.25-1) unstable; urgency=medium

  * Team upload.

--- a/debian/control
+++ b/debian/control
@@ -21,10 +21,10 @@ Build-Depends: ant-optional,
               libspring-beans-java,
               libtaglibs-standard-spec-java,
               libtaglibs-standard-impl-java,
-               libtomcat8-java (>= 8.5),
+               libtomcat8-java (>= 8.5.32-2~),
               maven-debian-helper (>= 2.2.8~),
               maven-repo-helper
-Standards-Version: 4.1.4
+Standards-Version: 4.2.1
 Vcs-Git: https://salsa.debian.org/java-team/jetty9.git
 Vcs-Browser: https://salsa.debian.org/java-team/jetty9
 Homepage: http://www.eclipse.org/jetty/

--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -8,7 +8,7 @@ s/javax.transaction/org.apache.geronimo.specs/ s/javax.transaction-api/geronimo-
 junit junit * s/4\..*/4.x/ * *
 org.apache.felix maven-bundle-plugin * s/.*/2.3.5/ * *
 s/org.eclipse.jetty.orbit/com.sun.mail/ s/javax.mail.glassfish/javax.mail/ jar s/.*/debian/ * *
-s/org.eclipse.jetty.orbit/org.apache.tomcat/ s/javax.security.auth.message/tomcat-jaspic-api/ jar s/.*/debian/ * *
+s/org.eclipse.jetty.orbit/org.apache.tomcat/ s/javax.security.auth.message/tomcat-jaspic-api/ jar s/.*/8.x/ * *

 s/org.eclipse.jetty.orbit/org.apache.tomcat/ s/org.apache.jasper.glassfish/tomcat-jasper/ jar s/.*/debian/ * *
 s/org.mortbay.jasper/org.apache.tomcat/ s/apache-jsp/tomcat-jasper/ * s/.*/8.x/ * *

--- a/examples/async-rest/async-rest-jar/pom.xml
+++ b/examples/async-rest/async-rest-jar/pom.xml
@@ -2,7 +2,7 @@
  <parent>
    <groupId>org.eclipse.jetty</groupId>
    <artifactId>example-async-rest</artifactId>
-    <version>9.2.25.v20180606</version>
+    <version>9.2.26.v20180806</version>
  </parent>  
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.eclipse.jetty.example-async-rest</groupId>

--- a/examples/async-rest/async-rest-webapp/pom.xml
+++ b/examples/async-rest/async-rest-webapp/pom.xml
@@ -2,7 +2,7 @@
  <parent>
    <groupId>org.eclipse.jetty</groupId>
    <artifactId>example-async-rest</artifactId>
-    <version>9.2.25.v20180606</version>
+    <version>9.2.26.v20180806</version>
  </parent>  
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.eclipse.jetty.example-async-rest</groupId>

--- a/examples/async-rest/pom.xml
+++ b/examples/async-rest/pom.xml
@@ -2,7 +2,7 @@
  <parent>
    <groupId>org.eclipse.jetty.examples</groupId>
    <artifactId>examples-parent</artifactId>
-    <version>9.2.25.v20180606</version>
+    <version>9.2.26.v20180806</version>
    <relativePath>../pom.xml</relativePath>
  </parent>  
  <modelVersion>4.0.0</modelVersion>

--- a/examples/embedded/pom.xml
+++ b/examples/embedded/pom.xml
@@ -2,7 +2,7 @@
  <parent>
    <groupId>org.eclipse.jetty.examples</groupId>
    <artifactId>examples-parent</artifactId>
-    <version>9.2.25.v20180606</version>
+    <version>9.2.26.v20180806</version>
    <relativePath>../pom.xml</relativePath>
  </parent>
  <modelVersion>4.0.0</modelVersion>

--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -21,7 +21,7 @@
  <parent>
    <groupId>org.eclipse.jetty</groupId>
    <artifactId>jetty-project</artifactId>
-    <version>9.2.25.v20180606</version>
+    <version>9.2.26.v20180806</version>
    <relativePath>../pom.xml</relativePath>
  </parent>
  <groupId>org.eclipse.jetty.examples</groupId>

--- a/jetty-alpn/jetty-alpn-client/pom.xml
+++ b/jetty-alpn/jetty-alpn-client/pom.xml
@@ -2,7 +2,7 @@
  <parent>
    <groupId>org.eclipse.jetty</groupId>
    <artifactId>jetty-alpn-parent</artifactId>
-    <version>9.2.25.v20180606</version>
+    <version>9.2.26.v20180806</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <artifactId>jetty-alpn-client</artifactId>

--- a/jetty-alpn/jetty-alpn-server/pom.xml
+++ b/jetty-alpn/jetty-alpn-server/pom.xml
@@ -2,7 +2,7 @@
  <parent>
    <groupId>org.eclipse.jetty</groupId>
    <artifactId>jetty-alpn-parent</artifactId>
-    <version>9.2.25.v20180606</version>
+    <version>9.2.26.v20180806</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <artifactId>jetty-alpn-server</artifactId>

--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.8.0_181.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.8.0_181.mod
+[name]
+protonego-boot
+
+[files]
+http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.12.v20180117/alpn-boot-8.1.12.v20180117.jar|lib/alpn/alpn-boot-8.1.12.v20180117.jar
+
+[exec]
+-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.12.v20180117.jar
--- a/jetty-alpn/pom.xml
+++ b/jetty-alpn/pom.xml
@@ -2,7 +2,7 @@
  <parent>
    <groupId>org.eclipse.jetty</groupId>
    <artifactId>jetty-project</artifactId>
-    <version>9.2.25.v20180606</version>
+    <version>9.2.26.v20180806</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <artifactId>jetty-alpn-parent</artifactId>

--- 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>9.2.25.v20180606</version>
+    <version>9.2.26.v20180806</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <artifactId>jetty-annotations</artifactId>

--- a/jetty-ant/pom.xml
+++ b/jetty-ant/pom.xml
@@ -2,7 +2,7 @@
  <parent>
    <groupId>org.eclipse.jetty</groupId>
    <artifactId>jetty-project</artifactId>
-    <version>9.2.25.v20180606</version>
+    <version>9.2.26.v20180806</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <artifactId>jetty-ant</artifactId>

--- a/jetty-cdi/pom.xml
+++ b/jetty-cdi/pom.xml
@@ -2,7 +2,7 @@
  <parent>
    <groupId>org.eclipse.jetty</groupId>
    <artifactId>jetty-project</artifactId>
-    <version>9.2.25.v20180606</version>
+    <version>9.2.26.v20180806</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <artifactId>jetty-cdi</artifactId>

--- 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>9.2.25.v20180606</version>
+    <version>9.2.26.v20180806</version>
  </parent>

  <modelVersion>4.0.0</modelVersion>