Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanseifert committed Oct 18, 2023
2 parents 9693fcd + 9f78b01 commit 1d8d288
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/maven-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
java: [11, 17]
java: [11, 17, 21]
os: [ubuntu-latest]
distribution: [temurin]

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup JDK
uses: actions/setup-java@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/maven-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Configure GIT
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-from-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
permissions:
contents: write
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ncipollo/release-action@v1
with:
body: 'Changes: https://github.com/wcm-io/io.wcm.maven.global-parent/blob/develop/changes.xml'
Expand Down
6 changes: 6 additions & 0 deletions changes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@
xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
<body>

<release version="54" date="2023-10-18">
<action type="update" dev="sseifert">
Update plugins and dependencies to latest versions.
</action>
</release>

<release version="53" date="2023-09-18">
<action type="update" dev="sseifert">
Update plugins and dependencies to latest versions.
Expand Down
14 changes: 7 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

<groupId>io.wcm.maven</groupId>
<artifactId>io.wcm.maven.global-parent</artifactId>
<version>53</version>
<version>54</version>
<packaging>pom</packaging>

<name>io.wcm.maven.global-parent</name>
Expand Down Expand Up @@ -94,11 +94,11 @@
<!-- Plugin version -->
<maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
<maven-release-plugin.version>3.0.1</maven-release-plugin.version>
<spotbugs-plugin.version>4.7.3.5</spotbugs-plugin.version>
<spotbugs-plugin.version>4.7.3.6</spotbugs-plugin.version>
<spotbugs-findsecbugs-plugin.version>1.12.0</spotbugs-findsecbugs-plugin.version>
<pmd.version>6.55.0</pmd.version>
<jacoco-maven-plugin.version>0.8.10</jacoco-maven-plugin.version>
<versions-maven-plugin.version>2.16.0</versions-maven-plugin.version>
<jacoco-maven-plugin.version>0.8.11</jacoco-maven-plugin.version>
<versions-maven-plugin.version>2.16.1</versions-maven-plugin.version>

<!-- Set to 'enabled' to activate org.eclipse.jdt.core.compiler.annotation.nullanalysis feature in eclipse settings -->
<eclipse.settings.nullanalysis>disabled</eclipse.settings.nullanalysis>
Expand Down Expand Up @@ -130,7 +130,7 @@
<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-annotations</artifactId>
<version>4.7.3</version>
<version>4.8.0</version>
<exclusions>
<!-- Do not include JSR-305 annotations - the standard never got accepted, use the nullability annotations from Jetbrains instead -->
<exclusion>
Expand Down Expand Up @@ -615,7 +615,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>10.12.3</version>
<version>10.12.4</version>
</dependency>
</dependencies>
</plugin>
Expand Down Expand Up @@ -693,7 +693,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.5.0</version>
<version>3.5.1</version>
</plugin>

<plugin>
Expand Down

0 comments on commit 1d8d288

Please sign in to comment.