Skip to content

Commit

Permalink
Merge pull request #6 from cn337131/release/2.8.0
Browse files Browse the repository at this point in the history
Merge release into master branch
  • Loading branch information
cn337131 authored Jan 7, 2025
2 parents 28b33a4 + 7c30f51 commit 764040a
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 10 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
uses: actions/checkout@v4
with:
ref: master
token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
token: ${{ github.token }}
fetch-depth: 0

- name: Set up Github credentials
Expand All @@ -52,7 +52,7 @@ jobs:
uses: actions/checkout@v4
with:
ref: master
token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
token: ${{ github.token }}

- name: Set up Github credentials
run: |
Expand Down Expand Up @@ -133,7 +133,7 @@ jobs:
- name: Create release notes
uses: softprops/action-gh-release@v2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ github.token }}
with:
tag_name: ${{ env.artifactId }}-${{ env.RELEASE_VERSION }}
name: Koryphe ${{ env.RELEASE_VERSION }}
Expand All @@ -148,7 +148,7 @@ jobs:
uses: actions/checkout@v4
with:
ref: develop
token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
token: ${{ github.token }}
fetch-depth: 0

- name: Set up Github credentials
Expand Down
5 changes: 3 additions & 2 deletions core/pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2017-2022 Crown Copyright
~ Copyright 2017-2025 Crown Copyright
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
Expand All @@ -19,7 +19,8 @@
<parent>
<artifactId>koryphe</artifactId>
<groupId>uk.gov.gchq.koryphe</groupId>
<version>2.7.0</version>
<version>2.8.0</version>

</parent>
<packaging>jar</packaging>
<modelVersion>4.0.0</modelVersion>
Expand Down
4 changes: 2 additions & 2 deletions doc/pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2017-2022 Crown Copyright
~ Copyright 2017-2025 Crown Copyright
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
Expand All @@ -19,7 +19,7 @@
<parent>
<artifactId>koryphe</artifactId>
<groupId>uk.gov.gchq.koryphe</groupId>
<version>2.7.0</version>
<version>2.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2017-2023 Crown Copyright
~ Copyright 2017-2025 Crown Copyright
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
Expand All @@ -20,7 +20,7 @@

<groupId>uk.gov.gchq.koryphe</groupId>
<artifactId>koryphe</artifactId>
<version>2.7.0</version>
<version>2.8.0</version>
<packaging>pom</packaging>

<name>${project.groupId}:${project.artifactId}</name>
Expand Down

0 comments on commit 764040a

Please sign in to comment.