Skip to content

Commit

Permalink
Merge pull request #1 from adkumar1/main
Browse files Browse the repository at this point in the history 
sync the gaiaxtagus code change
  • Loading branch information
@adkumar1
adkumar1 authored Feb 14, 2025
2 parents 1ab2845 + e8ddf6d commit b2ccdba
Show file tree
Hide file tree
Showing 23 changed files with 1,047 additions and 228 deletions.
3 changes: 2 additions & 1 deletion AUTHORS.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ The following people have contributed to this repository:
* Aditya Kumar, T-Systems International GmbH, https://github.com/adkumar1
* Dmitrii Vasiunin, T-Systems International GmbH, https://github.com/dvasunin
* Amol Dashwant, T-Systems International GmbH, https://github.com/amoldashwant
* Fedor Nazarov,, T-Systems International GmbH, https://github.com/Wulghash
* Fedor Nazarov, T-Systems International GmbH, https://github.com/Wulghash
* Chetan Parate, T-Systems International GmbH, https://github.com/ChetanT-System
4 changes: 3 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)

## [Unreleased]
## [2.1.15] - 2025-02-12
- Added support for tagus-x compliance.
- Added changes to support v2 version of clearing house.

[2.1.15] - 2025-02-12
### Added
Expand Down
44 changes: 18 additions & 26 deletions DEPENDENCIES
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
maven/mavencentral/ch.qos.logback/logback-classic/1.5.11, EPL-1.0 AND LGPL-2.1-only, approved, #15279
maven/mavencentral/ch.qos.logback/logback-core/1.5.11, EPL-1.0 AND LGPL-2.1-only, approved, #15210
maven/mavencentral/com.apicatalog/titanium-json-ld/1.1.0, Apache-2.0, approved, clearlydefined
maven/mavencentral/com.danubetech/key-formats-java/1.6.0, Apache-2.0, approved, #10950
maven/mavencentral/com.danubetech/verifiable-credentials-java/1.1.0, Apache-2.0, approved, #10953
maven/mavencentral/com.apicatalog/titanium-json-ld/1.3.3, Apache-2.0, approved, #8912
maven/mavencentral/com.danubetech/key-formats-java/1.15.0, Apache-2.0, approved, #19456
maven/mavencentral/com.danubetech/verifiable-credentials-java/1.9.0, MIT, approved, #19458
maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.17.2, Apache-2.0, approved, #13672
maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.17.2, Apache-2.0 AND MIT, approved, #13665
maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.17.2, Apache-2.0, approved, #13671
Expand All @@ -11,27 +11,23 @@ maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jdk8/2.17.2,
maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.17.2, Apache-2.0, approved, #14160
maven/mavencentral/com.fasterxml.jackson.module/jackson-module-parameter-names/2.17.2, Apache-2.0, approved, #15122
maven/mavencentral/com.fasterxml/classmate/1.7.0, Apache-2.0, approved, clearlydefined
maven/mavencentral/com.github.multiformats/java-multibase/v1.1.0, MIT AND BSD-3-Clause AND EPL-1.0 AND Apache-2.0, approved, #4095
maven/mavencentral/com.github.multiformats/java-multibase/1.1.1, Apache-2.0, approved, #19457
maven/mavencentral/com.google.code.findbugs/jsr305/3.0.2, Apache-2.0 and CC-BY-2.5, approved, #15220
maven/mavencentral/com.google.errorprone/error_prone_annotations/2.26.1, Apache-2.0, approved, #13657
maven/mavencentral/com.google.guava/failureaccess/1.0.2, Apache-2.0, approved, CQ22654
maven/mavencentral/com.google.guava/guava/33.2.1-jre, Apache-2.0 AND CC0-1.0 AND (Apache-2.0 AND CC-PDDC), approved, #14607
maven/mavencentral/com.google.guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava, Apache-2.0, approved, CQ22657
maven/mavencentral/com.google.j2objc/j2objc-annotations/3.0.0, Apache-2.0, approved, #13676
maven/mavencentral/com.google.protobuf/protobuf-javalite/4.27.5, BSD-3-Clause, approved, clearlydefined
maven/mavencentral/com.goterl/lazysodium-java/5.1.1, MPL-2.0, approved, #10952
maven/mavencentral/com.goterl/resource-loader/2.0.1, MIT, approved, clearlydefined
maven/mavencentral/com.goterl/lazysodium-java/5.1.4, MPL-2.0, approved, #10952
maven/mavencentral/com.goterl/resource-loader/2.0.2, MPL-2.0, approved, #19461
maven/mavencentral/com.jayway.jsonpath/json-path/2.9.0, Apache-2.0, approved, clearlydefined
maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.39.1, Apache-2.0, approved, #14830
maven/mavencentral/com.squareup.okhttp3/okhttp/4.12.0, Apache-2.0, approved, #15227
maven/mavencentral/com.squareup.okio/okio-jvm/3.6.0, Apache-2.0, approved, #11158
maven/mavencentral/com.squareup.okio/okio/3.6.0, Apache-2.0, approved, #11155
maven/mavencentral/com.vaadin.external.google/android-json/0.0.20131108.vaadin1, Apache-2.0, approved, CQ21310
maven/mavencentral/commons-codec/commons-codec/1.16.1, Apache-2.0 AND (Apache-2.0 AND BSD-3-Clause), approved, #9157
maven/mavencentral/commons-fileupload/commons-fileupload/1.5, Apache-2.0, approved, #7109
maven/mavencentral/commons-io/commons-io/2.14.0, Apache-2.0, approved, #10768
maven/mavencentral/decentralized-identity/jsonld-common-java/1.1.0, Apache-2.0, approved, #10954
maven/mavencentral/info.weboftrust/ld-signatures-java/1.2.0, Apache-2.0, approved, #10951
maven/mavencentral/decentralized-identity/jsonld-common-java/1.9.0, Apache-2.0, approved, #19460
maven/mavencentral/info.weboftrust/ld-signatures-java/1.9.0, Apache-2.0, approved, #19459
maven/mavencentral/io.github.erdtman/java-json-canonicalization/1.1, Apache-2.0, approved, clearlydefined
maven/mavencentral/io.github.openfeign.form/feign-form-spring/3.8.0, Apache-2.0, approved, clearlydefined
maven/mavencentral/io.github.openfeign.form/feign-form/3.8.0, Apache-2.0, approved, clearlydefined
Expand All @@ -41,7 +37,7 @@ maven/mavencentral/io.micrometer/micrometer-commons/1.13.6, Apache-2.0 AND (Apac
maven/mavencentral/io.micrometer/micrometer-core/1.13.6, Apache-2.0 AND (Apache-2.0 AND MIT), approved, #14827
maven/mavencentral/io.micrometer/micrometer-jakarta9/1.13.6, Apache-2.0, approved, clearlydefined
maven/mavencentral/io.micrometer/micrometer-observation/1.13.6, Apache-2.0, approved, #14829
maven/mavencentral/io.setl/rdf-urdna/1.1, Apache-2.0, approved, clearlydefined
maven/mavencentral/io.setl/rdf-urdna/1.2, Apache-2.0, approved, clearlydefined
maven/mavencentral/io.swagger.core.v3/swagger-annotations-jakarta/2.2.21, Apache-2.0, approved, #5947
maven/mavencentral/io.swagger.core.v3/swagger-core-jakarta/2.2.21, Apache-2.0, approved, #5929
maven/mavencentral/io.swagger.core.v3/swagger-models-jakarta/2.2.21, Apache-2.0, approved, #5919
Expand All @@ -54,34 +50,30 @@ maven/mavencentral/jakarta.xml.bind/jakarta.xml.bind-api/4.0.2, BSD-3-Clause, ap
maven/mavencentral/junit/junit/4.13.2, EPL-2.0, approved, CQ23636
maven/mavencentral/net.bytebuddy/byte-buddy-agent/1.14.19, Apache-2.0, approved, #7164
maven/mavencentral/net.bytebuddy/byte-buddy/1.14.19, Apache-2.0 AND BSD-3-Clause, approved, #7163
maven/mavencentral/net.java.dev.jna/jna/5.8.0, Apache-2.0 OR LGPL-2.1-or-later, approved, CQ23217
maven/mavencentral/net.java.dev.jna/jna/5.12.1, Apache-2.0 OR LGPL-2.1-or-later, approved, #3217
maven/mavencentral/net.jcip/jcip-annotations/1.0, CC-BY-2.5, approved, clearlydefined
maven/mavencentral/net.minidev/accessors-smart/2.5.1, Apache-2.0, approved, clearlydefined
maven/mavencentral/net.minidev/json-smart/2.5.1, Apache-2.0, approved, clearlydefined
maven/mavencentral/net.minidev/accessors-smart/2.5.1, Apache-2.0, approved, #19432
maven/mavencentral/net.minidev/json-smart/2.5.1, Apache-2.0, approved, #19431
maven/mavencentral/org.apache.commons/commons-lang3/3.14.0, Apache-2.0, approved, #11677
maven/mavencentral/org.apache.logging.log4j/log4j-api/2.23.1, Apache-2.0, approved, #13368
maven/mavencentral/org.apache.logging.log4j/log4j-to-slf4j/2.23.1, Apache-2.0, approved, #15121
maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-core/10.1.31, Apache-2.0 AND (EPL-2.0 OR (GPL-2.0 WITH Classpath-exception-2.0)) AND CDDL-1.0 AND (CDDL-1.1 OR (GPL-2.0-only WITH Classpath-exception-2.0)) AND EPL-2.0, approved, #15195
maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-el/10.1.31, Apache-2.0, approved, #6997
maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-websocket/10.1.31, Apache-2.0, approved, #7920
maven/mavencentral/org.apache.tomcat/tomcat-annotations-api/10.1.31, Apache-2.0, approved, #8196
maven/mavencentral/org.apiguardian/apiguardian-api/1.1.2, Apache-2.0, approved, clearlydefined
maven/mavencentral/org.apiguardian/apiguardian-api/1.1.2, Apache-2.0, approved, #17641
maven/mavencentral/org.assertj/assertj-core/3.25.3, Apache-2.0, approved, #12585
maven/mavencentral/org.awaitility/awaitility/4.2.2, Apache-2.0, approved, #14178
maven/mavencentral/org.bitcoinj/bitcoinj-core/0.16.1, Apache-2.0, approved, clearlydefined
maven/mavencentral/org.bitcoinj/bitcoinj-core/0.16.2, Apache-2.0, approved, clearlydefined
maven/mavencentral/org.bouncycastle/bcprov-jdk18on/1.78.1, MIT AND CC0-1.0, approved, #14433
maven/mavencentral/org.checkerframework/checker-qual/3.42.0, MIT, approved, clearlydefined
maven/mavencentral/org.glassfish/jakarta.json/2.0.0, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jsonp
maven/mavencentral/org.glassfish/jakarta.json/2.0.1, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jsonp
maven/mavencentral/org.hamcrest/hamcrest-core/2.2, BSD-3-Clause, approved, clearlydefined
maven/mavencentral/org.hamcrest/hamcrest/2.2, BSD-3-Clause, approved, clearlydefined
maven/mavencentral/org.hamcrest/hamcrest/2.2, BSD-3-Clause, approved, #17677
maven/mavencentral/org.hdrhistogram/HdrHistogram/2.2.2, BSD-2-Clause AND CC0-1.0 AND CC0-1.0, approved, #14828
maven/mavencentral/org.hibernate.validator/hibernate-validator/8.0.1.Final, Apache-2.0, approved, clearlydefined
maven/mavencentral/org.hibernate.validator/hibernate-validator/8.0.1.Final, Apache-2.0 AND CC-PDDC, approved, #18198
maven/mavencentral/org.jboss.logging/jboss-logging/3.5.3.Final, Apache-2.0, approved, #9471
maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-common/1.9.25, Apache-2.0, approved, #14186
maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.9.25, Apache-2.0, approved, #14188
maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.9.25, Apache-2.0, approved, #14185
maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib/1.9.25, Apache-2.0, approved, #11827
maven/mavencentral/org.jetbrains/annotations/13.0, Apache-2.0, approved, clearlydefined
maven/mavencentral/org.json/json/20231013, LicenseRef-Public-Domain, approved, #19455
maven/mavencentral/org.junit.jupiter/junit-jupiter-api/5.10.5, EPL-2.0, approved, #9714
maven/mavencentral/org.junit.jupiter/junit-jupiter-engine/5.10.5, EPL-2.0, approved, #9711
maven/mavencentral/org.junit.jupiter/junit-jupiter-params/5.10.5, EPL-2.0, approved, #15250
Expand Down
83 changes: 51 additions & 32 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,17 +81,16 @@ An example of the body for LegalParticipant is given bellow:
{
"type": "LegalParticipant",
"holder": "BPNL000000000000",
"issuer": "CAXSDUMMYCATENAZZ",
"name": "CAXSDUMMYCATENAZZ",
"externalId": "ID01234-123-4321",
"registrationNumber": [
{
"type": "local",
"value": "o12345678"
}
],
"headquarterAddress.country": "DE",
"legalAddress.country": "DE",
"bpn": "BPNL000000000000"
"headquarterAddress.countrySubdivisionCode": "DE-BY",
"legalAddress.countrySubdivisionCode": "DE-NW"
}
```

Expand All @@ -100,33 +99,53 @@ Verifiable Credentials for LegalParticipant:

```json
{
"@context": [
"https://www.w3.org/2018/credentials/v1",
"https://f1c82785-5598-41c7-a083-01a8e1a80e19.mock.pstmn.io/ctxsd"
],
"type": [
"VerifiableCredential"
],
"id": "5096f9c2-24fd-43c5-9d50-e43a409ebb33",
"issuanceDate": "2023-07-26T17:07:31Z",
"expirationDate": "2023-10-24T17:07:31Z",
"credentialSubject": {
"bpn": "BPNL000000000000",
"registrationNumber": [
{
"type": "local",
"value": "o12345678"
}
],
"headquarterAddress": {
"countryCode": "DE"
},
"type": "LegalParticipant",
"legalAddress": {
"countryCode": "DE"
}
},
"issuer": "CAXSDUMMYCATENAZZ"
"@context": "https://www.w3.org/2018/credentials/v1",
"type": "VerifiablePresentation",
"verifiableCredential": [
{
"@context": [
"https://www.w3.org/2018/credentials/v1",
"https://registry.lab.gaia-x.eu/development/api/trusted-shape-registry/v1/shapes/jsonld/trustframework#"
],
"type": [
"VerifiableCredential"
],
"id": "c4d47109-7a41-4440-a505-68ebb8239a91",
"issuanceDate": "2025-02-10T12:05:59Z",
"credentialSubject": {
"id": "http://catena-x.net/bpn/BPNL000000000000",
"type": "gx:LegalParticipant",
"bpn": "BPNL000000000000",
"gx:legalName": "Legal Participant Company Name",
"gx:legalRegistrationNumber": {
"id": "775d0c0b-ce98-433f-a07f-f821f9501fd0"
},
"gx:headquarterAddress": {
"gx:countrySubdivisionCode": "DE-BY"
},
"gx:legalAddress": {
"gx:countrySubdivisionCode": "DE-NW"
}
}
},
{
"@context": [
"https://www.w3.org/2018/credentials/v1",
"https://w3id.org/security/suites/jws-2020/v1"
],
"type": [
"VerifiableCredential"
],
"id": "775d0c0b-ce98-433f-a07f-f821f9501fd0",
"issuanceDate": "2025-02-10T12:05:59Z",
"credentialSubject": {
"@context": "https://registry.lab.gaia-x.eu/development/api/trusted-shape-registry/v1/shapes/jsonld/trustframework#",
"type": "gx:legalRegistrationNumber",
"id": "http://catena-x.net/bpn/BPNL000000000000",
"gx:leiCode": "5299004XSA235235"
}
}
]
}
```

Expand Down Expand Up @@ -260,7 +279,7 @@ Distributed under the Apache 2.0 License. See [LICENSE](LICENSE) for more inform

For contacting regarding the project see [CONTACT](CONTACT.md)

[Pre-22.4 schema, AKA 1.06]: src/main/resources/static/SDFactoryApi-vRel3.yml
[Pre-22.4 schema, AKA 1.06]: src/main/resources/static/SDFactoryApi-Tagus.yml
[Trust Framework]: https://gitlab.com/gaia-x/policy-rules-committee/trust-framework
[Trust Framework V.22.10]: https://gitlab.com/gaia-x/policy-rules-committee/trust-framework/-/tree/22.10

30 changes: 27 additions & 3 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/********************************************************************************
* Copyright (c) 2022,2024 T-Systems International GmbH
* Copyright (c) 2022,2024 Contributors to the Eclipse Foundation
* Copyright (c) 2022,2025 T-Systems International GmbH
* Copyright (c) 2022,2025 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
Expand Down Expand Up @@ -171,7 +171,7 @@
<dependency>
<groupId>com.danubetech</groupId>
<artifactId>verifiable-credentials-java</artifactId>
<version>1.1.0</version>
<version>1.9.0</version>
</dependency>
</dependencies>

Expand Down Expand Up @@ -326,6 +326,30 @@
</configOptions>
</configuration>
</execution>
<execution>
<id>api-tagus</id>
<goals>
<goal>generate</goal>
</goals>
<configuration>
<inputSpec>${project.basedir}/src/main/resources/static/SDFactoryApi-Tagus.yml</inputSpec>
<generatorName>spring</generatorName>
<apiPackage>org.eclipse.tractusx.selfdescriptionfactory.api.tagus</apiPackage>
<modelPackage>org.eclipse.tractusx.selfdescriptionfactory.model.tagus</modelPackage>
<supportingFilesToGenerate>
ApiUtil.java
</supportingFilesToGenerate>
<configOptions>
<useSpringBoot3>true</useSpringBoot3>
<useJakartaEe>true</useJakartaEe>
<delegatePattern>true</delegatePattern>
<openApiNullable>false</openApiNullable>
<dateLibrary>java8</dateLibrary>
<java8>true</java8>
<useBeanValidation>true</useBeanValidation>
</configOptions>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
Expand Down
Loading

0 comments on commit b2ccdba

Please sign in to comment.