Skip to content

Commit c4cffde

Browse files
Merge pull request #208 from drcgjung/fix/201-licenses
fix: #201 license issues
2 parents 6ffe0f2 + 4dc1490 commit c4cffde

File tree

28 files changed

+476
-72
lines changed

28 files changed

+476
-72
lines changed

.github/workflows/build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ jobs:
142142
type=semver,pattern={{version}}
143143
type=semver,pattern={{major}}
144144
type=semver,pattern={{major}}.{{minor}}
145-
type=raw,value=1.12.19-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }}
145+
type=raw,value=1.13.20-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }}
146146
type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
147147
148148
- name: Agent Plane Hashicorp Container Build and push
@@ -180,7 +180,7 @@ jobs:
180180
type=semver,pattern={{version}}
181181
type=semver,pattern={{major}}
182182
type=semver,pattern={{major}}.{{minor}}
183-
type=raw,value=1.12.19-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }}
183+
type=raw,value=1.13.20-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }}
184184
type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
185185
186186
- name: Agent Plane Azure Vault Container Build and push

CONTRIBUTING.md

+19-21
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,3 @@
1-
<!--
2-
* Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
3-
*
4-
* See the NOTICE file(s) distributed with this work for additional
5-
* information regarding copyright ownership.
6-
*
7-
* This program and the accompanying materials are made available under the
8-
* terms of the Apache License, Version 2.0 which is available at
9-
* https://www.apache.org/licenses/LICENSE-2.0.
10-
*
11-
* Unless required by applicable law or agreed to in writing, software
12-
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
13-
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
14-
* License for the specific language governing permissions and limitations
15-
* under the License.
16-
*
17-
* SPDX-License-Identifier: Apache-2.0
18-
-->
19-
201
# Contributing to Eclipse Tractus-X
212

223
Thanks for your interest in this project.
@@ -35,16 +16,33 @@ Catena-X alliance focusing on parts traceability.
3516

3617
* https://projects.eclipse.org/projects/automotive.tractusx
3718

19+
## Project licenses
20+
21+
The Tractus-X project uses the following licenses:
22+
23+
* Apache-2.0 for code
24+
* CC-BY-4.0 for non-code
25+
26+
## Terms of Use
27+
28+
This repository is subject to the Terms of Use of the Eclipse Foundation
29+
30+
* https://www.eclipse.org/legal/termsofuse.php
31+
3832
## Developer resources
3933

4034
Information regarding source code management, builds, coding standards, and
4135
more.
4236

4337
* https://projects.eclipse.org/projects/automotive.tractusx/developer
4438

45-
The project maintains the source code repositories in the following GitHub organization:
39+
Getting started:
40+
41+
* https://eclipse-tractusx.github.io/docs/developer
42+
43+
The project maintains the following source code repositories
4644

47-
* https://github.com/eclipse-tractusx/
45+
* https://github.com/eclipse-tractusx/sig-infra
4846

4947
## Eclipse Development Process
5048

