Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into dependabot/npm_and_ya…
Browse files Browse the repository at this point in the history
…rn/fortawesome/fontawesome-free-6.5.2

# Conflicts:
#	pom.xml
  • Loading branch information
uhafner committed Apr 23, 2024
2 parents 5da16b9 + 5d3e5d1 commit 3a3387d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Generate coverage with JaCoCo
run: mvn -V --color always -ntp clean verify '-Dgpg.skip'
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v4.1.0
uses: codecov/codecov-action@v4.3.0
with:
files: 'target/site/jacoco/jacoco.xml'
token: ${{secrets.CODECOV_TOKEN}}
2 changes: 1 addition & 1 deletion .mvn/extensions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<extension>
<groupId>io.jenkins.tools.incrementals</groupId>
<artifactId>git-changelist-maven-extension</artifactId>
<version>1.7</version>
<version>1.8</version>
</extension>
</extensions>
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
},
"devDependencies": {
"remark-cli": "12.0.0",
"remark-lint": "9.1.2",
"remark-preset-lint-recommended": "6.1.3"
"remark-lint": "10.0.0",
"remark-preset-lint-recommended": "7.0.0"
},
"scripts": {
"lint-md": "remark .",
Expand Down

0 comments on commit 3a3387d

Please sign in to comment.