Skip to content

Commit 7b7e679

Browse files
committed
HV-1607 Make the build work with JDK 10
We need prevent the OSGi integration tests from running on JDK 10 for now as pax-exam does not support JDK 10. It will be fixed in the not yet released pax-exam 4.12.
1 parent 961e94d commit 7b7e679

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

pom.xml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@
9292
<module>annotation-processor</module>
9393
<module>integration</module>
9494
<module>performance</module>
95-
<module>osgi</module>
9695
</modules>
9796

9897
<properties>
@@ -573,7 +572,7 @@
573572
<plugin>
574573
<groupId>de.thetaphi</groupId>
575574
<artifactId>forbiddenapis</artifactId>
576-
<version>2.4.1</version>
575+
<version>2.5</version>
577576
<configuration>
578577
<!-- if the Java version used is too new, don't fail, just do nothing -->
579578
<failOnUnsupportedJava>false</failOnUnsupportedJava>
@@ -1130,7 +1129,16 @@
11301129
</build>
11311130
</profile>
11321131
<profile>
1133-
<id>jdk9</id>
1132+
<id>jdk9-</id>
1133+
<activation>
1134+
<jdk>(,9]</jdk>
1135+
</activation>
1136+
<modules>
1137+
<module>osgi</module>
1138+
</modules>
1139+
</profile>
1140+
<profile>
1141+
<id>jdk9+</id>
11341142
<activation>
11351143
<jdk>[9,)</jdk>
11361144
</activation>

0 commit comments

Comments
 (0)