Merge branch 'eclipse-tractusx:main' into docs/onboarding/decline-reg…

…istration
eclipse-tractusx · Jun 24, 2024 · 15676f6 · 15676f6
2 parents 7ba8929 + 37cd10d
commit 15676f6
Show file tree

Hide file tree

Showing 9 changed files with 148 additions and 183 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -116,5 +116,5 @@ jobs:
             --url https://api.github.com/repos/eclipse-tractusx/portal/actions/workflows/portal-assets-image-update.yml/dispatches \
             --header "authorization: Bearer $TOKEN" \
             --header "Accept: application/vnd.github.v3+json" \
-            --data '{"ref":"dev", "inputs": { "new-image":"${{ github.sha }}" }}' \
+            --data '{"ref":"main", "inputs": { "new-image":"${{ github.sha }}" }}' \
             --fail
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -162,7 +162,7 @@ jobs:
           if [[ ${{ steps.rc-check.outputs.rc }} == 'true' ]]; then
             echo "branch=release-candidate" >> $GITHUB_OUTPUT
           else
-            echo "branch=dev" >> $GITHUB_OUTPUT
+            echo "branch=main" >> $GITHUB_OUTPUT
           fi
         if: steps.hf-check.outputs.hf == 'false'
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -16,16 +16,38 @@ Catena-X alliance focusing on parts traceability.
 
 - https://projects.eclipse.org/projects/automotive.tractusx
 
+## Project licenses
+
+The Tractus-X project uses the following licenses:
+
+- Apache-2.0 for code
+- CC-BY-4.0 for non-code
+
+## Terms of Use
+
+This repository is subject to the Terms of Use of the Eclipse Foundation
+
+- https://www.eclipse.org/legal/termsofuse.php
+
 ## Developer resources
 
 Information regarding source code management, builds, coding standards, and
 more.
 
 - https://projects.eclipse.org/projects/automotive.tractusx/developer
 
-The project maintains the source code repositories in the following GitHub organization:
+Getting started:
+
+- https://eclipse-tractusx.github.io/docs/developer
+
+The project maintains the source code repositories
 
-- https://github.com/eclipse-tractusx/
+- https://github.com/eclipse-tractusx/portal-frontend
+- https://github.com/eclipse-tractusx/portal-frontend-registration
+- https://github.com/eclipse-tractusx/portal-shared-components
+- https://github.com/eclipse-tractusx/portal-backend
+- https://github.com/eclipse-tractusx/portal-assets
+- https://github.com/eclipse-tractusx/portal-iam
 
 ## Eclipse Development Process
 

diff --git a/LICENSES/CC-BY-4.0.txt → LICENSE_non-code b/LICENSES/CC-BY-4.0.txt → LICENSE_non-code
@@ -1,4 +1,4 @@
-Attribution 4.0 International
+Creative Commons Attribution 4.0 International
 
 =======================================================================
 
@@ -392,4 +392,4 @@ understandings, or agreements concerning use of licensed material. For
 the avoidance of doubt, this paragraph does not form part of the
 public licenses.
 
-Creative Commons may be contacted at creativecommons.org.
+Creative Commons may be contacted at creativecommons.org.
diff --git a/NOTICE.md b/NOTICE.md
@@ -12,12 +12,19 @@ source code repository logs.
 
 ## Declared Project Licenses
 
-This program and the accompanying materials are made available under the terms
-of the Apache License, Version 2.0 which is available at
-https://www.apache.org/licenses/LICENSE-2.0.
+The Tractus-X project uses the following licenses:
 
+- Apache-2.0 for code
+- CC-BY-4.0 for non-code
+
+Apache-2.0:
+This program and the accompanying materials are made available under the terms of the Apache License, Version 2.0 which is available at https://www.apache.org/licenses/LICENSE-2.0.
 SPDX-License-Identifier: Apache-2.0
 
+CC-BY-4.0:
+The materials in this repository are made available under the terms of the Creative Commons Attribution 4.0 International License, which is available at https://spdx.org/licenses/CC-BY-4.0.html.
+SPDX-License-Identifier: CC-BY-4.0
+
 ## Source Code
 
 The project maintains the following source code repositories in the GitHub organization https://github.com/eclipse-tractusx:

diff --git a/docs/developer/Technical Documentation/Dev Process/Dev-flow_deploy-dev-env.md b/docs/developer/Technical Documentation/Dev Process/Dev-flow_deploy-dev-env.md
@@ -8,10 +8,10 @@ flowchart LR
     subgraph eclipse-tractusx
         direction LR
         subgraph CI repos
