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

2013-10-17 15:07:54 +02:00 · 2013-10-17 15:07:54 +02:00 · 0d8956cad8
parent 591cf9badf 0b673393c3
commit 0d8956cad8
1 changed files with 13 additions and 1 deletions
--- a/pom.xml
+++ b/pom.xml
@ -900,6 +900,18 @@
                <npn.version>1.1.6.v20130911</npn.version>
            </properties>
        </profile>
+        <profile>
+           <id>7u45</id>
+            <activation>
+                <property>
+                    <name>java.version</name>
+                    <value>1.7.0_45</value>
+                </property>
+            </activation>
+            <properties>
+                <npn.version>1.1.6.v20130911</npn.version>
+            </properties>
+        </profile>
  </profiles>
 </project>