Skip to content

Commit

Permalink
Merge branch 'master' into mprins-patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
mprins authored Apr 16, 2024
2 parents 239db38 + 7192c20 commit 5bd6c63
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 11 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,10 @@ jobs:
run: mvn -B -e site site:stage -DnvdApiKey=${{ secrets.NVD_API_KEY }}

- name: 'Upload code coverage'
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
fail_ci_if_error: true
token: ${{ secrets.CODECOV_TOKEN }}


deploy:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
# Drafts your next Release notes as Pull Requests are merged into "master"
- uses: release-drafter/release-drafter@v5
- uses: release-drafter/release-drafter@v6
with:
# (Optional) specify config name to use, relative to .github/. Default: release-drafter.yml
config-name: release-drafter.yml
Expand Down
18 changes: 9 additions & 9 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
<maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version>
<junit.jupiter.version>5.10.1</junit.jupiter.version>
<jacoco-maven-plugin.version>0.8.11</jacoco-maven-plugin.version>
<junit.jupiter.version>5.10.2</junit.jupiter.version>
<jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
<maven-fluido-skin.version>2.0.0-M8</maven-fluido-skin.version>
</properties>
<organization>
Expand Down Expand Up @@ -55,7 +55,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.3.0</version>
<version>1.3.1</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand Down Expand Up @@ -112,31 +112,31 @@
</plugin>
<plugin>
<artifactId>maven-scm-plugin</artifactId>
<version>2.0.1</version>
<version>2.1.0</version>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.6.1</version>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>3.3.0</version>
<version>3.4.0</version>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>3.3.1</version>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<version>3.3.0</version>
<version>3.3.1</version>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven-javadoc-plugin.version}</version>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.12.1</version>
<version>3.13.0</version>
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
Expand Down Expand Up @@ -171,7 +171,7 @@
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
<version>9.0.9</version>
<version>9.1.0</version>
<configuration>
<suppressionFile>${project.basedir}/.mvn/owasp-suppression.xml</suppressionFile>
<format>ALL</format>
Expand Down Expand Up @@ -380,7 +380,7 @@
<plugin>
<groupId>org.cyclonedx</groupId>
<artifactId>cyclonedx-maven-plugin</artifactId>
<version>2.7.11</version>
<version>2.8.0</version>
<configuration>
<projectType>library</projectType>
</configuration>
Expand Down

0 comments on commit 5bd6c63

Please sign in to comment.