-            D -- PR to dev* --> PF(portal-frontend**)
-            D -- PR to dev* --> PR(portal-registration**)
+            D -- PR to main* --> PF(portal-frontend**)
+            D -- PR to main* --> PR(portal-registration**)
             D -- PR* to main* --> PA(portal-assets**)
-            D -- PR* to dev*--> PB(portal-backend***)
+            D -- PR* to main*--> PB(portal-backend***)
             click PF "https://github.com/eclipse-tractusx/portal-frontend"
             click PR "https://github.com/eclipse-tractusx/portal-frontend-registration"
             click PA "https://github.com/eclipse-tractusx/portal-assets"
@@ -23,13 +23,13 @@ flowchart LR
             PI --> PICD(portal-iam -b main)
             click PI "https://github.com/eclipse-tractusx/portal-iam"
         end
-        subgraph CD repo for auto-deploy to dev
+        subgraph CD repo with helm chart for auto-deploy to dev
             direction LR
-            PF --> CD(portal***** -b dev)
+            PF --> CD(portal***** -b main)
             PR --> CD
             PB --> CD
             PA --> CD
-            D -- PR* to -b dev for chart --> CD
+            D -- PR* to -b main --> CD
             click CD "https://github.com/eclipse-tractusx/portal"
         end
     end
@@ -41,13 +41,13 @@ flowchart LR
 
 Note\* Every pull request (PR) requires at least one approving review by a committer
 
-Note\*\* ESlint, unit tests and Sonarcloud runs at pull request, Trivy and KICS scans at merge as well as daily and Veracode scan runs weekly
+Note\*\* ESlint, unit tests, Sonarcloud, CodeQL checks run at pull request, Trivy and KICS scans run at push on main as well as daily
 
-Note\*\*\* Unit tests and Sonarcloud runs at pull request, Trivy and KICS scans at merge as well as daily and Veracode scan runs weekly
+Note\*\*\* Unit tests and Sonarcloud, CodeQL checks run at pull request, Trivy and KICS scans run at push on main as well as daily
 
-Note\*\*\*\* Sonarcloud runs at pull request, Trivy and KICS scans at merge as well as daily
+Note\*\*\*\* Sonarcloud runs at pull request, Trivy and KICS scans run at push on main as well as daily
 
-Note**\*** Trivy and KICS scans are scheduled to daily
+Note**\*** Trivy and KICS scans run at push on main as well as daily
 
 ## NOTICE
 

