From 5f913ad5407a44dac179df62e3d16ef85bb164a1 Mon Sep 17 00:00:00 2001
From: Xavier Fournet <xavier.fournet@gmail.com>
Date: Tue, 15 Dec 2015 17:25:19 +0100
Subject: [PATCH] FELIX-5140 Update to Jetty 9.2.14.v20151106

---
 http/parent/pom.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/http/parent/pom.xml b/http/parent/pom.xml
index 29289a30012..7a9d01c9be3 100755
--- a/http/parent/pom.xml
+++ b/http/parent/pom.xml
@@ -6,9 +6,9 @@
     to you under the Apache License, Version 2.0 (the
     "License"); you may not use this file except in compliance
     with the License.  You may obtain a copy of the License at
-    
+
     http://www.apache.org/licenses/LICENSE-2.0
-    
+
     Unless required by applicable law or agreed to in writing,
     software distributed under the License is distributed on an
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -39,14 +39,14 @@
 
     <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>
         <!--
             Java API and class file compliance. This property supports
             one of three values:
               - 6: Java 6 (default)
-              - 7: Java 7 
+              - 7: Java 7
             Using anything else causes the set-bundle-required-execution-environment
             to fail the build with an exception
         -->
@@ -86,7 +86,7 @@
                             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                             <Bundle-Version>${project.version}</Bundle-Version>
                             <Bundle-RequiredExecutionEnvironment>${felix.bree}</Bundle-RequiredExecutionEnvironment>
-                        </instructions>                        
+                        </instructions>
                     </configuration>
                 </plugin>
             </plugins>
@@ -125,7 +125,7 @@
                 <artifactId>osgi.annotation</artifactId>
                 <version>6.0.1</version>
                 <scope>provided</scope>
-            </dependency>        
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>