Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Bartel2013-03-18 03:38:42 +0000
committerJan Bartel2013-03-18 03:38:42 +0000
commit1eea7a2a89b708a159874207e53448128db7c66c (patch)
tree8e7661ee699d4c0b37ff95a239af7eae35d0f474
parent25f5e38e13f78209648276eabbc309801b325e3b (diff)
downloadorg.eclipse.jetty.project-1eea7a2a89b708a159874207e53448128db7c66c.tar.gz
org.eclipse.jetty.project-1eea7a2a89b708a159874207e53448128db7c66c.tar.xz
org.eclipse.jetty.project-1eea7a2a89b708a159874207e53448128db7c66c.zip
Update to build with jdk1.7 which requires npn-boot jar v 1.1.5, and npn-api 1.1.0
-rw-r--r--jetty-spdy/pom.xml3
-rw-r--r--jetty-spdy/spdy-jetty-http/pom.xml2
-rw-r--r--jetty-spdy/spdy-jetty/pom.xml2
3 files changed, 4 insertions, 3 deletions
diff --git a/jetty-spdy/pom.xml b/jetty-spdy/pom.xml
index 23dbe65a32..ed898b0ba3 100644
--- a/jetty-spdy/pom.xml
+++ b/jetty-spdy/pom.xml
@@ -13,7 +13,8 @@
<name>Jetty :: SPDY :: Parent</name>
<properties>
- <npn.version>1.1.0.v20120525</npn.version>
+ <npn.version>1.1.5.v20130313</npn.version>
+ <npn.api.version>1.1.0.v20120525</npn.api.version>
</properties>
<modules>
diff --git a/jetty-spdy/spdy-jetty-http/pom.xml b/jetty-spdy/spdy-jetty-http/pom.xml
index b994c17a1c..391bac2ffa 100644
--- a/jetty-spdy/spdy-jetty-http/pom.xml
+++ b/jetty-spdy/spdy-jetty-http/pom.xml
@@ -57,7 +57,7 @@
<dependency>
<groupId>org.eclipse.jetty.npn</groupId>
<artifactId>npn-api</artifactId>
- <version>1.0.0.v20120402</version>
+ <version>${npn.api.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/jetty-spdy/spdy-jetty/pom.xml b/jetty-spdy/spdy-jetty/pom.xml
index a44474fdbb..20000cbab4 100644
--- a/jetty-spdy/spdy-jetty/pom.xml
+++ b/jetty-spdy/spdy-jetty/pom.xml
@@ -58,7 +58,7 @@
<dependency>
<groupId>org.eclipse.jetty.npn</groupId>
<artifactId>npn-api</artifactId>
- <version>${npn.version}</version>
+ <version>${npn.api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>

Back to the top