Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2015-05-22 07:06:03 -0400
committerGreg Wilkins2015-05-22 07:06:03 -0400
commitcc40282a7dbf171dd8f1e97cbdf0dac70827af60 (patch)
tree9fa6b657e9d0b8617cd00173e8b5f599ba56d1f2 /pom.xml
parent4028df12ca1f162d13a60c7199766adb6ad78dea (diff)
parent43780f6c78b6be4f9825e6fe926e0a20aa988349 (diff)
downloadorg.eclipse.jetty.project-cc40282a7dbf171dd8f1e97cbdf0dac70827af60.tar.gz
org.eclipse.jetty.project-cc40282a7dbf171dd8f1e97cbdf0dac70827af60.tar.xz
org.eclipse.jetty.project-cc40282a7dbf171dd8f1e97cbdf0dac70827af60.zip
Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts: jetty-osgi/jetty-osgi-alpn/pom.xml pom.xml
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/pom.xml b/pom.xml
index 431997ff39..54aa35fcad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
<build-support-version>1.1</build-support-version>
<slf4j-version>1.6.6</slf4j-version>
<jetty-test-policy-version>1.2</jetty-test-policy-version>
- <alpn.api.version>1.1.1.v20150508</alpn.api.version>
+ <alpn.api.version>1.1.2.v20150522</alpn.api.version>
<jsp.version>8.0.20.M0</jsp.version>
<!-- default values are unsupported, but required to be defined for reactor sanity reasons -->
<alpn.version>undefined</alpn.version>

Back to the top