Skip to content

Commit f5bb2df

Browse files
matbmosermatbmoser
authored
Merge branch 'eclipse-tractusx:main' into hotfix/v2.1.1
2 parents df04534 + 467c36e commit f5bb2df

File tree

354 files changed

+1968
-995
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

354 files changed

+1968
-995
lines changed

‎.editorconfig‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
#################################################################################
2-
# Catena-X - Product Passport Consumer Frontend
2+
# Catena-X - Digital Product Passport Application
33
#
4-
# Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA
4+
# Copyright (c) 2022, 2024 BASF SE, BMW AG, Henkel AG & Co. KGaA
5+
# Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation
56
#
67
# See the NOTICE file(s) distributed with this work for additional
78
# information regarding copyright ownership.
@@ -18,7 +19,7 @@
1819
# under the License.
1920
#
2021
# SPDX-License-Identifier: Apache-2.0
21-
##################################################################################
22+
#################################################################################
2223

2324
[*]
2425
charset = utf-8

‎.env‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
#################################################################################
2-
# Catena-X - Product Passport Consumer Frontend
2+
# Catena-X - Digital Product Passport Application
33
#
4-
# Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA
4+
# Copyright (c) 2022, 2024 BASF SE, BMW AG, Henkel AG & Co. KGaA
5+
# Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation
56
#
67
# See the NOTICE file(s) distributed with this work for additional
78
# information regarding copyright ownership.
@@ -18,7 +19,7 @@
1819
# under the License.
1920
#
2021
# SPDX-License-Identifier: Apache-2.0
21-
##################################################################################
22+
#################################################################################
2223

2324
VITE_APP_NAME=Product Passport Application
2425
VITE_BASE_URL=http://localhost:8080

