Skip to content

Commit 5885afa

Browse files
authored
Merge pull request #327 from olibye/master
Stabilise surefire
2 parents 62d9960 + e513bb1 commit 5885afa

File tree

2 files changed

+28
-2
lines changed

2 files changed

+28
-2
lines changed

.github/workflows/build.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ permissions:
33
name: Maven Build
44

55
on:
6+
push:
7+
branches:
8+
- 'wip/**'
69
pull_request:
710
branches: [ "master" ]
811
merge_group:
@@ -20,6 +23,11 @@ jobs:
2023
experimental: [false]
2124
steps:
2225
- uses: actions/checkout@v3
26+
- name: Prevent wip merge
27+
if: github.event_name == 'pull_request' && startsWith(github.head_ref, 'wip/')
28+
run: |
29+
echo "::error::WIP branches cannot be merged"
30+
exit 1
2331
- name: Set up JDK ${{ matrix.java }}
2432
uses: actions/setup-java@v3
2533
with:

pom.xml

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@
4848
<downloadSources>true</downloadSources>
4949
<hamcrest.version>3.0</hamcrest.version>
5050
<junit.version>4.13.2</junit.version>
51-
<asm.version>8.0.1</asm.version>
52-
<objenesis.version>3.4</objenesis.version>
5351
<asm.version>9.8</asm.version>
5452
<objenesis.version>3.4</objenesis.version>
5553
<bsh.version>2.0b6</bsh.version>
@@ -330,6 +328,26 @@
330328
</distributionManagement>
331329

332330
<profiles>
331+
<profile>
332+
<id>java9+</id>
333+
<activation>
334+
<jdk>[9,)</jdk>
335+
</activation>
336+
<build>
337+
<plugins>
338+
<plugin>
339+
<groupId>org.apache.maven.plugins</groupId>
340+
<artifactId>maven-surefire-plugin</artifactId>
341+
<configuration>
342+
<argLine>
343+
--add-opens=java.base/java.lang=ALL-UNNAMED
344+
--add-opens=java.base/java.io=ALL-UNNAMED
345+
</argLine>
346+
</configuration>
347+
</plugin>
348+
</plugins>
349+
</build>
350+
</profile>
333351
<profile>
334352
<id>release</id>
335353
<build>

0 commit comments

Comments
 (0)