Skip to content

Commit 1ccc09f

Browse files
authored
Remove the use of the maven-toolchains-plugin (#2595)
To benefit from GitHubs release automation[1] Cucumber should be able to be build on an arbitrary jdk docker image. Typically, these do not provide Maven tool chain configurations. Instead of going through the effort of setting this up in the cucumber/action-publish-mvn we can forge the use of toolchains, simplifying the build process somewhat. To ensure Cucumber is not build with a JDK version less than 11, the enforcer plugin will check this now. Additionally: - Allow spotless and revapi to work in sub modules - Use surefire and failsafe 3.0.0-M7 everywhere - Fix example parent pom versions 1: https://github.com/cucumber/action-publish-mvn
1 parent 40af8e6 commit 1ccc09f

File tree

14 files changed

+100
-125
lines changed

14 files changed

+100
-125
lines changed

.github/workflows/.toolchains.xml

Lines changed: 0 additions & 13 deletions
This file was deleted.

.github/workflows/build.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ jobs:
3131
with:
3232
version: '11'
3333
- name: Install dependencies
34-
run: mvn install -DskipTests=true -DskipITs=true -Darchetype.test.skip=true -Dmaven.javadoc.skip=true -B --show-version --toolchains .github/workflows/.toolchains.xml
34+
run: mvn install -DskipTests=true -DskipITs=true -Darchetype.test.skip=true -Dmaven.javadoc.skip=true -B --show-version
3535
- name: Test
36-
run: mvn verify --toolchains .github/workflows/.toolchains.xml
36+
run: mvn verify
3737
env:
3838
CUCUMBER_PUBLISH_TOKEN: ${{ secrets.CUCUMBER_PUBLISH_TOKEN }}
3939

@@ -54,9 +54,9 @@ jobs:
5454
with:
5555
version: '11'
5656
- name: Install dependencies
57-
run: mvn install -DskipTests=true -DskipITs=true -Darchetype.test.skip=true -Dmaven.javadoc.skip=true --batch-mode --show-version --toolchains .github/workflows/.toolchains.xml
57+
run: mvn install -DskipTests=true -DskipITs=true -Darchetype.test.skip=true -Dmaven.javadoc.skip=true --batch-mode --show-version
5858
- name: Javadoc
59-
run: mvn javadoc:jar --toolchains .github/workflows/.toolchains.xml
59+
run: mvn javadoc:jar
6060

6161
coverage:
6262
name: 'Coverage'
@@ -75,9 +75,9 @@ jobs:
7575
with:
7676
version: '11'
7777
- name: Install dependencies
78-
run: mvn install -DskipTests=true -DskipITs=true -Darchetype.test.skip=true -Dmaven.javadoc.skip=true --batch-mode --show-version --toolchains .github/workflows/.toolchains.xml
78+
run: mvn install -DskipTests=true -DskipITs=true -Darchetype.test.skip=true -Dmaven.javadoc.skip=true --batch-mode --show-version
7979
- name: Test (Coverage)
80-
run: mvn jacoco:prepare-agent verify jacoco:report --toolchains .github/workflows/.toolchains.xml
80+
run: mvn jacoco:prepare-agent verify jacoco:report
8181
- uses: codecov/codecov-action@v3
8282
with:
8383
fail_ci_if_error: true
@@ -101,6 +101,6 @@ jobs:
101101
with:
102102
version: '11'
103103
- name: Install dependencies
104-
run: mvn install -DskipTests=true -DskipITs=true -Darchetype.test.skip=true -Dmaven.javadoc.skip=true --batch-mode --show-version --toolchains .github/workflows/.toolchains.xml
104+
run: mvn install -DskipTests=true -DskipITs=true -Darchetype.test.skip=true -Dmaven.javadoc.skip=true --batch-mode --show-version
105105
- name: Test (Semver check)
106-
run: mvn verify -Pcheck-semantic-version -DskipTests=true -DskipITs=true -Darchetype.test.skip=true --toolchains .github/workflows/.toolchains.xml
106+
run: mvn verify -Pcheck-semantic-version -DskipTests=true -DskipITs=true -Darchetype.test.skip=true

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ We appreciate that. Do keep the following in mind:
1212

1313
## Formatting Java
1414

15-
To automatically format the java source code run
15+
The source code is formatted automatically by spotless when running:
1616

1717
```
18-
mvn initialize spotless:apply
18+
mvn install
1919
```
2020

2121
To configure Intelij IDEA/Eclipse use the configuration files in `.spotless/`.

examples/calculator-java-cli/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.cucumber</groupId>
66
<artifactId>cucumber-examples</artifactId>
7-
<version>7.5.0-SNAPSHOT</version>
7+
<version>7.5.1-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>calculator-java-cli</artifactId>

examples/calculator-java-junit4/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.cucumber</groupId>
66
<artifactId>cucumber-examples</artifactId>
7-
<version>7.5.0-SNAPSHOT</version>
7+
<version>7.5.1-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>calculator-java-junit4</artifactId>

examples/calculator-java-junit5/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.cucumber</groupId>
66
<artifactId>cucumber-examples</artifactId>
7-
<version>7.5.0-SNAPSHOT</version>
7+
<version>7.5.1-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>calculator-java-junit5</artifactId>

examples/calculator-java-testng/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.cucumber</groupId>
66
<artifactId>cucumber-examples</artifactId>
7-
<version>7.5.0-SNAPSHOT</version>
7+
<version>7.5.1-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>calculator-java-testng</artifactId>

examples/calculator-java8-cli/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.cucumber</groupId>
66
<artifactId>cucumber-examples</artifactId>
7-
<version>7.5.0-SNAPSHOT</version>
7+
<version>7.5.1-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>calculator-java8-cli</artifactId>

examples/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.cucumber</groupId>
66
<artifactId>cucumber-jvm</artifactId>
7-
<version>7.5.0-SNAPSHOT</version>
7+
<version>7.5.1-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>cucumber-examples</artifactId>

examples/spring-java-junit5/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.cucumber</groupId>
66
<artifactId>cucumber-examples</artifactId>
7-
<version>7.5.0-SNAPSHOT</version>
7+
<version>7.5.1-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>spring-java-junit5</artifactId>

0 commit comments

Comments
 (0)