Skip to content

Commit

Permalink
Merge branch 'master' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
mallport committed Oct 13, 2024
2 parents 42b0b9a + b2a19d2 commit 0060415
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions .github/workflows/mvn-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ jobs:
- uses: actions/checkout@v4
with:
token: ${{ steps.app-token.outputs.token }}
ref: refs/heads/master

- name: Set up JDK 21
uses: actions/setup-java@v4
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>no.ssb.maskinporten</groupId>
<artifactId>maskinporten-guardian</artifactId>
<version>1.3.110</version>
<version>1.3.17-SNAPSHOT</version>
<packaging>${packaging}</packaging>

<parent>
Expand Down Expand Up @@ -31,7 +31,7 @@
<scm>
<developerConnection>scm:git:https://github.com/${github.repository}.git</developerConnection>
<url>https://github.com/${github.repository}</url>
<tag>1.3.110</tag>
<tag>1.3.17</tag>
</scm>

<repositories>
Expand Down

0 comments on commit 0060415

Please sign in to comment.