diff --git a/docs/developer/Technical Documentation/Dev Process/Dev-flow_git-diagram.md b/docs/developer/Technical Documentation/Dev Process/Dev-flow_git-diagram.md
@@ -3,125 +3,61 @@
 ```mermaid
 %%{init: { 'logLevel': 'debug', 'theme': 'base' } }%%
 gitGraph
-    commit id: "release: v1.0.0" tag:"1.0.0"
-    branch dev order: 1
-    checkout dev
-    branch feature/feature1 order: 2
-    commit id:"feat(function): add feature1"
-    checkout dev
-    branch bug/bug1  order: 3
-    commit id: "fix(function): change bug1"
-    checkout dev
-    branch feature/feature2  order: 4
-    commit id:"feat(function)!: enable feature2"
-    checkout bug/bug1
-    commit id:"fix(function): refactor bug1"
-    checkout dev
-    merge bug/bug1
-    checkout dev
-    branch feature/feature3 order: 5
-    commit id:"feat(function): wip - enable feature3"
-    checkout dev
-    checkout feature/feature3
-    commit id: "feat(function): enable feature3"
-    checkout dev
-    merge feature/feature3
+    commit id: "chore: initial commit"
+    branch feature/feature1 order: 1
     checkout feature/feature1
-    commit id:"feat(function): enable feature1"
-    checkout dev
+    commit id:"feat(function): add feature1"
+    checkout main
     merge feature/feature1
-    branch release/1.1.0 order: 6
-    commit id: "release(1.1.0): aggregate migrations (backend)"
-    commit id: "release(1.1.0): update version, changelog..." tag: "1.1.0"
+    branch feature/feature2 order: 3
+    checkout feature/feature2
+    commit id:"feat(function)!: WIP enable feature2"
+    checkout main
+    branch bug/bug1 order: 2
+    commit id: "fix(function): change bug1"
     checkout main
-    merge release/1.1.0 id: "1. merge into main"
-    checkout dev
-    merge main id: "2. merge main into dev"
-    checkout dev
-    branch feature/feature4  order: 7
-    commit id: "feat(function): add feature4"
+    merge bug/bug1
     checkout feature/feature2
-    commit id: "feat(function)!: change feature2"
-    checkout dev
+    commit id:"feat(function)!: finalize feature2"
+    checkout main
     merge feature/feature2
-    checkout feature/feature4
-    commit id: "feat(function): change feature4"
-    checkout dev
-    merge feature/feature4
-    branch release/1.2.0 order: 8
-    commit id: "release(1.2.0-RC1): prepare migration (backend)"
-    commit id: "release(1.2.0-RC1): update version, changelog..." tag: "1.2.0-RC1"
+    branch feature/feature3 order: 4
+    commit id:"feat(function)!: WIP enable feature3"
     checkout main
-    merge release/1.2.0
-    checkout dev
-    merge main
-    checkout release/1.2.0
-    branch bug/bug2 order: 9
-    commit id:"fix(function): change1 bug2"
-    checkout release/1.2.0
-    branch bug/bug3 order: 10
-    commit id:"fix(function): change bug3"
-    checkout release/1.2.0
-    merge bug/bug3
-    merge dev
-    checkout dev
-    branch feature/feature5 order: 11
-    commit id: "feat(function): add feature5"
+    branch release/v1.0.0-rc.1 order: 5
+    commit id: "build(v1.0.0-rc.1): bump version" tag: "v1.0.0-rc.1"
+    checkout main
+    merge release/v1.0.0-rc.1
+    checkout release/v1.0.0-rc.1
+    branch bug/bug2 order: 7
     checkout bug/bug2
-    commit id:"fix(function): change2 bug2"
-    checkout release/1.2.0
+    commit id: "fix(function): change bug2"
+    checkout release/v1.0.0-rc.1
+    branch release/v1.0.0-rc.2 order: 8
+    checkout release/v1.0.0-rc.2
     merge bug/bug2
-    commit id: "release(1.2.0-RC2): update version, changelog..." tag: "1.2.0-RC2"
+    commit id: "build(v1.0.0-rc.2): bump version" tag: "v1.0.0-rc.2"
     checkout main
-    merge release/1.2.0
-    checkout dev
-    merge main
-    checkout dev
-    branch feature/feature6 order: 12
-    commit id: "feat(function): add feature for 1.4.0"
-    checkout feature/feature5
-    commit id: "feat(function): change feature5"
-    checkout dev
-    merge feature/feature5
-    branch release/1.3.0 order: 13
-    commit id: "release(1.3.0): aggregate migrations (backend)"
-    commit id: "release(1.3.0): update version, changelog..." tag: "1.3.0"
-    checkout main
-    merge release/1.3.0
-    checkout dev
-    merge main
-    checkout feature/feature6
-    commit id: "feat(function): change feature for 1.4.0"
-    merge dev
-    checkout release/1.2.0
-    branch bug/bug4 order: 14
-    commit id:"fix(function): change1 bug4"
-    commit id:"fix(function): change2 bug4"
-    checkout release/1.2.0
-    merge bug/bug4
-    commit id: "release(1.2.0): update version, changelog..." tag: "1.2.0"
+    merge release/v1.0.0-rc.2
+    checkout feature/feature3
+    commit id:"feat(function)!: finalize feature3"
     checkout main
-    merge release/1.2.0
-    checkout dev
-    merge main
-    checkout release/1.2.0
-    branch hotfix/1.2.1 order: 15
-    branch bug/bug5 order: 16
-    commit id:"fix(function): change1 bug5"
-    checkout hotfix/1.2.1
-    branch bug/bug6 order: 17
-    commit id:"fix(function): change bug6"
-    checkout hotfix/1.2.1
-    merge bug/bug6
-    checkout bug/bug5
-    commit id:"fix(function): change2 bug5"
-    checkout hotfix/1.2.1
-    merge bug/bug5
-    commit id: "hotfix(1.2.1): update version, changelog..." tag: "1.2.1"
+    merge feature/feature3
+    checkout release/v1.0.0-rc.2
+    branch release/v1.0.0 order: 8
+    checkout release/v1.0.0
+    commit id: "build(v1.0.0): bump version" tag: "v1.0.0"
     checkout main
-    merge hotfix/1.2.1
-    checkout dev
-    merge main
+    merge release/v1.0.0
+    checkout release/v1.0.0
+    branch hotfix/v1.0.1 order: 9
+    checkout hotfix/v1.0.1
+    branch bug/bug3 order: 10
+    checkout bug/bug3
+    commit id: "fix(function): change bug3"
+    checkout hotfix/v1.0.1
+    merge bug/bug3
+    commit id: "build(v1.0.1): bump version" tag: "v1.0.1"
 ```
 
 ## NOTICE