DEPENDENCIES

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
maven/mavencentral/com.apicatalog/carbon-did/0.0.2, Apache-2.0, approved, #9239
22
maven/mavencentral/com.apicatalog/iron-verifiable-credentials/0.8.1, Apache-2.0, approved, #9234
3-
maven/mavencentral/com.apicatalog/titanium-json-ld/1.4.0, Apache-2.0, approved, #13683
3+
maven/mavencentral/com.apicatalog/titanium-json-ld/1.4.0, Apache-2.0, approved, #15200
44
maven/mavencentral/com.azure/azure-core-http-netty/1.14.0, MIT AND Apache-2.0, approved, #13238
55
maven/mavencentral/com.azure/azure-core-http-netty/1.14.1, MIT AND Apache-2.0, approved, #13238
66
maven/mavencentral/com.azure/azure-core/1.46.0, MIT AND Apache-2.0, approved, #13234
@@ -31,7 +31,7 @@ maven/mavencentral/com.github.docker-java/docker-java-transport-zerodep/3.3.6, A
3131
maven/mavencentral/com.github.docker-java/docker-java-transport/3.3.6, Apache-2.0, approved, #7942
3232
maven/mavencentral/com.github.jsonld-java/jsonld-java/0.13.4, BSD-3-Clause, approved, CQ22136
3333
maven/mavencentral/com.github.stephenc.jcip/jcip-annotations/1.0-1, Apache-2.0, approved, CQ21949
34-
maven/mavencentral/com.google.code.findbugs/jsr305/3.0.2, Apache-2.0, approved, #20
34+
maven/mavencentral/com.google.code.findbugs/jsr305/3.0.2, CC-BY-2.5, approved, #15220
3535
maven/mavencentral/com.google.code.gson/gson/2.10.1, Apache-2.0, approved, #6159
3636
maven/mavencentral/com.google.crypto.tink/tink/1.12.0, Apache-2.0, approved, #12041
3737
maven/mavencentral/com.google.errorprone/error_prone_annotations/2.22.0, Apache-2.0, approved, #10661
@@ -43,14 +43,14 @@ maven/mavencentral/com.nimbusds/lang-tag/1.7, Apache-2.0, approved, clearlydefin
4343
maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.37.3, Apache-2.0, approved, #11701
4444
maven/mavencentral/com.nimbusds/oauth2-oidc-sdk/11.9.1, Apache-2.0, approved, #12667
4545
maven/mavencentral/com.squareup.okhttp3/okhttp-dnsoverhttps/4.12.0, Apache-2.0, approved, #11159
46-
maven/mavencentral/com.squareup.okhttp3/okhttp/4.12.0, Apache-2.0, approved, #11156
46+
maven/mavencentral/com.squareup.okhttp3/okhttp/4.12.0, Apache-2.0, approved, #15227
4747
maven/mavencentral/com.squareup.okio/okio-jvm/3.6.0, Apache-2.0, approved, #11158
4848
maven/mavencentral/com.squareup.okio/okio/3.6.0, Apache-2.0, approved, #11155
4949
maven/mavencentral/com.sun.activation/jakarta.activation/2.0.1, EPL-2.0 OR BSD-3-Clause OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jaf
5050
maven/mavencentral/commons-cli/commons-cli/1.5.0, Apache-2.0, approved, clearlydefined
5151
maven/mavencentral/commons-codec/commons-codec/1.15, Apache-2.0 AND BSD-3-Clause AND LicenseRef-Public-Domain, approved, CQ22641
5252
maven/mavencentral/commons-io/commons-io/2.15.1, Apache-2.0, approved, #11244
53-
maven/mavencentral/dev.failsafe/failsafe-okhttp/3.3.2, Apache-2.0, approved, #9178
53+
maven/mavencentral/dev.failsafe/failsafe-okhttp/3.3.2, Apache-2.0, approved, #15208
5454
maven/mavencentral/dev.failsafe/failsafe/3.3.2, Apache-2.0, approved, #9268
5555
maven/mavencentral/io.github.classgraph/classgraph/4.8.154, MIT, approved, CQ22530
5656
maven/mavencentral/io.micrometer/micrometer-commons/1.12.5, Apache-2.0 AND (Apache-2.0 AND MIT), approved, #11679
@@ -114,7 +114,7 @@ maven/mavencentral/net.bytebuddy/byte-buddy/1.14.1, Apache-2.0 AND BSD-3-Clause,
114114
maven/mavencentral/net.bytebuddy/byte-buddy/1.14.9, Apache-2.0 AND BSD-3-Clause, approved, #7163
115115
maven/mavencentral/net.java.dev.jna/jna-platform/5.13.0, Apache-2.0 OR LGPL-2.1-or-later, approved, #6707
116116
maven/mavencentral/net.java.dev.jna/jna-platform/5.6.0, Apache-2.0 OR LGPL-2.1-or-later, approved, CQ22390
117-
maven/mavencentral/net.java.dev.jna/jna/5.13.0, Apache-2.0 AND LGPL-2.1-or-later, approved, #6709
117+
maven/mavencentral/net.java.dev.jna/jna/5.13.0, Apache-2.0 AND LGPL-2.1-or-later, approved, #15196
118118
maven/mavencentral/net.minidev/accessors-smart/2.5.0, Apache-2.0, approved, clearlydefined
119119
maven/mavencentral/net.minidev/json-smart/2.5.0, Apache-2.0, approved, clearlydefined
120120
maven/mavencentral/org.apache.commons/commons-collections4/4.4, Apache-2.0, approved, clearlydefined
@@ -264,8 +264,8 @@ maven/mavencentral/org.eclipse.jetty/jetty-servlet/11.0.20, EPL-2.0 OR Apache-2.
264264
maven/mavencentral/org.eclipse.jetty/jetty-util/11.0.20, EPL-2.0 OR Apache-2.0, approved, rt.jetty
265265
maven/mavencentral/org.eclipse.jetty/jetty-webapp/11.0.20, EPL-2.0 OR Apache-2.0, approved, rt.jetty
266266
maven/mavencentral/org.eclipse.jetty/jetty-xml/11.0.20, EPL-2.0 OR Apache-2.0, approved, rt.jetty
267-
maven/mavencentral/org.eclipse.tractusx.agents.edc.agent-plane/agent-plane-protocol/1.12.19-SNAPSHOT, Apache-2.0, approved, automotive.tractusx
268-
maven/mavencentral/org.eclipse.tractusx.edc/auth-jwt/1.12.19-SNAPSHOT, Apache-2.0, approved, automotive.tractusx
267+
maven/mavencentral/org.eclipse.tractusx.agents.edc.agent-plane/agent-plane-protocol/1.13.20-SNAPSHOT, Apache-2.0, approved, automotive.tractusx
268+
maven/mavencentral/org.eclipse.tractusx.edc/auth-jwt/1.13.20-SNAPSHOT, Apache-2.0, approved, automotive.tractusx
269269
maven/mavencentral/org.eclipse.tractusx.edc/core-spi/0.7.0, Apache-2.0, approved, automotive.tractusx
270270
maven/mavencentral/org.eclipse.tractusx.edc/core-utils/0.7.0, Apache-2.0, approved, automotive.tractusx
271271
maven/mavencentral/org.eclipse.tractusx.edc/data-plane-migration/0.7.0, Apache-2.0, approved, automotive.tractusx
@@ -316,7 +316,7 @@ maven/mavencentral/org.junit.jupiter/junit-jupiter-engine/5.10.2, EPL-2.0, appro
316316
maven/mavencentral/org.junit.jupiter/junit-jupiter-params/5.10.2, EPL-2.0, approved, #9708
317317
maven/mavencentral/org.junit.platform/junit-platform-commons/1.10.2, EPL-2.0, approved, #9715
318318
maven/mavencentral/org.junit.platform/junit-platform-engine/1.10.2, EPL-2.0, approved, #9709
319-
maven/mavencentral/org.junit.platform/junit-platform-launcher/1.10.2, EPL-2.0, approved, #9704
319+
maven/mavencentral/org.junit.platform/junit-platform-launcher/1.10.2, EPL-2.0, approved, #15216
320320
maven/mavencentral/org.jvnet.mimepull/mimepull/1.9.15, CDDL-1.1 OR GPL-2.0-only WITH Classpath-exception-2.0, approved, CQ21484
321321
maven/mavencentral/org.latencyutils/LatencyUtils/2.0.3, BSD-2-Clause, approved, CQ17408
322322
maven/mavencentral/org.mockito/mockito-core/5.2.0, MIT AND (Apache-2.0 AND MIT) AND Apache-2.0, approved, #7401

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -199,4 +199,4 @@
199199
distributed under the License is distributed on an "AS IS" BASIS,
200200
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201201
See the License for the specific language governing permissions and
202-
limitations under the License.
202+
limitations under the License.

0 commit comments

Comments
 (0)