From 40c82a99abf5cd336a66699b3f9297674450b762 Mon Sep 17 00:00:00 2001
From: Simone Bordet <simone.bordet@gmail.com>
Date: Wed, 16 Apr 2014 11:06:34 +0200
Subject: [PATCH] Added profile in the main pom.xml to build with JDK 7u55.
 Added new NPN module files for  JDK 7u55, referencing the new NPN version
 required by JDK 7u55.

---
 .../src/main/config/modules/npn/npn-1.7.0_55.mod     |  9 +++++++++
 .../usecases/home/modules/npn/npn-1.7.0_55.mod       |  9 +++++++++
 pom.xml                                              | 12 ++++++++++++
 3 files changed, 30 insertions(+)
 create mode 100644 jetty-spdy/spdy-http-server/src/main/config/modules/npn/npn-1.7.0_55.mod
 create mode 100644 jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_55.mod

diff --git a/jetty-spdy/spdy-http-server/src/main/config/modules/npn/npn-1.7.0_55.mod b/jetty-spdy/spdy-http-server/src/main/config/modules/npn/npn-1.7.0_55.mod
new file mode 100644
index 00000000000..06387a2bbf6
--- /dev/null
+++ b/jetty-spdy/spdy-http-server/src/main/config/modules/npn/npn-1.7.0_55.mod
@@ -0,0 +1,9 @@
+[name]
+npn-boot
+
+[files]
+http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.7.v20140316/npn-boot-1.1.7.v20140316.jar:lib/npn/npn-boot-1.1.7.v20140316.jar
+
+[ini-template]
+--exec
+-Xbootclasspath/p:lib/npn/npn-boot-1.1.7.v20140316.jar
diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_55.mod b/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_55.mod
new file mode 100644
index 00000000000..06387a2bbf6
--- /dev/null
+++ b/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_55.mod
@@ -0,0 +1,9 @@
+[name]
+npn-boot
+
+[files]
+http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.7.v20140316/npn-boot-1.1.7.v20140316.jar:lib/npn/npn-boot-1.1.7.v20140316.jar
+
+[ini-template]
+--exec
+-Xbootclasspath/p:lib/npn/npn-boot-1.1.7.v20140316.jar
diff --git a/pom.xml b/pom.xml
index b8ef433c27b..e0b06dd210c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -936,6 +936,18 @@
         <npn.version>1.1.6.v20130911</npn.version>
       </properties>
     </profile>
+    <profile>
+      <id>7u55</id>
+      <activation>
+        <property>
+          <name>java.version</name>
+          <value>1.7.0_55</value>
+        </property>
+      </activation>
+      <properties>
+        <npn.version>1.1.7.v20140316</npn.version>
+      </properties>
+    </profile>
   </profiles>
 </project>