Skip to content

Commit 8e3240c

Browse files
Merge branch 'main' into nic/feat/ZO-191
2 parents dd262c3 + d720965 commit 8e3240c

File tree

5 files changed

+41
-7
lines changed

5 files changed

+41
-7
lines changed

.github/workflows/release.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
name: CI
1+
name: Release
22

33
on:
44
push:
55
branches:
66
- main
7-
- "[0-9].x"
8-
- "[0-9].[0-9]+.x"
7+
- '[0-9].x'
8+
- '[0-9].[0-9]+.x'
99

1010
env:
1111
DOCKER_IMAGE: ghcr.io/nordeck/ovc-backend
@@ -45,7 +45,7 @@ jobs:
4545
with:
4646
registry: ghcr.io
4747
username: ${{ github.repository_owner }}
48-
password: ${{ secrets.PACKAGE_TOKEN }}
48+
password: ${{ secrets.GITHUB_TOKEN }}
4949

5050
- name: Generate Docker metadata
5151
if: ${{ steps.release.outputs.RELEASE_VERSION }}
@@ -55,7 +55,7 @@ jobs:
5555
images: ${{ env.DOCKER_IMAGE }}
5656
labels: |
5757
org.opencontainers.image.title=ovc-backend
58-
org.opencontainers.image.description= OVC Backend.
58+
org.opencontainers.image.description=OVC Backend.
5959
org.opencontainers.image.vendor=Nordeck IT + Consulting GmbH
6060
tags: |
6161
type=semver,pattern={{version}},value=${{ steps.release.outputs.RELEASE_VERSION }}
@@ -71,7 +71,7 @@ jobs:
7171

7272
- name: Docker build and push
7373
if: ${{ steps.release.outputs.RELEASE_VERSION }}
74-
uses: docker/build-push-action@v5
74+
uses: docker/build-push-action@v6
7575
id: dockerBuild
7676
with:
7777
push: true

CHANGELOG.md

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Changelog
2+
3+
## [1.0.3](https://github.com/nordeck/ovc-backend/compare/v1.0.2...v1.0.3) (2025-02-25)
4+
5+
6+
### Bug Fixes
7+
8+
* **ci:** fix maven build errors ([2d8eb76](https://github.com/nordeck/ovc-backend/commit/2d8eb7664eca1218724e0ca4a0ee560098ca0840))
9+
10+
## [1.0.2](https://github.com/nordeck/ovc-backend/compare/v1.0.1...v1.0.2) (2025-02-25)
11+
12+
13+
### Bug Fixes
14+
15+
* **ci:** replace token ([e3201ba](https://github.com/nordeck/ovc-backend/commit/e3201ba905ddb617244ecbad87f7f153b4018413))
16+
17+
## [1.0.1](https://github.com/nordeck/ovc-backend/compare/v1.0.0...v1.0.1) (2025-02-25)
18+
19+
20+
### Bug Fixes
21+
22+
* **ci:** trim whitespace ([2749840](https://github.com/nordeck/ovc-backend/commit/274984009c27159cac16cd586fc3b7663110072f))
23+
24+
# 1.0.0 (2025-02-25)
25+
26+
27+
### Bug Fixes
28+
29+
* **ci:** a minor change to test the release pipeline ([c952fc4](https://github.com/nordeck/ovc-backend/commit/c952fc4cb67b3890cda38a2882528826c801e7cb))
30+
* **ci:** a minor change to test the release pipeline ([2bca1e0](https://github.com/nordeck/ovc-backend/commit/2bca1e04f6f3f284f602c69ad2b7f4177eebbf42))
31+
* **ci:** switch to PACKAGE_TOKEN as secret ([83c36d8](https://github.com/nordeck/ovc-backend/commit/83c36d82658acee9d3bac38d9685aebbf1108b02))
32+
* **ci:** switch to PACKAGE_TOKEN as secret ([362b01b](https://github.com/nordeck/ovc-backend/commit/362b01bf520a9aaec24691ddf3ee3954f0db2692))

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>net.nordeck</groupId>
55
<artifactId>ovc-backend</artifactId>
6-
<version>1.0.0</version>
6+
<version>1.0.3</version>
77
<parent>
88
<groupId>org.springframework.boot</groupId>
99
<artifactId>spring-boot-starter-parent</artifactId>

src/test/java/net/nordeck/ovc/backend/jobs/DeleteOldMeetingsJobTest.java

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import org.springframework.transaction.PlatformTransactionManager;
2929

3030
import java.time.ZonedDateTime;
31+
import java.util.Arrays;
3132
import java.util.Collection;
3233
import java.util.List;
3334
import java.util.UUID;

src/test/java/net/nordeck/ovc/backend/jobs/StaticRoomsDeleteUnusedJobTest.java

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.springframework.transaction.PlatformTransactionManager;
2828

2929
import java.time.ZonedDateTime;
30+
import java.util.Arrays;
3031
import java.util.Collection;
3132
import java.util.List;
3233
import java.util.UUID;

0 commit comments

Comments
 (0)