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

Issue #1073 - JDK9 support in Jetty 9.3.x. 

Marked tests in module http2-alpn-tests for JDK 8 only, since
equivalent tests for JDK 9 would require use of JDK 9 only APIs.
This commit is contained in:
Simone Bordet 2017-01-13 19:02:28 +01:00
parent beb8f3270a
commit a9fb678fe2
2 changed files with 51 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
jetty-http2/http2-alpn-tests/pom.xml
View File

@ -14,76 +14,53 @@
<bundle-symbolic-name>${project.groupId}.alpn.tests</bundle-symbolic-name> <bundle-symbolic-name>${project.groupId}.alpn.tests</bundle-symbolic-name>
</properties> </properties>
<profiles> <build>
<profile> <plugins>
<id>jdk8</id> <plugin>
<activation> <artifactId>maven-dependency-plugin</artifactId>
<jdk>[1.8,1.9)</jdk> <executions>
</activation> <execution>
<build> <id>copy</id>
<plugins> <phase>generate-resources</phase>
<plugin> <goals>
<artifactId>maven-dependency-plugin</artifactId> <goal>copy</goal>
<executions> </goals>
<execution>
<id>copy</id>
<phase>generate-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.mortbay.jetty.alpn</groupId>
<artifactId>alpn-boot</artifactId>
<version>${alpn.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/alpn</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration> <configuration>
<argLine>-Xbootclasspath/p:${project.build.directory}/alpn/alpn-boot-${alpn.version}.jar</argLine> <artifactItems>
<artifactItem>
<groupId>org.mortbay.jetty.alpn</groupId>
<artifactId>alpn-boot</artifactId>
<version>${alpn.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/alpn</outputDirectory>
</artifactItem>
</artifactItems>
</configuration> </configuration>
</plugin> </execution>
</plugins> </executions>
</build> </plugin>
<dependencies> <plugin>
<dependency> <artifactId>maven-surefire-plugin</artifactId>
<groupId>org.eclipse.jetty.alpn</groupId> <configuration>
<artifactId>alpn-api</artifactId> <argLine>-Xbootclasspath/p:${project.build.directory}/alpn/alpn-boot-${alpn.version}.jar</argLine>
<version>${alpn.api.version}</version> </configuration>
<scope>provided</scope> </plugin>
</dependency> </plugins>
</dependencies> </build>
</profile>
<profile>
<id>jdk9</id>
<activation>
<jdk>[1.9,)</jdk>
</activation>
<dependencies>
<dependency>
<groupId>org.eclipse.jetty.alpn</groupId>
<artifactId>alpn-api</artifactId>
<version>${alpn.api.version}</version>
</dependency>
</dependencies>
</profile>
</profiles>
<dependencies> <dependencies>
<dependency>
<groupId>org.eclipse.jetty.alpn</groupId>
<artifactId>alpn-api</artifactId>
<version>${alpn.api.version}</version>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-server</artifactId> <artifactId>jetty-alpn-server</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>provided</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>

13
jetty-http2/pom.xml
View File

@ -13,7 +13,6 @@
<name>Jetty :: HTTP2</name> <name>Jetty :: HTTP2</name>
<modules> <modules>
<module>http2-alpn-tests</module>
<module>http2-client</module> <module>http2-client</module>
<module>http2-common</module> <module>http2-common</module>
<module>http2-hpack</module> <module>http2-hpack</module>
@ -21,4 +20,16 @@
<module>http2-server</module> <module>http2-server</module>
</modules> </modules>
<profiles>
<profile>
<id>jdk8</id>
<activation>
<jdk>[1.8,1.9)</jdk>
</activation>
<modules>
<module>http2-alpn-tests</module>
</modules>
</profile>
</profiles>
</project> </project>