Skip to content
This repository was archived by the owner on Jun 6, 2025. It is now read-only.

Commit 4520b25

Browse files
tb06904tb06904
authored
Gh-3244 fix ci versioning (#3245)
* move to revision property * update ci * update ignore
1 parent d948fa5 commit 4520b25

File tree

52 files changed

+134
-90
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+134
-90
lines changed

‎.github/release-notes.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
releasenotes:
1+
changelog:
22
sections:
33
- title: "Headliners"
44
emoji: ":star:"

‎.github/workflows/create-hotfix-branch.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
5454
- name: Update versions
5555
run: |
56-
mvn versions:set -DnewVersion=$RELEASE_VERSION -DgenerateBackupPoms=false
56+
mvn versions:set-property -Dproperty=revision -DnewVersion=${RELEASE_VERSION} -DgenerateBackupPoms=false
5757
sed -i'' -e "s/^gaffer.version=.*/gaffer.version=$RELEASE_VERSION/" rest-api/common-rest/src/main/resources/version.properties
5858
5959
- name: Push to hotfix branch

‎.github/workflows/create-release-branch.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
5454
- name: Update versions
5555
run: |
56-
mvn versions:set -DnewVersion=$RELEASE_VERSION -DgenerateBackupPoms=false
56+
mvn versions:set-property -Dproperty=revision -DnewVersion=${RELEASE_VERSION} -DgenerateBackupPoms=false
5757
sed -i'' -e "s/^gaffer.version=.*/gaffer.version=$RELEASE_VERSION/" rest-api/common-rest/src/main/resources/version.properties
5858
5959
- name: Push to release branch

‎.github/workflows/release.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,10 @@ jobs:
9595
- name: Update develop branch
9696
run: |
9797
git checkout develop
98-
mvn release:update-versions -B
98+
mvn versions:set-property -Dproperty=revision -DnewVersion=$(echo ${{ github.event.milestone.title }} | cut -c 2-)-SNAPSHOT
99+
mvn build-helper:parse-version versions:set-property \
100+
-Dproperty=revision \
101+
-DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion}-SNAPSHOT
99102
NEW_GAFFER_VERSION=$(mvn -q help:evaluate -DforceStdout -Dexpression=pom.version)
100103
sed -i'' -e "s/^gaffer.version=.*/gaffer.version=$NEW_GAFFER_VERSION/" rest-api/common-rest/src/main/resources/version.properties
101104
git commit -a -m "prepare for next development iteration"
@@ -181,12 +184,12 @@ jobs:
181184
with:
182185
distribution: 'zulu'
183186
java-version: '8'
184-
187+
185188
- name: Checkout release
186189
uses: actions/checkout@v4
187190
with:
188191
ref: ${{ needs.create-release-tag.outputs.branch_name }}
189-
192+
190193
- name: Decode CodeSigning key
191194
env:
192195
CODE_SIGNING_KEY: ${{ secrets.CODE_SIGNING_KEY }}

‎.gitignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2016 Crown Copyright
1+
# Copyright 2016-2024 Crown Copyright
22

33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -29,4 +29,5 @@ parquet_data/
2929
**/.vscode
3030
example/real-federated-store/*.properties
3131
example/real-federated-store/*.json
32-
example/real-federated-store/*.jar
32+
example/real-federated-store/*.jar
33+
.flattened-pom.xml

‎core/access/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
~ Copyright 2020-2023 Crown Copyright
3+
~ Copyright 2020-2024 Crown Copyright
44
~
55
~ Licensed under the Apache License, Version 2.0 (the "License");
66
~ you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
1919
<parent>
2020
<artifactId>core</artifactId>
2121
<groupId>uk.gov.gchq.gaffer</groupId>
22-
<version>2.2.5-SNAPSHOT</version>
22+
<version>${revision}</version>
2323
</parent>
2424
<modelVersion>4.0.0</modelVersion>
2525

‎core/cache/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
~ Copyright 2017-2023 Crown Copyright
3+
~ Copyright 2017-2024 Crown Copyright
44
~
55
~ Licensed under the Apache License, Version 2.0 (the "License");
66
~ you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
1919
<parent>
2020
<artifactId>core</artifactId>
2121
<groupId>uk.gov.gchq.gaffer</groupId>
22-
<version>2.2.5-SNAPSHOT</version>
22+
<version>${revision}</version>
2323
</parent>
2424
<modelVersion>4.0.0</modelVersion>
2525

‎core/common-util/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>uk.gov.gchq.gaffer</groupId>
2222
<artifactId>core</artifactId>
23-
<version>2.2.5-SNAPSHOT</version>
23+
<version>${revision}</version>
2424
</parent>
2525

2626
<artifactId>common-util</artifactId>

‎core/data/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
~ Copyright 2016-2023 Crown Copyright
3+
~ Copyright 2016-2024 Crown Copyright
44
~
55
~ Licensed under the Apache License, Version 2.0 (the "License");
66
~ you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
1919
<parent>
2020
<groupId>uk.gov.gchq.gaffer</groupId>
2121
<artifactId>core</artifactId>
22-
<version>2.2.5-SNAPSHOT</version>
22+
<version>${revision}</version>
2323
</parent>
2424
<modelVersion>4.0.0</modelVersion>
2525

‎core/exception/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
~ Copyright 2017-2023 Crown Copyright
3+
~ Copyright 2017-2024 Crown Copyright
44
~
55
~ Licensed under the Apache License, Version 2.0 (the "License");
66
~ you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
1919
<parent>
2020
<artifactId>core</artifactId>
2121
<groupId>uk.gov.gchq.gaffer</groupId>
22-
<version>2.2.5-SNAPSHOT</version>
22+
<version>${revision}</version>
2323
</parent>
2424
<modelVersion>4.0.0</modelVersion>
2525

0 commit comments

Comments
 (0)