Author: cziegeler
Date: Wed Dec 30 13:39:28 2015
New Revision: 1722330
URL: http://svn.apache.org/viewvc?rev=1722330&view=rev
Log:
FELIX-5140 : Update Jetty to version 9.2.14. Apply patch from Xavier Fournet
Modified:
felix/trunk/http/api/pom.xml
felix/trunk/http/base/pom.xml
felix/trunk/http/bridge/pom.xml
felix/trunk/http/bundle/pom.xml
felix/trunk/http/cometd/pom.xml
felix/trunk/http/itest/pom.xml
felix/trunk/http/jetty/pom.xml
felix/trunk/http/parent/pom.xml
felix/trunk/http/pom.xml
felix/trunk/http/proxy/pom.xml
felix/trunk/http/samples/bridge/pom.xml
felix/trunk/http/samples/cometd/pom.xml
felix/trunk/http/samples/whiteboard/pom.xml
felix/trunk/http/servlet-api/pom.xml
felix/trunk/http/sslfilter/pom.xml
felix/trunk/http/whiteboard/pom.xml
Modified: felix/trunk/http/api/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/http/api/pom.xml?rev=1722330&r1=1722329&r2=1722330&view=diff
==============================================================================
--- felix/trunk/http/api/pom.xml (original)
+++ felix/trunk/http/api/pom.xml Wed Dec 30 13:39:28 2015
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.parent</artifactId>
- <version>7</version>
+ <version>8-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: felix/trunk/http/base/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/http/base/pom.xml?rev=1722330&r1=1722329&r2=1722330&view=diff
==============================================================================
--- felix/trunk/http/base/pom.xml (original)
+++ felix/trunk/http/base/pom.xml Wed Dec 30 13:39:28 2015
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.parent</artifactId>
- <version>7</version>
+ <version>8-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: felix/trunk/http/bridge/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/http/bridge/pom.xml?rev=1722330&r1=1722329&r2=1722330&view=diff
==============================================================================
--- felix/trunk/http/bridge/pom.xml (original)
+++ felix/trunk/http/bridge/pom.xml Wed Dec 30 13:39:28 2015
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.parent</artifactId>
- <version>7</version>
+ <version>8-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: felix/trunk/http/bundle/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/http/bundle/pom.xml?rev=1722330&r1=1722329&r2=1722330&view=diff
==============================================================================
--- felix/trunk/http/bundle/pom.xml (original)
+++ felix/trunk/http/bundle/pom.xml Wed Dec 30 13:39:28 2015
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.parent</artifactId>
- <version>7</version>
+ <version>8-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: felix/trunk/http/cometd/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/http/cometd/pom.xml?rev=1722330&r1=1722329&r2=1722330&view=diff
==============================================================================
--- felix/trunk/http/cometd/pom.xml (original)
+++ felix/trunk/http/cometd/pom.xml Wed Dec 30 13:39:28 2015
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.parent</artifactId>
- <version>7</version>
+ <version>8-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: felix/trunk/http/itest/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/http/itest/pom.xml?rev=1722330&r1=1722329&r2=1722330&view=diff
==============================================================================
--- felix/trunk/http/itest/pom.xml (original)
+++ felix/trunk/http/itest/pom.xml Wed Dec 30 13:39:28 2015
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.parent</artifactId>
- <version>7</version>
+ <version>8-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: felix/trunk/http/jetty/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/http/jetty/pom.xml?rev=1722330&r1=1722329&r2=1722330&view=diff
==============================================================================
--- felix/trunk/http/jetty/pom.xml (original)
+++ felix/trunk/http/jetty/pom.xml Wed Dec 30 13:39:28 2015
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.parent</artifactId>
- <version>7</version>
+ <version>8-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: felix/trunk/http/parent/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/http/parent/pom.xml?rev=1722330&r1=1722329&r2=1722330&view=diff
==============================================================================
--- felix/trunk/http/parent/pom.xml (original)
+++ felix/trunk/http/parent/pom.xml Wed Dec 30 13:39:28 2015
@@ -39,7 +39,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <jetty.version>9.2.12.v20150709</jetty.version>
+ <jetty.version>9.2.14.v20151106</jetty.version>
<cometd.version>2.8.0</cometd.version>
<servlet.version>3.1.0</servlet.version>
<!--
@@ -89,6 +89,42 @@
</instructions>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes combine.children="append">
+ <!-- Used by maven-remote-resources-plugin -->
+
<exclude>src/main/appended-resources/META-INF/*</exclude>
+ <!-- Generated by maven-remote-resources-plugin
-->
+ <exclude>velocity.log</exclude>
+ <!-- don't check anything in target -->
+ <exclude>target/*</exclude>
+ <!-- README files in markdown format -->
+ <exclude>README.md</exclude>
+ <!-- Ignore files generated bei IDE plugins e.g.
maven-eclipse-plugin -->
+ <exclude>maven-eclipse.xml</exclude>
+ <exclude>.*</exclude>
+ <exclude>.*/**</exclude>
+ <!-- Exclude all JSON files -->
+ <exclude>**/*.json</exclude>
+ <!-- Generated for release source archives -->
+ <exclude>DEPENDENCIES</exclude>
+ <!-- .rej files from svn/patch -->
+ <exclude>**/*.rej</exclude>
+ <!-- Exclude Java crash log files -->
+ <exclude>hs_err_*.log</exclude>
+ </excludes>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</pluginManagement>
</build>
Modified: felix/trunk/http/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/http/pom.xml?rev=1722330&r1=1722329&r2=1722330&view=diff
==============================================================================
--- felix/trunk/http/pom.xml (original)
+++ felix/trunk/http/pom.xml Wed Dec 30 13:39:28 2015
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix-parent</artifactId>
- <version>2.1</version>
+ <version>3</version>
<relativePath>../pom/pom.xml</relativePath>
</parent>
@@ -39,7 +39,7 @@
</scm>
<prerequisites>
- <maven>2.2.1</maven>
+ <maven>3.0.5</maven>
</prerequisites>
<modules>
Modified: felix/trunk/http/proxy/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/http/proxy/pom.xml?rev=1722330&r1=1722329&r2=1722330&view=diff
==============================================================================
--- felix/trunk/http/proxy/pom.xml (original)
+++ felix/trunk/http/proxy/pom.xml Wed Dec 30 13:39:28 2015
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.parent</artifactId>
- <version>7</version>
+ <version>8-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: felix/trunk/http/samples/bridge/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/http/samples/bridge/pom.xml?rev=1722330&r1=1722329&r2=1722330&view=diff
==============================================================================
--- felix/trunk/http/samples/bridge/pom.xml (original)
+++ felix/trunk/http/samples/bridge/pom.xml Wed Dec 30 13:39:28 2015
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.parent</artifactId>
- <version>7</version>
+ <version>8-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: felix/trunk/http/samples/cometd/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/http/samples/cometd/pom.xml?rev=1722330&r1=1722329&r2=1722330&view=diff
==============================================================================
--- felix/trunk/http/samples/cometd/pom.xml (original)
+++ felix/trunk/http/samples/cometd/pom.xml Wed Dec 30 13:39:28 2015
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.parent</artifactId>
- <version>7</version>
+ <version>8-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: felix/trunk/http/samples/whiteboard/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/http/samples/whiteboard/pom.xml?rev=1722330&r1=1722329&r2=1722330&view=diff
==============================================================================
--- felix/trunk/http/samples/whiteboard/pom.xml (original)
+++ felix/trunk/http/samples/whiteboard/pom.xml Wed Dec 30 13:39:28 2015
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.parent</artifactId>
- <version>7</version>
+ <version>8-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: felix/trunk/http/servlet-api/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/http/servlet-api/pom.xml?rev=1722330&r1=1722329&r2=1722330&view=diff
==============================================================================
--- felix/trunk/http/servlet-api/pom.xml (original)
+++ felix/trunk/http/servlet-api/pom.xml Wed Dec 30 13:39:28 2015
@@ -14,7 +14,7 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.parent</artifactId>
- <version>7</version>
+ <version>8-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: felix/trunk/http/sslfilter/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/http/sslfilter/pom.xml?rev=1722330&r1=1722329&r2=1722330&view=diff
==============================================================================
--- felix/trunk/http/sslfilter/pom.xml (original)
+++ felix/trunk/http/sslfilter/pom.xml Wed Dec 30 13:39:28 2015
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.parent</artifactId>
- <version>7</version>
+ <version>8-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: felix/trunk/http/whiteboard/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/http/whiteboard/pom.xml?rev=1722330&r1=1722329&r2=1722330&view=diff
==============================================================================
--- felix/trunk/http/whiteboard/pom.xml (original)
+++ felix/trunk/http/whiteboard/pom.xml Wed Dec 30 13:39:28 2015
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.parent</artifactId>
- <version>7</version>
+ <version>8-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
