Skip to content

Commit f22e66b

Browse files
authored
Allow build with JDK11 (#888)
* Allow build with JDK11 * Enforce that unit-test-wlst-dir is set
1 parent 25ae322 commit f22e66b

File tree

2 files changed

+30
-4
lines changed

2 files changed

+30
-4
lines changed

core/pom.xml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@
2828
<groupId>org.antlr</groupId>
2929
<artifactId>antlr4-runtime</artifactId>
3030
</dependency>
31+
<dependency>
32+
<groupId>javax.xml.bind</groupId>
33+
<artifactId>jaxb-api</artifactId>
34+
<scope>provided</scope>
35+
</dependency>
3136
<!-- Need to resolve Jython classes at compile time. At runtime, WLST will provide the classes. -->
3237
<dependency>
3338
<groupId>org.python</groupId>
@@ -49,13 +54,13 @@
4954
<dependency>
5055
<groupId>org.powermock</groupId>
5156
<artifactId>powermock-api-easymock</artifactId>
52-
<version>1.6.6</version>
57+
<version>2.0.9</version>
5358
<scope>test</scope>
5459
</dependency>
5560
<dependency>
5661
<groupId>org.powermock</groupId>
5762
<artifactId>powermock-module-junit4</artifactId>
58-
<version>1.6.6</version>
63+
<version>2.0.9</version>
5964
<scope>test</scope>
6065
</dependency>
6166
</dependencies>

pom.xml

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,11 @@
7474
<artifactId>guava</artifactId>
7575
<version>29.0-jre</version>
7676
</dependency>
77+
<dependency>
78+
<groupId>javax.xml.bind</groupId>
79+
<artifactId>jaxb-api</artifactId>
80+
<version>2.3.1</version>
81+
</dependency>
7782
</dependencies>
7883
</dependencyManagement>
7984

@@ -116,7 +121,7 @@
116121
<plugin>
117122
<groupId>org.apache.maven.plugins</groupId>
118123
<artifactId>maven-surefire-plugin</artifactId>
119-
<version>2.20.1</version>
124+
<version>2.22.2</version>
120125
<configuration>
121126
<!-- Created by jacoco plugin (inherited configuration) -->
122127
<argLine>${surefireArgLine}</argLine>
@@ -145,7 +150,7 @@
145150
<plugin>
146151
<groupId>org.jacoco</groupId>
147152
<artifactId>jacoco-maven-plugin</artifactId>
148-
<version>0.7.9</version>
153+
<version>0.8.6</version>
149154
<executions>
150155
<execution>
151156
<id>pre-unit-test</id>
@@ -232,6 +237,22 @@
232237
</rules>
233238
</configuration>
234239
</execution>
240+
<execution>
241+
<id>enforce-wlst</id>
242+
<goals>
243+
<goal>enforce</goal>
244+
</goals>
245+
<configuration>
246+
<skip>${skipTests}</skip>
247+
<rules>
248+
<requireProperty>
249+
<property>unit-test-wlst-dir</property>
250+
<message>Unable to find WLST in order to run unit tests. Please set the unit-test-wlst-dir System property to point to the directory where wlst.sh lives in the Oracle Home. Or, set WLST_DIR environment variable. An example can be found in .mvn/maven.config-template. Optionally, you may -DskipTests.
251+
</message>
252+
</requireProperty>
253+
</rules>
254+
</configuration>
255+
</execution>
235256
</executions>
236257
</plugin>
237258
<plugin>

0 commit comments

Comments
 (0)