From 0d5878e49ef836ac0948ed3f84c38431a59c7952 Mon Sep 17 00:00:00 2001 From: Ines Date: Tue, 11 Feb 2025 18:00:10 +0100 Subject: [PATCH 1/3] Rename LICENSE-2.0.txt to LICENSE Rename LICENSE file to the more usual name --- LICENSE-2.0.txt => LICENSE | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename LICENSE-2.0.txt => LICENSE (100%) diff --git a/LICENSE-2.0.txt b/LICENSE similarity index 100% rename from LICENSE-2.0.txt rename to LICENSE From 9b388c6dd16ce4aa6af268b90264ddba431fee4d Mon Sep 17 00:00:00 2001 From: Thomas Beekman Date: Tue, 6 May 2025 13:41:21 +0200 Subject: [PATCH 2/3] ENT-5188: Build release OC SSO Notification 2.3.4 --- .../nl/kennisnet/services/Application.java | 4 ++-- pom.xml | 4 ++-- release/pom.xml | 2 +- .../site/markdown/docs/2.3.4/release-notes.md | 22 +++++++++++++++++++ 4 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 release/src/site/markdown/docs/2.3.4/release-notes.md diff --git a/oc-sso-notificatie/src/main/java/nl/kennisnet/services/Application.java b/oc-sso-notificatie/src/main/java/nl/kennisnet/services/Application.java index 12becac..2247a6a 100644 --- a/oc-sso-notificatie/src/main/java/nl/kennisnet/services/Application.java +++ b/oc-sso-notificatie/src/main/java/nl/kennisnet/services/Application.java @@ -40,8 +40,8 @@ public static void main(String[] args) { @Bean public RestTemplate restTemplate(RestTemplateBuilder builder) { return builder - .setConnectTimeout(Duration.ofSeconds(connectionTimeout)) - .setReadTimeout(Duration.ofSeconds(connectionTimeout)) + .connectTimeout(Duration.ofSeconds(connectionTimeout)) + .readTimeout(Duration.ofSeconds(connectionTimeout)) .build(); } diff --git a/pom.xml b/pom.xml index 50fece8..ad53372 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ 17 1.5 0.8.10 - 11.1.1 + 12.1.1 1.6.0 5.3 2.8 @@ -54,7 +54,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.8 + 3.4.5 diff --git a/release/pom.xml b/release/pom.xml index 4064169..bc17372 100644 --- a/release/pom.xml +++ b/release/pom.xml @@ -31,7 +31,7 @@ - 2.3.3,2.3.2,2.3.1,2.3.0,2.2.1,2.2.0,2.1.1,2.1.0,2.0.6,2.0.5,2.0.4,2.0.3,2.0.2,2.0.1,1.0.0 + 2.3.4,2.3.3,2.3.2,2.3.1,2.3.0,2.2.1,2.2.0,2.1.1,2.1.0,2.0.6,2.0.5,2.0.4,2.0.3,2.0.2,2.0.1,1.0.0 diff --git a/release/src/site/markdown/docs/2.3.4/release-notes.md b/release/src/site/markdown/docs/2.3.4/release-notes.md new file mode 100644 index 0000000..412ce44 --- /dev/null +++ b/release/src/site/markdown/docs/2.3.4/release-notes.md @@ -0,0 +1,22 @@ +# OC SSO Notification Service - Release Notes + +| Field | Value | +|:--------------------------|:----------------------------| +| Application | OC SSO Notification Service | +| Version | 2.3.4 | +| Changes since version | 2.3.3 | +| Release date | 06-05-2025 (dd-mm-yyyy) | +| Delivery type | Full release | + +## Changes + +| # | Description | +|:---------|:----------------------------------------| +| ENT-5188 | Build release OC SSO Notification 2.3.4 | + + +## Configuration changes + +## Known vulnerabilities + +At the time of release, this version of the application had no known vulnerabilities with a CVE of 7 or higher. From e19c6f692eec9819a8703eb01829107a5069d5aa Mon Sep 17 00:00:00 2001 From: Thomas Beekman Date: Tue, 6 May 2025 13:46:52 +0200 Subject: [PATCH 3/3] ENT-5188: Build release OC SSO Notification 2.3.4 - updated build actions --- .github/workflows/develop.yml | 4 ++-- .github/workflows/main.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index 5a3cf98..6c91ba2 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -15,9 +15,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK 17 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: java-version: '17' distribution: 'adopt' diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 471675a..01c2721 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,9 +13,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK 17 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: java-version: '17' distribution: 'adopt'