Merge remote-tracking branch 'origin/master' into jetty-9.1

2013-06-21 14:52:38 +10:00 · 2013-06-21 14:52:38 +10:00 · f59ef8cfce
parent f9b4636cdb 8d7477218d
commit f59ef8cfce
1 changed files with 14 additions and 0 deletions
--- a/jetty-spdy/pom.xml
+++ b/jetty-spdy/pom.xml
@ -101,6 +101,20 @@
                <npn.version>1.1.5.v20130313</npn.version>
            </properties>
        </profile>
+        <profile>
+           <id>7u25</id>
+            <activation>
+                <property>
+                    <name>java.version</name>
+                    <value>1.7.0_25</value>
+                </property>
+            </activation>
+            <properties>
+                <npn.version>1.1.5.v20130313</npn.version>
+            </properties>
+        </profile>
+     </profiles>
+
    </profiles>

    <modules>