Skip to content

Commit

Permalink
Merge branch 'master' into #415_scopeDepth_to_parseGraph
Browse files Browse the repository at this point in the history
  • Loading branch information
mvanaken committed Mar 18, 2024
2 parents 0e83127 + f19b33e commit 17928fb
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,21 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
# Fetch all history for Sonar analysis
fetch-depth: 0

- name: Set up Cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- name: Set up JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java-version }}
distribution: ${{ matrix.distribution }}
Expand All @@ -42,7 +42,7 @@ jobs:
env:
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
# The value of sonar.projectKey is generated by Sonar and needs to map to its internal project name
run: mvn -B --update-snapshots -Dmaven.test.failure.ignore=true package org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=parsingdata_metal
run: mvn -B --update-snapshots -Dmaven.test.failure.ignore=true package org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=parsingdata_metal -Dsonar.organization=parsingdata

- name: Build and deploy with Maven
env:
Expand All @@ -57,4 +57,4 @@ jobs:
- name: Upload Code Coverage to Codecov
# Upload test coverage results only from the Corretto 11 build
if: matrix.distribution == 'corretto' && matrix.java-version == '11'
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
12 changes: 6 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,12 @@
<junit-jupiter.version>5.10.2</junit-jupiter.version>
<hamcrest-library.version>2.2</hamcrest-library.version>

<jacoco-plugin.version>0.8.10</jacoco-plugin.version>
<pmd-plugin.version>3.21.0</pmd-plugin.version>
<jxr-plugin.version>3.3.0</jxr-plugin.version>
<javadoc-plugin.version>3.5.0</javadoc-plugin.version>
<jacoco-plugin.version>0.8.11</jacoco-plugin.version>
<pmd-plugin.version>3.21.2</pmd-plugin.version>
<jxr-plugin.version>3.3.2</jxr-plugin.version>
<javadoc-plugin.version>3.6.3</javadoc-plugin.version>
<nexus-staging-plugin.version>1.6.13</nexus-staging-plugin.version>
<gpg-plugin.version>3.1.0</gpg-plugin.version>
<gpg-plugin.version>3.2.0</gpg-plugin.version>
<source-plugin.version>3.3.0</source-plugin.version>
<pitest-maven.version>1.5.2</pitest-maven.version>
<maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
Expand Down Expand Up @@ -127,7 +127,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<version>3.12.1</version>
<configuration>
<release>11</release>
</configuration>
Expand Down

0 comments on commit 17928fb

Please sign in to comment.