Merge remote-tracking branch 'origin/jetty-9.4.x'
This commit is contained in:
commit
ad7c3e0a7c
21
pom.xml
21
pom.xml
|
@ -1436,6 +1436,7 @@
|
|||
<alpn.version>8.1.9.v20160720</alpn.version>
|
||||
</properties>
|
||||
</profile>
|
||||
<<<<<<< HEAD
|
||||
<profile>
|
||||
<id>8u111</id>
|
||||
<activation>
|
||||
|
@ -1460,26 +1461,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>
|
||||
|
|
Loading…
Reference in New Issue