Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x

This commit is contained in:
Greg Wilkins 2016-10-26 20:32:18 +11:00
parent 8421a9b200 812272c658
commit f4e6162b98
1 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pom.xml
View File

@ -1437,6 +1437,7 @@
<alpn.version>8.1.9.v20160720</alpn.version>
</properties>
</profile>
<<<<<<< HEAD
<profile>
<id>8u111</id>
<activation>
@ -1461,26 +1462,6 @@
<alpn.version>8.1.10.v20161026</alpn.version>
</properties>
</profile>
<profile>
<id>jdk9</id>
<activation>
<jdk>1.9</jdk>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.9</source>
<target>1.9</target>
<testSource>1.9</testSource>
<testTarget>1.9</testTarget>
<compilerArgument>-Xlint:all</compilerArgument>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<issueManagement>