Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: Java CI with Maven

on:
push:
branches: [ master ]
branches: [ main ]

jobs:
build:
Expand Down
10 changes: 6 additions & 4 deletions oc-sso-notificatie/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -75,6 +71,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>
Expand Down
27 changes: 5 additions & 22 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,27 +41,22 @@
<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.5</version>
<version>3.3.8</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>
Expand Down Expand Up @@ -129,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>
Expand Down
18 changes: 7 additions & 11 deletions release/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
22 changes: 22 additions & 0 deletions release/src/site/markdown/docs/2.3.3/release-notes.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# OC SSO Notification Service - Release Notes

| Field | Value |
|:--------------------------|:----------------------------|
| Application | OC SSO Notification Service |
| Version | 2.3.3 |
| Changes since version | 2.3.2 |
| Release date | 11-02-2025 (dd-mm-yyyy) |
| Delivery type | Full release |

## Changes

| # | Description |
|:---------|:----------------------------------------|
| ENT-5128 | Build release OC SSO Notification 2.3.3 |


## 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.