Skip to content

Commit 8ed5d7f

Browse files
JPercivaldaviddieppois
JPercival
and
daviddieppois
authored
Prep for 3.2.0 release (#517)
* Prep for 3.2.0 release * cqf-tooling pre-release-3.2.0 WIP. Fixing RefreshIGOperationTest-testBundledFiles * cqf-tooling pre-release-3.2.0 Fixed issue with Jetty version conflicts. Forced use of jetty 11.0.16 as per wiremock requirement * cqf-tooling pre-release-3.2.0 Using newer version of Wiremock and changed jetty version to 11.0.20 as per wiremock 3.4.2 requirement * Add Checkstyle and Error Prone, fix violations, diasble test in CI * Fixups for Github actions * Fix jacoco execution * Fix the argline --------- Co-authored-by: daviddieppois <david.dieppois@smilecdr.com>
1 parent 241bd02 commit 8ed5d7f

File tree

22 files changed

+298
-151
lines changed

22 files changed

+298
-151
lines changed

‎.github/workflows/build.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
maven:
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@v4
2020
- uses: actions/setup-java@v4
2121
with:
2222
distribution: 'temurin'
@@ -31,11 +31,12 @@ jobs:
3131
MAVEN_USERNAME: ${{ vars.OSSRH_USERNAME }}
3232
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
3333
- name: Publish test report
34-
uses: mikepenz/action-junit-report@v3
34+
uses: mikepenz/action-junit-report@v4
3535
if: success() || failure() # always run even if the previous step fails
3636
with:
3737
report_paths: "**/target/surefire-reports/TEST-*.xml"
38+
job_name: "Build"
3839
- name: Upload coverage reports to Codecov
39-
uses: codecov/codecov-action@v3
40+
uses: codecov/codecov-action@v4
4041
env:
41-
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
42+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

‎.github/workflows/check-pr.yaml‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
name: Check PR
2-
on: pull_request
3-
2+
on:
3+
pull_request:
4+
types: [opened, reopened, synchronize]
5+
46
permissions:
57
checks: write
68

@@ -11,11 +13,11 @@ concurrency:
1113
jobs:
1214
maven:
1315
strategy:
14-
matrix:
15-
os: [ubuntu-latest, windows-latest]
16+
matrix:
17+
os: [ubuntu-latest, windows-latest]
1618
runs-on: ${{ matrix.os }}
1719
steps:
18-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v4
1921
- uses: actions/setup-java@v4
2022
with:
2123
distribution: 'temurin'
@@ -26,12 +28,13 @@ jobs:
2628
- name: Tests and additional checks
2729
run: ./mvnw --batch-mode --no-transfer-progress -T 4 verify -Ppackage
2830
- name: Publish test report
29-
uses: mikepenz/action-junit-report@v3
30-
if: success() || failure() # always run even if the previous step fails
31+
uses: mikepenz/action-junit-report@v4
32+
if: (success() || failure()) && matrix.os == 'ubuntu-latest'
3133
with:
3234
report_paths: "**/target/surefire-reports/TEST-*.xml"
35+
job_name: "Check PR"
3336
- name: Upload coverage reports to Codecov
34-
uses: codecov/codecov-action@v3
37+
uses: codecov/codecov-action@v4
3538
if: matrix.os == 'ubuntu-latest'
3639
env:
37-
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
40+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

‎.mvn/jvm.config‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
2+
--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
3+
--add-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED
4+
--add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED
5+
--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
6+
--add-exports jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED
7+
--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
8+
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
9+
--add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED
10+
--add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED

‎codecov.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ coverage:
1010
patch:
1111
default:
1212
# basic
13-
target: 80
13+
target: 80%
1414
threshold: 0%
1515
base: auto
1616
# advanced

‎config/checkstyle.xml‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
<?xml version="1.0"?>
2+
<!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd">
3+
4+
<!--
5+
Derived Checkstyle configuration that checks the Google naming conventions from Google Java Style
6+
that can be found at https://google.github.io/styleguide/javaguide.html Formatting conventions are
7+
enforced by the spotless plugin.
8+
9+
This configuration is based on the Google Checks that can be found at:
10+
https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml
11+
12+
-->
13+
14+
<module name="Checker">
15+
<property name="charset" value="UTF-8" />
16+
<property name="fileExtensions" value="java, properties, xml" />
17+
18+
<module name="SuppressWarningsFilter" />
19+
20+
<!-- Excludes all 'module-info.java' files -->
21+
<!-- See https://checkstyle.org/filefilters/index.html -->
22+
<module name="BeforeExecutionExclusionFileFilter">
23+
<property name="fileNamePattern" value="module\-info\.java$" />
24+
</module>
25+
26+
<module name="TreeWalker">
27+
<!-- Make the @SuppressWarnings annotations available to Checkstyle -->
28+
<module name="SuppressWarningsHolder" />
29+
<module name="AbstractClassName">
30+
<property name="format" value="^(Base|Abstract).+$" />
31+
</module>
32+
<module name="MemberName">
33+
<property name="format"
34+
value="^(?!((m|s|my|our|the)[A-Z])[a-zA-Z0-9]*)([a-z][a-zA-Z0-9]*)$" />
35+
<message key="name.invalidPattern"
36+
value="Member ''{0}'' should be named with camelCase and without prefixes." />
37+
</module>
38+
<module name="ParameterName">
39+
<property name="format"
40+
value="^(?!((m|s|my|our|the)[A-Z])[a-zA-Z0-9]*)([a-z][a-zA-Z0-9]*)$" />
41+
<message key="name.invalidPattern"
42+
value="Member ''{0}'' should be named with camelCase and without prefixes." />
43+
</module>
44+
<module name="MethodName">
45+
<property name="format"
46+
value="^(?!((m|s|my|our|the)[A-Z])[a-zA-Z0-9]*)([a-z][a-zA-Z0-9]*)$" />
47+
<message key="name.invalidPattern"
48+
value="Member ''{0}'' should be named with camelCase and without prefixes." />
49+
</module>
50+
<module name="StaticVariableName">
51+
<property name="format"
52+
value="^(?!((m|s|my|our|the)[A-Z])[a-zA-Z0-9]*)([a-z][a-zA-Z0-9]*)$" />
53+
<message key="name.invalidPattern"
54+
value="Member ''{0}'' should be named with camelCase and without prefixes." />
55+
</module>
56+
<module name="NoFinalizer" />
57+
</module>
58+
</module>

0 commit comments

Comments
 (0)