Merged branch 'master' into 'jetty-9.1'.

2013-09-11 09:16:39 +02:00 · 2013-09-11 09:16:39 +02:00 · c49ba7bdcc
parent aa9aea00be 9910db17cb
commit c49ba7bdcc
1 changed files with 12 additions and 0 deletions
--- a/jetty-spdy/pom.xml
+++ b/jetty-spdy/pom.xml
@ -113,6 +113,18 @@
                <npn.version>1.1.5.v20130313</npn.version>
            </properties>
        </profile>
+        <profile>
+           <id>7u40</id>
+            <activation>
+                <property>
+                    <name>java.version</name>
+                    <value>1.7.0_40</value>
+                </property>
+            </activation>
+            <properties>
+                <npn.version>1.1.6.v20130911</npn.version>
+            </properties>
+        </profile>
    </profiles>

    <modules>