From 28432effd70bfe0bf6fed44bf3c13632837fef2d Mon Sep 17 00:00:00 2001
From: Thomas Beekman <t.beekman@kennisnet.nl>
Date: Wed, 4 Dec 2024 14:02:56 +0100
Subject: [PATCH 1/3] Moved from master to main

---
 .github/workflows/{master.yml => main.yml} |  0
 oc-sso-notificatie/pom.xml                 |  6 ++++++
 pom.xml                                    | 10 +---------
 3 files changed, 7 insertions(+), 9 deletions(-)
 rename .github/workflows/{master.yml => main.yml} (100%)

diff --git a/.github/workflows/master.yml b/.github/workflows/main.yml
similarity index 100%
rename from .github/workflows/master.yml
rename to .github/workflows/main.yml
diff --git a/oc-sso-notificatie/pom.xml b/oc-sso-notificatie/pom.xml
index 9079e43..0107074 100644
--- a/oc-sso-notificatie/pom.xml
+++ b/oc-sso-notificatie/pom.xml
@@ -75,6 +75,12 @@
             <version>${lombok.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>co.elastic.logging</groupId>
+            <artifactId>logback-ecs-encoder</artifactId>
+            <version>${ecs-logging-java.version}</version>
+        </dependency>
+
     </dependencies>
 
     <build>
diff --git a/pom.xml b/pom.xml
index ecfea72..43c50ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,17 +51,9 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.5</version>
+        <version>3.3.6</version>
     </parent>
 
-    <dependencies>
-        <dependency>
-            <groupId>co.elastic.logging</groupId>
-            <artifactId>logback-ecs-encoder</artifactId>
-            <version>${ecs-logging-java.version}</version>
-        </dependency>
-    </dependencies>
-
     <build>
         <plugins>
             <plugin>

From 5d2a31ae07a737e23a9c8a82b5fae232c26eba05 Mon Sep 17 00:00:00 2001
From: Thomas Beekman <t.beekman@kennisnet.nl>
Date: Wed, 4 Dec 2024 14:06:28 +0100
Subject: [PATCH 2/3] Prepare for next development iteration

---
 .github/workflows/main.yml                    |  2 +-
 release/pom.xml                               |  2 +-
 .../docs/2.3.3-SNAPSHOT/release-notes.md      | 23 +++++++++++++++++++
 3 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 release/src/site/markdown/docs/2.3.3-SNAPSHOT/release-notes.md

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 616150b..471675a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -5,7 +5,7 @@ name: Java CI with Maven
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   build:
diff --git a/release/pom.xml b/release/pom.xml
index 940d7c4..b07a72b 100644
--- a/release/pom.xml
+++ b/release/pom.xml
@@ -31,7 +31,7 @@
     <properties>
         <!-- A list of all the previous versions in reverse order, separated by a comma separator -->
         <!-- The current version is automatically added in the release-notes-all overview. -->
-        <versions>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</versions>
+        <versions>2.3.3-SNAPSHOT,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</versions>
         <maven.project.info.version>2.8</maven.project.info.version>
         <maven.site.version>3.8.2</maven.site.version>
         <maven.install.version>2.4</maven.install.version>
diff --git a/release/src/site/markdown/docs/2.3.3-SNAPSHOT/release-notes.md b/release/src/site/markdown/docs/2.3.3-SNAPSHOT/release-notes.md
new file mode 100644
index 0000000..f67c896
--- /dev/null
+++ b/release/src/site/markdown/docs/2.3.3-SNAPSHOT/release-notes.md
@@ -0,0 +1,23 @@
+# OC SSO Notification Service - Release Notes
+
+| Field                     | Value                       |
+|:--------------------------|:----------------------------|
+| Application               | OC SSO Notification Service |
+| Version                   | 2.3.3-SNAPSHOT              |
+| Changes since version     | 2.3.2                       |
+| Release date              | dd-mm-yyyy (dd-mm-yyyy)     |
+| Delivery type             | Full release                |
+
+## Changes
+<!-- Please note only the stories should be added. -->
+
+| #        | Description                                                   |
+|:---------|:--------------------------------------------------------------|
+| ENT-XXXX |                                                               |
+
+
+## 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 72ed608948f9c2f43d281412dca27be32d58a87c Mon Sep 17 00:00:00 2001
From: Thomas Beekman <t.beekman@kennisnet.nl>
Date: Tue, 11 Feb 2025 16:57:11 +0100
Subject: [PATCH 3/3] ENT-5128: Build release OC SSO Notification 2.3.3

---
 oc-sso-notificatie/pom.xml                    |  4 ----
 pom.xml                                       | 19 +++++--------------
 release/pom.xml                               | 18 +++++++-----------
 .../release-notes.md                          | 11 +++++------
 4 files changed, 17 insertions(+), 35 deletions(-)
 rename release/src/site/markdown/docs/{2.3.3-SNAPSHOT => 2.3.3}/release-notes.md (56%)

diff --git a/oc-sso-notificatie/pom.xml b/oc-sso-notificatie/pom.xml
index 449bd3f..906e16d 100644
--- a/oc-sso-notificatie/pom.xml
+++ b/oc-sso-notificatie/pom.xml
@@ -31,22 +31,18 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-freemarker</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context-support</artifactId>
diff --git a/pom.xml b/pom.xml
index b6b5572..0031042 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,17 +41,20 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>17</java.version>
+        <doxia-module-markdown.version>1.5</doxia-module-markdown.version>
         <jacoco.version>0.8.10</jacoco.version>
-        <dependency-check-maven.version>10.0.4</dependency-check-maven.version>
+        <dependency-check-maven.version>11.1.1</dependency-check-maven.version>
         <ecs-logging-java.version>1.6.0</ecs-logging-java.version>
         <logback.encoder.version>5.3</logback.encoder.version>
+        <maven-project-info-reports-plugin.version>2.8</maven-project-info-reports-plugin.version>
         <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
+        <maven-site-plugin.version>3.8.2</maven-site-plugin.version>
     </properties>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.6</version>
+        <version>3.3.8</version>
     </parent>
 
     <build>
@@ -121,18 +124,6 @@
                     <remoteTagging>true</remoteTagging>
                     <tagNameFormat>${BUILD_VERSION}</tagNameFormat>
                 </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.maven.scm</groupId>
-                        <artifactId>maven-scm-provider-gitexe</artifactId>
-                        <version>1.11.2</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.maven.scm</groupId>
-                        <artifactId>maven-scm-api</artifactId>
-                        <version>1.11.2</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
         <pluginManagement>
diff --git a/release/pom.xml b/release/pom.xml
index b07a72b..11a2c2e 100644
--- a/release/pom.xml
+++ b/release/pom.xml
@@ -31,10 +31,7 @@
     <properties>
         <!-- A list of all the previous versions in reverse order, separated by a comma separator -->
         <!-- The current version is automatically added in the release-notes-all overview. -->
-        <versions>2.3.3-SNAPSHOT,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</versions>
-        <maven.project.info.version>2.8</maven.project.info.version>
-        <maven.site.version>3.8.2</maven.site.version>
-        <maven.install.version>2.4</maven.install.version>
+        <versions>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</versions>
     </properties>
 
     <dependencies>
@@ -55,17 +52,17 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-project-info-reports-plugin</artifactId>
-                        <version>${maven.project.info.version}</version>
+                        <version>${maven-project-info-reports-plugin.version}</version>
                     </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-site-plugin</artifactId>
-                        <version>${maven.site.version}</version>
+                        <version>${maven-site-plugin.version}</version>
                         <dependencies>
                             <dependency>
                                 <groupId>org.apache.maven.doxia</groupId>
                                 <artifactId>doxia-module-markdown</artifactId>
-                                <version>1.5</version>
+                                <version>${doxia-module-markdown.version}</version>
                             </dependency>
                         </dependencies>
                     </plugin>
@@ -79,13 +76,12 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-install-plugin</artifactId>
-                        <version>${maven.install.version}</version>
-                        <configuration>
-                            <createChecksum>true</createChecksum>
-                        </configuration>
+                        <version>${maven-install-plugin.version}</version>
                     </plugin>
                     <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-assembly-plugin</artifactId>
+                        <version>${maven-assembly-plugin.version}</version>
                         <executions>
                             <execution>
                                 <id>make-release-assembly</id>
diff --git a/release/src/site/markdown/docs/2.3.3-SNAPSHOT/release-notes.md b/release/src/site/markdown/docs/2.3.3/release-notes.md
similarity index 56%
rename from release/src/site/markdown/docs/2.3.3-SNAPSHOT/release-notes.md
rename to release/src/site/markdown/docs/2.3.3/release-notes.md
index f67c896..75514bc 100644
--- a/release/src/site/markdown/docs/2.3.3-SNAPSHOT/release-notes.md
+++ b/release/src/site/markdown/docs/2.3.3/release-notes.md
@@ -3,17 +3,16 @@
 | Field                     | Value                       |
 |:--------------------------|:----------------------------|
 | Application               | OC SSO Notification Service |
-| Version                   | 2.3.3-SNAPSHOT              |
+| Version                   | 2.3.3                       |
 | Changes since version     | 2.3.2                       |
-| Release date              | dd-mm-yyyy (dd-mm-yyyy)     |
+| Release date              | 11-02-2025 (dd-mm-yyyy)     |
 | Delivery type             | Full release                |
 
 ## Changes
-<!-- Please note only the stories should be added. -->
 
-| #        | Description                                                   |
-|:---------|:--------------------------------------------------------------|
-| ENT-XXXX |                                                               |
+| #        | Description                             |
+|:---------|:----------------------------------------|
+| ENT-5128 | Build release OC SSO Notification 2.3.3 |
 
 
 ## Configuration changes