Skip to content

Commit

Permalink
HSEARCH-3744 Disable Spring-based ITs in JDK14
Browse files Browse the repository at this point in the history
  • Loading branch information
yrodiere committed Oct 24, 2019
1 parent 6e9a05b commit 0b99cee
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
1 change: 1 addition & 0 deletions integrationtest/showcase/library/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<skip>${failsafe.spring.skip}</skip>
<!--
Since we do not pass the Hibernate ORM settings through system properties directly
(see the override of the failsafe.jvm.args.hibernate-orm near the top of this file),
Expand Down
5 changes: 5 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,9 @@
<surefire.jvm.args>${surefire.jvm.args.memory} ${surefire.jvm.args.java-version} ${surefire.jvm.args.jacoco}</surefire.jvm.args>
<failsafe.jvm.args>${surefire.jvm.args.memory} ${surefire.jvm.args.java-version} ${failsafe.jvm.args.jacoco} ${failsafe.jvm.args.hibernate-orm}</failsafe.jvm.args>

<!-- Disable integration tests selectively. To be set in specific profile, e.g. for a specific JDK version. -->
<failsafe.spring.skip>${skipITs}</failsafe.spring.skip>

<!--
Should be set by submodules.
Used by integration tests modules that execute tests from another module.
Expand Down Expand Up @@ -2030,6 +2033,8 @@
<properties>
<!-- ForbiddenAPIs doesn't provide bundled signatures for JDK14... yet. -->
<forbiddenapis.skip>true</forbiddenapis.skip>
<!-- Spring isn't ready for JDK14 yet: https://github.com/spring-projects/spring-framework/issues/23678 -->
<failsafe.spring.skip>true</failsafe.spring.skip>
</properties>
</profile>

Expand Down

0 comments on commit 0b99cee

Please sign in to comment.