‎.eslintrc.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
/**
2-
* Catena-X - Product Passport Consumer Frontend
2+
* Catena-X - Digital Product Passport Application
33
*
4-
* Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA
4+
* Copyright (c) 2022, 2024 BASF SE, BMW AG, Henkel AG & Co. KGaA
5+
* Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation
56
*
67
* See the NOTICE file(s) distributed with this work for additional
78
* information regarding copyright ownership.

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,26 @@
1+
<!--
2+
Catena-X - Digital Product Passport Application
3+
4+
Copyright (c) 2022, 2024 BASF SE, BMW AG, Henkel AG & Co. KGaA
5+
Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation
6+
7+
See the NOTICE file(s) distributed with this work for additional
8+
information regarding copyright ownership.
9+
10+
This program and the accompanying materials are made available under the
11+
terms of the Apache License, Version 2.0 which is available at
12+
https://www.apache.org/licenses/LICENSE-2.0.
13+
14+
Unless required by applicable law or agreed to in writing, software
15+
distributed under the License is distributed on an "AS IS" BASIS
16+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
17+
either express or implied. See the
18+
License for the specific language govern in permissions and limitations
19+
under the License.
20+
21+
SPDX-License-Identifier: Apache-2.0
22+
-->
23+
124
# Why we create this PR?
225

326
<< Quick description why the PR is being opened >>
@@ -17,4 +40,4 @@
1740
| Tickets |
1841
| :---: |
1942
| [cmp-xxx](www.link.com) |
20-
| [cmp-xxx](www.link.com) |
43+
| [cmp-xxx](www.link.com) |

‎.github/actions/setup-java/action.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#################################################################################
2-
# Catena-X - Product Passport Consumer Application
2+
# Catena-X - Digital Product Passport Application
33
#
44
# Copyright (c) 2022, 2024 BASF SE, BMW AG, Henkel AG & Co. KGaA
5-
# Copyright (c) 2023, 2024 Contributors to the Eclipse Foundation
5+
# Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation
66
#
77
# See the NOTICE file(s) distributed with this work for additional
88
# information regarding copyright ownership.

‎.github/dependabot.yaml‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
#################################################################################
2+
# Catena-X - Digital Product Passport Application
3+
#
4+
# Copyright (c) 2022, 2024 BASF SE, BMW AG, Henkel AG & Co. KGaA
5+
# Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation
6+
#
7+
# See the NOTICE file(s) distributed with this work for additional
8+
# information regarding copyright ownership.
9+
#
10+
# This program and the accompanying materials are made available under the
11+
# terms of the Apache License, Version 2.0 which is available at
12+
# https://www.apache.org/licenses/LICENSE-2.0.
13+
#
14+
# Unless required by applicable law or agreed to in writing, software
15+
# distributed under the License is distributed on an "AS IS" BASIS
16+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
17+
# either express or implied. See the
18+
# License for the specific language govern in permissions and limitations
19+
# under the License.
20+
#
21+
# SPDX-License-Identifier: Apache-2.0
22+
#################################################################################
23+
24+
---
25+
version: 2
26+
updates:
27+
# Maven
28+
-
29+
package-ecosystem: "maven"
30+
target-branch: main
31+
directory: ./dpp-backend/digitalproductpass/
32+
labels:
33+
- "dependabot"
34+
- "dependencies"
35+
schedule:
36+
interval: "daily"
37+
38+
# Github Actions
39+
-
40+
package-ecosystem: "github-actions"
41+
target-branch: main
42+
directory: /
43+
labels:
44+
- "dependabot"
45+
- "github-actions"
46+
schedule:
47+
interval: "daily"
48+
49+
# Docker
50+
-
51+
package-ecosystem: "docker"
52+
target-branch: main
53+
directory: ./dpp-backend/digitalproductpass/
54+
labels:
55+
- "dependabot"
56+
- "docker"
57+
schedule:
58+
interval: "daily"
59+
-
60+
package-ecosystem: "docker"
61+
target-branch: main
62+
directory: /
63+
labels:
64+
- "dependabot"
65+
- "docker"
66+
schedule:
67+
interval: "daily"

‎.github/workflows/eslint.yml‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,25 @@
1-
# Copyright 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA
1+
#################################################################################
2+
# Catena-X - Digital Product Passport Application
23
#
3-
# Licensed under the Apache License, Version 2.0 (the "License");
4-
# you may not use this file except in compliance with the License.
5-
# You may obtain a copy of the License at
4+
# Copyright (c) 2022, 2024 BASF SE, BMW AG, Henkel AG & Co. KGaA
5+
# Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation
66
#
7-
# http://www.apache.org/licenses/LICENSE-2.0
7+
# See the NOTICE file(s) distributed with this work for additional
8+
# information regarding copyright ownership.
9+
#
10+
# This program and the accompanying materials are made available under the
11+
# terms of the Apache License, Version 2.0 which is available at
12+
# https://www.apache.org/licenses/LICENSE-2.0.
813
#
914
# Unless required by applicable law or agreed to in writing, software
10-
# distributed under the License is distributed on an "AS IS" BASIS,
11-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
# See the License for the specific language governing permissions and
13-
# limitations under the License.
15+
# distributed under the License is distributed on an "AS IS" BASIS
16+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
17+
# either express or implied. See the
18+
# License for the specific language govern in permissions and limitations
19+
# under the License.
20+
#
21+
# SPDX-License-Identifier: Apache-2.0
22+
#################################################################################
1423

1524
# This workflow uses actions that are not certified by GitHub.
1625
# They are provided by a third-party and are governed by

‎.github/workflows/helm-test.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
#################################################################################
2-
# Catena-X - Product Passport Consumer Application
2+
# Catena-X - Digital Product Passport Application
33
#
4-
# Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA
4+
# Copyright (c) 2022, 2024 BASF SE, BMW AG, Henkel AG & Co. KGaA
5+
# Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation
56
#
67
# See the NOTICE file(s) distributed with this work for additional
78
# information regarding copyright ownership.

‎.github/workflows/helm-upgrade.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
#################################################################################
2-
# Catena-X - Product Passport Consumer Application
2+
# Catena-X - Digital Product Passport Application
33
#
4-
# Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA
4+
# Copyright (c) 2022, 2024 BASF SE, BMW AG, Henkel AG & Co. KGaA
5+
# Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation
56
#
67
# See the NOTICE file(s) distributed with this work for additional
78
# information regarding copyright ownership.

‎.github/workflows/kics.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
#################################################################################
2-
# Catena-X - Product Passport Consumer Application
2+
# Catena-X - Digital Product Passport Application
33
#
4-
# Copyright (c) 2022, 2023 BASF SE, BMW AG, Henkel AG & Co. KGaA
4+
# Copyright (c) 2022, 2024 BASF SE, BMW AG, Henkel AG & Co. KGaA
5+
# Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation
56
#
67
# See the NOTICE file(s) distributed with this work for additional
78
# information regarding copyright ownership.

0 commit comments

Comments
 (0)