diff --git a/.github/workflows/broken_links_checker.yml b/.github/workflows/broken_links_checker.yml index f2c0629..028d748 100644 --- a/.github/workflows/broken_links_checker.yml +++ b/.github/workflows/broken_links_checker.yml @@ -1,16 +1,22 @@ name: Broken Links Checker on: - schedule: - - cron: "0 5 * * *" push: + branches: [ master, develop ] + pull_request: + branches: [ master, develop ] jobs: linkChecker: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + - name: Configure broken links checker + run: | + mkdir -p ./target + echo '{ "aliveStatusCodes": [429, 200] }' > ./target/broken_links_checker.json - uses: gaurav-nelson/github-action-markdown-link-check@v1 with: use-quiet-mode: 'yes' use-verbose-mode: 'yes' + config-file: ./target/broken_links_checker.json \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 50dd52d..21e0eb4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,9 +10,14 @@ jobs: build: runs-on: ubuntu-latest + concurrency: + group: ${{ github.workflow }}-${{ github.ref }}-java-${{ matrix.java }} + cancel-in-progress: true strategy: + fail-fast: true matrix: java: [11, 17] + name: "Build with Java ${{ matrix.java }}" env: DEFAULT_JAVA: 11 @@ -26,14 +31,7 @@ jobs: with: distribution: 'temurin' java-version: ${{ matrix.java }} - - - name: Cache local Maven repository - uses: actions/cache@v3 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-java-${{ matrix.java }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-java-${{ matrix.java }}-maven- + cache: 'maven' - name: Cache SonarQube packages uses: actions/cache@v3 @@ -62,7 +60,12 @@ jobs: - name: Sonar analysis if: ${{ env.DEFAULT_JAVA == matrix.java && env.SONAR_TOKEN != null }} - run: mvn --errors --batch-mode -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=itsallcode -Dsonar.login=$SONAR_TOKEN org.jacoco:jacoco-maven-plugin:prepare-agent sonar:sonar + run: | + mvn --errors --batch-mode \ + -Dsonar.host.url=https://sonarcloud.io \ + -Dsonar.organization=itsallcode \ + -Dsonar.login=$SONAR_TOKEN \ + org.sonarsource.scanner.maven:sonar-maven-plugin:sonar env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 9fc63fa..ee7394e 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -24,14 +24,7 @@ jobs: with: distribution: 'temurin' java-version: 11 - - - name: Cache local Maven repository - uses: actions/cache@v3 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- + cache: 'maven' - name: Initialize CodeQL uses: github/codeql-action/init@v2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f95591..7059ea9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Refactoring + +- [PR #45](https://github.com/itsallcode/openfasttrace-maven-plugin/pull/45) Upgrade dependencies + ## [1.5.0] - 2022-03-17 - [#40](https://github.com/itsallcode/openfasttrace-maven-plugin/pull/40) Upgrade to [OpenFastTrace 3.5.0](https://github.com/itsallcode/openfasttrace/releases/tag/3.5.0) diff --git a/README.md b/README.md index 11cfaeb..0582484 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,9 @@ By default the build will fail when there are errors found during tracing. To co If you want to build OFT: - apt-get install openjdk-11-jdk maven +```bash +apt-get install openjdk-11-jdk maven +``` ### Essential Build Steps @@ -99,28 +101,25 @@ Import as a Maven project using *"File" → "Import..." → "Maven" → mvn license:update-project-license license:update-file-header ``` -## Run local sonar analysis +### Run local sonar analysis ```bash +sonar_token="[token]" mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar \ -Dsonar.host.url=https://sonarcloud.io \ -Dsonar.organization=itsallcode \ - -Dsonar.login=[token] + -Dsonar.login=$sonar_token ``` See analysis results at https://sonarcloud.io/dashboard?id=org.itsallcode%3Aopenfasttrace-maven-plugin -## Check for updated dependencies / plugins - -```bash -mvn versions:display-dependency-updates -``` +### Check for updated dependencies / plugins ```bash -mvn versions:display-plugin-updates +mvn versions:display-dependency-updates versions:display-plugin-updates ``` -## Publishing to JCenter and Maven Central +### Publishing to Maven Central 1. Add the following to your `~/.m2/settings.xml`: diff --git a/pom.xml b/pom.xml index 78dd7c7..9641964 100644 --- a/pom.xml +++ b/pom.xml @@ -19,8 +19,8 @@ 3.5.0 3.6.3 true - 5.8.2 - 0.8.7 + 5.9.0 + 0.8.8 @@ -69,7 +69,7 @@ ${maven.core.version} - + org.itsallcode.openfasttrace @@ -87,6 +87,11 @@ ${oft.version} runtime + + org.codehaus.plexus + plexus-utils + 3.4.2 + org.apache.maven maven-plugin-api @@ -100,22 +105,18 @@ provided - org.codehaus.plexus - plexus-utils - 3.4.1 + org.apache.maven + maven-core + ${maven.core.version} + provided + org.apache.maven.plugin-testing maven-plugin-testing-harness 3.3.0 test - - org.apache.maven - maven-core - ${maven.core.version} - provided - org.apache.maven maven-compat @@ -131,13 +132,13 @@ com.exasol maven-plugin-integration-testing - 1.1.1 + 1.1.2 test org.assertj assertj-core - 3.22.0 + 3.23.1 test @@ -166,7 +167,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.0.0 + 3.1.0 enforce-maven @@ -186,7 +187,7 @@ org.apache.maven.plugins maven-clean-plugin - 3.1.0 + 3.2.0 @@ -246,7 +247,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.2 + 3.4.0 attach-javadocs @@ -332,7 +333,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M5 + 3.0.0-M7 **VerifierTest.java @@ -342,7 +343,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.0.0-M5 + 3.0.0-M7 **VerifierTest.java @@ -412,12 +413,12 @@ org.apache.maven.plugins maven-deploy-plugin - 3.0.0-M2 + 3.0.0 org.sonatype.plugins nexus-staging-maven-plugin - 1.6.12 + 1.6.13 true ossrh