Skip to content

Commit

Permalink
Merged main branch on 2024-01-31
Browse files Browse the repository at this point in the history
  • Loading branch information
Update branch committed Jan 31, 2024
2 parents 138224c + e223ed6 commit 3725891
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
- Spring core updated from 6.0.14 to 6.0.16
- Springboot updated from 3.1.6 to 3.1.7
- Implemented asset publisher component functionality
- Updated postgres to version 15.4

### Removed

Expand All @@ -41,7 +42,6 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
- Added GET /policies endpoint to retrieve accepted policies
- Added POST assets/publish endpoint to publish transient assets


### Changed
- Fixed security findings
- Rework GET alerts and investigations endpoint to POST to send a request body
Expand Down
6 changes: 3 additions & 3 deletions charts/traceability-foss/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ dependencies:
version: 1.3.27
- name: postgresql
repository: https://charts.bitnami.com/bitnami
version: 12.1.6
version: 12.12.10
condition: postgresql.enabled
- name: pgadmin4
repository: https://helm.runix.net
version: 1.13.6
version: 1.23.1
condition: pgadmin4.enabled
- name: irs-helm
repository: https://eclipse-tractusx.github.io/item-relationship-service
Expand All @@ -51,5 +51,5 @@ dependencies:
- name: postgresql
alias: edc-postgresql
repository: https://charts.bitnami.com/bitnami
version: 12.1.6
version: 12.12.10
condition: edc-postgresql.enabled
4 changes: 2 additions & 2 deletions charts/traceability-foss/charts/backend/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ appVersion: "10.2.1"
dependencies:
- name: postgresql
repository: https://charts.bitnami.com/bitnami
version: 12.1.6
version: 12.12.10
condition: postgresql.enabled
- name: pgadmin4
repository: https://helm.runix.net
version: 1.13.6
version: 1.23.1
condition: pgadmin4.enabled
- name: irs-helm
repository: https://eclipse-tractusx.github.io/item-relationship-service
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ SPDX-License-Identifier: Apache-2.0
<install-plugin.version>3.1.1</install-plugin.version>
<jacoco-plugin.version>0.8.8</jacoco-plugin.version>
<jar-plugin.version>3.3.0</jar-plugin.version>
<owasp-plugin.version>8.4.0</owasp-plugin.version>
<owasp-plugin.version>9.0.9</owasp-plugin.version>
<spotbugs-plugin.version>4.8.3.0</spotbugs-plugin.version>
<spring-boot-maven-plugin.version>3.1.3</spring-boot-maven-plugin.version>
<maven-project-info-reports-plugin.version>3.4.5</maven-project-info-reports-plugin.version>
Expand Down
4 changes: 2 additions & 2 deletions tx-backend/docker/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2023 Contributors to the Eclipse Foundation
# Copyright (c) 2023, 2024 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand All @@ -18,7 +18,7 @@ name: trace-foss

services:
postgres:
image: "postgres:14.4"
image: "postgres:15.4"
volumes:
- postgres-data:/var/lib/postgresql/data
- ./db-init:/docker-entrypoint-initdb.d
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/********************************************************************************
* Copyright (c) 2023 Contributors to the Eclipse Foundation
* Copyright (c) 2023,2024 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
Expand Down Expand Up @@ -31,7 +31,7 @@ public class PostgreSQLConfig {

// will be started before and stopped after each test method
@Container
private static final PostgreSQLContainer postgresqlContainer = new PostgreSQLContainer("postgres:14.4")
private static final PostgreSQLContainer postgresqlContainer = new PostgreSQLContainer("postgres:15.4")
.withDatabaseName("trace")
.withUsername("foo")
.withPassword("secret");
Expand Down

0 comments on commit 3725891

Please sign in to comment.