Skip to content

Commit 4cdfd18

Browse files
authored
Merge pull request #182 from catenax-ng/fix/trgs-2403-correct
Fix following TRGs for 24.03
2 parents e835420 + 1cef2d3 commit 4cdfd18

File tree

33 files changed

+144
-116
lines changed

33 files changed

+144
-116
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
#
3-
# Copyright (c) 2023 T-Systems International GmbH
4-
# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
3+
# Copyright (c) 2023,2024 T-Systems International GmbH
4+
# Copyright (c) 2021,2024 Contributors to the Eclipse Foundation
55
#
66
# See the NOTICE file(s) distributed with this work for additional
77
# information regarding copyright ownership.
@@ -137,7 +137,7 @@ jobs:
137137
type=semver,pattern={{version}}
138138
type=semver,pattern={{major}}
139139
type=semver,pattern={{major}}.{{minor}}
140-
type=raw,value=1.11.16-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }}
140+
type=raw,value=1.12.17-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }}
141141
type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
142142
143143
- name: Agent Plane Hashicorp Container Build and push
@@ -175,7 +175,7 @@ jobs:
175175
type=semver,pattern={{version}}
176176
type=semver,pattern={{major}}
177177
type=semver,pattern={{major}}.{{minor}}
178-
type=raw,value=1.11.16-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }}
178+
type=raw,value=1.12.17-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }}
179179
type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
180180
181181
- name: Agent Plane Azure Vault Container Build and push

.github/workflows/kics.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
#
3-
# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
3+
# Copyright (c) 2021,2024 Contributors to the Eclipse Foundation
44
#
55
# See the NOTICE file(s) distributed with this work for additional
66
# information regarding copyright ownership.

.github/workflows/trivy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
#
3-
# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
3+
# Copyright (c) 2021,2024 Contributors to the Eclipse Foundation
44
#
55
# See the NOTICE file(s) distributed with this work for additional
66
# information regarding copyright ownership.

.github/workflows/veracode.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
#
3-
# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
3+
# Copyright (c) 2021,2024 Contributors to the Eclipse Foundation
44
#
55
# See the NOTICE file(s) distributed with this work for additional
66
# information regarding copyright ownership.

DEPENDENCIES

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,8 @@ maven/mavencentral/org.eclipse.jetty/jetty-servlet/11.0.15, EPL-2.0 OR Apache-2.
224224
maven/mavencentral/org.eclipse.jetty/jetty-util/11.0.16, EPL-2.0 OR Apache-2.0, approved, rt.jetty
225225
maven/mavencentral/org.eclipse.jetty/jetty-webapp/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
226226
maven/mavencentral/org.eclipse.jetty/jetty-xml/11.0.16, EPL-2.0 OR Apache-2.0, approved, rt.jetty
227-
maven/mavencentral/org.eclipse.tractusx.agents.edc.agent-plane/agent-plane-protocol/1.11.16-SNAPSHOT, Apache-2.0, approved, automotive.tractusx
228-
maven/mavencentral/org.eclipse.tractusx.edc/auth-jwt/1.11.16-SNAPSHOT, Apache-2.0, approved, automotive.tractusx
227+
maven/mavencentral/org.eclipse.tractusx.agents.edc.agent-plane/agent-plane-protocol/1.12.17-SNAPSHOT, Apache-2.0, approved, automotive.tractusx
228+
maven/mavencentral/org.eclipse.tractusx.edc/auth-jwt/1.12.17-SNAPSHOT, Apache-2.0, approved, automotive.tractusx
229229
maven/mavencentral/org.eclipse.tractusx.edc/core-spi/0.5.3, Apache-2.0, approved, automotive.tractusx
230230
maven/mavencentral/org.eclipse.tractusx.edc/edc-dataplane-azure-vault/0.5.3, Apache-2.0, approved, automotive.tractusx
231231
maven/mavencentral/org.eclipse.tractusx.edc/edc-dataplane-base/0.5.3, Apache-2.0, approved, automotive.tractusx

agent-plane/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
* Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
2+
* Copyright (c) 2022,2024 Contributors to the Eclipse Foundation
33
*
44
* See the NOTICE file(s) distributed with this work for additional
55
* information regarding copyright ownership.
@@ -66,10 +66,10 @@ mvn package -Pwith-docker-image
6666
Alternatively, after a successful build, you can invoke docker yourself
6767

6868
```console
69-
docker build -t tractusx/agentplane-azure-vault:1.11.16-SNAPSHOT -f agentplane-azure-vault/src/main/docker/Dockerfile .
69+
docker build -t tractusx/agentplane-azure-vault:1.12.17-SNAPSHOT -f agentplane-azure-vault/src/main/docker/Dockerfile .
7070
```
7171

7272
```console
73-
docker build -t tractusx/agentplane-hashicorp:1.11.16-SNAPSHOT -f agentplane-hashicorp/src/main/docker/Dockerfile .
73+
docker build -t tractusx/agentplane-hashicorp:1.12.17-SNAPSHOT -f agentplane-hashicorp/src/main/docker/Dockerfile .
7474
```
7575

agent-plane/agent-plane-protocol/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
* Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
2+
* Copyright (c) 2022,2024 Contributors to the Eclipse Foundation
33
*
44
* See the NOTICE file(s) distributed with this work for additional
55
* information regarding copyright ownership.
@@ -63,7 +63,7 @@ Add the following dependency to your data-plane artifact pom:
6363
<dependency>
6464
<groupId>org.eclipse.tractusx.agents.edc</groupId>
6565
<artifactId>agent-plane-protocol</artifactId>
66-
<version>1.11.16-SNAPSHOT</version>
66+
<version>1.12.17-SNAPSHOT</version>
6767
</dependency>
6868
```
6969

agent-plane/agent-plane-protocol/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
* Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
3+
* Copyright (c) 2022,2024 Contributors to the Eclipse Foundation
44
*
55
* See the NOTICE file(s) distributed with this work for additional
66
* information regarding copyright ownership.
@@ -25,7 +25,7 @@
2525
<parent>
2626
<groupId>org.eclipse.tractusx.agents.edc</groupId>
2727
<artifactId>agent-plane</artifactId>
28-
<version>1.11.16-SNAPSHOT</version>
28+
<version>1.12.17-SNAPSHOT</version>
2929
<relativePath>../pom.xml</relativePath>
3030
</parent>
3131

agent-plane/agent-plane-protocol/src/main/java/org/eclipse/tractusx/agents/edc/AgreementController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
1+
// Copyright (c) 2022,2024 Contributors to the Eclipse Foundation
22
//
33
// See the NOTICE file(s) distributed with this work for additional
44
// information regarding copyright ownership.

agent-plane/agent-plane-protocol/src/main/java/org/eclipse/tractusx/agents/edc/service/DataManagement.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
1+
// Copyright (c) 2022,2024 Contributors to the Eclipse Foundation
22
//
33
// See the NOTICE file(s) distributed with this work for additional
44
// information regarding copyright ownership.

0 commit comments

Comments
 (0)