diff --git a/.github/workflows/maven-deploy.yaml b/.github/workflows/maven-deploy.yaml
index d5fdfa8648..369c96fc7d 100644
--- a/.github/workflows/maven-deploy.yaml
+++ b/.github/workflows/maven-deploy.yaml
@@ -55,9 +55,6 @@ jobs:
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- - name: Build with Maven
- run: mvn package -pl irs-testing,irs-models,irs-common,irs-edc-client,irs-registry-client --batch-mode
-
# Import GPG Key
- uses: ./.github/actions/import-gpg-key
name: "Import GPG Key"
@@ -77,16 +74,19 @@ jobs:
" > $HOME/.m2/settings.xml
+ - name: Copy License information
+ run: |
+ mkdir -p irs-registry-client/src/main/resources/META-INF/
+ mkdir -p irs-edc-client/src/main/resources/META-INF/
+ mkdir -p irs-models/src/main/resources/META-INF/
+ mkdir -p irs-testing/src/main/resources/META-INF/
+ cp LICENSE NOTICE.md DEPENDENCIES SECURITY.md irs-registry-client/src/main/resources/META-INF/
+ cp LICENSE NOTICE.md DEPENDENCIES SECURITY.md irs-edc-client/src/main/resources/META-INF/
+ cp LICENSE NOTICE.md DEPENDENCIES SECURITY.md irs-models/src/main/resources/META-INF/
+ cp LICENSE NOTICE.md DEPENDENCIES SECURITY.md irs-testing/src/main/resources/META-INF/
+
# publish snapshots or releases
- name: Publish version
run: |-
VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout -pl irs-registry-client)
- REPOSITORY_URL="https://oss.sonatype.org/service/local/staging/deploy/maven2/"
- if [[ $VERSION == *"-SNAPSHOT"* ]]; then
- echo "Using snapshot repository"
- REPOSITORY_URL="https://oss.sonatype.org/content/repositories/snapshots"
- fi
- echo "Publishing Version $VERSION to Sonatype Repository $REPOSITORY_URL"
- mvn -s $HOME/.m2/settings.xml --batch-mode gpg:sign-and-deploy-file -Dgpg.passphrase="${{ secrets.ORG_GPG_PASSPHRASE }}" -Durl=$REPOSITORY_URL -DrepositoryId=ossrh -Dfile=irs-registry-client/target/irs-registry-client-$VERSION-jar-with-dependencies.jar -DgroupId=org.eclipse.tractusx.irs -DartifactId=irs-registry-client -Dversion=$VERSION -Dpackaging=jar
- mvn -s $HOME/.m2/settings.xml --batch-mode gpg:sign-and-deploy-file -Dgpg.passphrase="${{ secrets.ORG_GPG_PASSPHRASE }}" -Durl=$REPOSITORY_URL -DrepositoryId=ossrh -Dfile=irs-registry-client/target/irs-registry-client-$VERSION-sources.jar -Dclassifier=sources -DgroupId=org.eclipse.tractusx.irs -DartifactId=irs-registry-client -Dversion=$VERSION -Dpackaging=jar
- mvn -s $HOME/.m2/settings.xml --batch-mode gpg:sign-and-deploy-file -Dgpg.passphrase="${{ secrets.ORG_GPG_PASSPHRASE }}" -Durl=$REPOSITORY_URL -DrepositoryId=ossrh -Dfile=irs-registry-client/target/irs-registry-client-$VERSION-javadoc.jar -Dclassifier=javadoc -DgroupId=org.eclipse.tractusx.irs -DartifactId=irs-registry-client -Dversion=$VERSION -Dpackaging=jar
+ mvn clean deploy -s $HOME/.m2/settings.xml --batch-mode -Dgpg.passphrase="${{ secrets.ORG_GPG_PASSPHRASE }}" -Prelease -pl irs-testing,irs-models,irs-edc-client,irs-registry-client -Drevision=$VERSION
diff --git a/irs-api/pom.xml b/irs-api/pom.xml
index 9c546a88f4..2f2f9eaffa 100644
--- a/irs-api/pom.xml
+++ b/irs-api/pom.xml
@@ -25,7 +25,7 @@
org.eclipse.tractusx.irs
irs-edc-client
- ${revision}
+ ${irs-registry-client.version}
org.eclipse.tractusx.irs
@@ -148,7 +148,7 @@
org.eclipse.tractusx.irs
irs-models
- ${project.version}
+ ${irs-registry-client.version}
net.jimblackler
@@ -171,7 +171,7 @@
org.eclipse.tractusx.irs
irs-testing
- ${revision}
+ ${irs-registry-client.version}
test
diff --git a/irs-common/pom.xml b/irs-common/pom.xml
index 1473cbe828..b455c679f3 100644
--- a/irs-common/pom.xml
+++ b/irs-common/pom.xml
@@ -74,7 +74,7 @@
org.eclipse.tractusx.irs
irs-testing
- ${revision}
+ ${irs-registry-client.version}
test
diff --git a/irs-cucumber-tests/pom.xml b/irs-cucumber-tests/pom.xml
index 3213fdc1c8..c4f13ede6f 100644
--- a/irs-cucumber-tests/pom.xml
+++ b/irs-cucumber-tests/pom.xml
@@ -75,7 +75,7 @@
org.eclipse.tractusx.irs
irs-models
- ${project.version}
+ ${irs-registry-client.version}
org.yaml
diff --git a/irs-edc-client/pom.xml b/irs-edc-client/pom.xml
index 640da1a559..181e4a83f5 100644
--- a/irs-edc-client/pom.xml
+++ b/irs-edc-client/pom.xml
@@ -10,7 +10,16 @@
../irs-parent-spring-boot
+ https://github.com/eclipse-tractusx/item-relationship-service
+
+ scm:git:git://github.com/eclipse-tractusx/item-relationship-service.git
+ scm:git:ssh://github.com:eclipse-tractusx/item-relationship-service.git
+
+ https://github.com/eclipse-tractusx/item-relationship-service
+
+
irs-edc-client
+ ${irs-registry-client.version}
EDC Client
Client library to easily talk to the EDC
@@ -18,7 +27,7 @@
org.eclipse.tractusx.irs
irs-models
- ${project.version}
+ ${irs-registry-client.version}
org.yaml
@@ -163,7 +172,7 @@
org.eclipse.tractusx.irs
irs-testing
- ${revision}
+ ${irs-registry-client.version}
test
diff --git a/irs-integration-tests/pom.xml b/irs-integration-tests/pom.xml
index 220b7615f8..151e03308c 100644
--- a/irs-integration-tests/pom.xml
+++ b/irs-integration-tests/pom.xml
@@ -23,7 +23,7 @@
org.eclipse.tractusx.irs
irs-models
- ${revision}
+ ${irs-registry-client.version}
org.yaml
diff --git a/irs-models/pom.xml b/irs-models/pom.xml
index ca3e004d04..c66b493ff3 100644
--- a/irs-models/pom.xml
+++ b/irs-models/pom.xml
@@ -10,8 +10,16 @@
../irs-parent-spring-boot
- irs-models
+ https://github.com/eclipse-tractusx/item-relationship-service
+
+ scm:git:git://github.com/eclipse-tractusx/item-relationship-service.git
+ scm:git:ssh://github.com:eclipse-tractusx/item-relationship-service.git
+
+ https://github.com/eclipse-tractusx/item-relationship-service
+
+ irs-models
+ ${irs-registry-client.version}
IRS Models
Data Transfer Object definitions shared between controllers and clients. Part of OpenAPI definition.
diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/GenericDescription.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/GenericDescription.java
index 114217422a..66ea98999b 100644
--- a/irs-models/src/main/java/org/eclipse/tractusx/irs/component/GenericDescription.java
+++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/component/GenericDescription.java
@@ -39,6 +39,7 @@
@Builder(toBuilder = true)
@JsonDeserialize(builder = GenericDescription.GenericDescriptionBuilder.class)
public class GenericDescription {
+
@Schema(description = "Identification string")
private String identification;
@@ -50,5 +51,4 @@ public class GenericDescription {
@Schema(description = "Description")
private List descriptions;
-
}
diff --git a/irs-models/src/main/java/org/eclipse/tractusx/irs/dtos/ErrorResponse.java b/irs-models/src/main/java/org/eclipse/tractusx/irs/dtos/ErrorResponse.java
index add2b911fc..11be7004ed 100644
--- a/irs-models/src/main/java/org/eclipse/tractusx/irs/dtos/ErrorResponse.java
+++ b/irs-models/src/main/java/org/eclipse/tractusx/irs/dtos/ErrorResponse.java
@@ -40,6 +40,7 @@
@Builder(toBuilder = true, setterPrefix = "with")
@JsonDeserialize(builder = ErrorResponse.ErrorResponseBuilder.class)
public class ErrorResponse {
+
@Schema(description = "Error code.")
private HttpStatus statusCode;
diff --git a/irs-policy-store/pom.xml b/irs-policy-store/pom.xml
index cafb6ea7bf..d4558d0464 100644
--- a/irs-policy-store/pom.xml
+++ b/irs-policy-store/pom.xml
@@ -60,12 +60,12 @@
org.eclipse.tractusx.irs
irs-edc-client
- ${revision}
+ ${irs-registry-client.version}
org.eclipse.tractusx.irs
irs-models
- ${revision}
+ ${irs-registry-client.version}
org.yaml
@@ -99,7 +99,7 @@
org.eclipse.tractusx.irs
irs-testing
- ${revision}
+ ${irs-registry-client.version}
test
diff --git a/irs-registry-client/pom.xml b/irs-registry-client/pom.xml
index 71ac2bc2cf..9621ea237e 100644
--- a/irs-registry-client/pom.xml
+++ b/irs-registry-client/pom.xml
@@ -10,6 +10,14 @@
../irs-parent-spring-boot
+ https://github.com/eclipse-tractusx/item-relationship-service
+
+ scm:git:git://github.com/eclipse-tractusx/item-relationship-service.git
+ scm:git:ssh://github.com:eclipse-tractusx/item-relationship-service.git
+
+ https://github.com/eclipse-tractusx/item-relationship-service
+
+
irs-registry-client
Digital Twin Registry Client
${irs-registry-client.version}
@@ -19,12 +27,12 @@
org.eclipse.tractusx.irs
irs-edc-client
- ${revision}
+ ${irs-registry-client.version}
org.eclipse.tractusx.irs
irs-models
- ${revision}
+ ${irs-registry-client.version}
org.projectlombok
@@ -54,58 +62,8 @@
org.eclipse.tractusx.irs
irs-testing
- ${revision}
+ ${irs-registry-client.version}
test
-
-
-
-
- org.apache.maven.plugins
- maven-assembly-plugin
- ${maven-assembly-plugin.version}
-
-
- jar-with-dependencies
-
-
-
-
- make-assembly
- package
-
- single
-
-
-
-
-
- org.apache.maven.plugins
- maven-source-plugin
- 3.3.0
-
-
- attach-sources
-
- jar-no-fork
-
-
-
-
-
- org.apache.maven.plugins
- maven-javadoc-plugin
- 3.2.0
-
-
- attach-javadocs
-
- jar
-
-
-
-
-
-
diff --git a/irs-report-aggregate/pom.xml b/irs-report-aggregate/pom.xml
index 7641e16125..fa6d920fbd 100644
--- a/irs-report-aggregate/pom.xml
+++ b/irs-report-aggregate/pom.xml
@@ -22,7 +22,7 @@
${project.groupId}
irs-models
- ${project.version}
+ ${irs-registry-client.version}
diff --git a/irs-testing/pom.xml b/irs-testing/pom.xml
index ae4fb8e7ff..4bff31d728 100644
--- a/irs-testing/pom.xml
+++ b/irs-testing/pom.xml
@@ -10,8 +10,16 @@
../irs-parent-spring-boot
- irs-testing
+ https://github.com/eclipse-tractusx/item-relationship-service
+
+ scm:git:git://github.com/eclipse-tractusx/item-relationship-service.git
+ scm:git:ssh://github.com:eclipse-tractusx/item-relationship-service.git
+
+ https://github.com/eclipse-tractusx/item-relationship-service
+
+ irs-testing
+ ${irs-registry-client.version}
IRS Testing Utilities
Item Relationship Service Testing Utilities
@@ -65,7 +73,7 @@
org.eclipse.tractusx.irs
irs-models
- ${revision}
+ ${irs-registry-client.version}
com.fasterxml.jackson.datatype
diff --git a/pom.xml b/pom.xml
index 25f21614d9..704ccaa140 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,8 +8,42 @@
${revision}
pom
- IRS Root
- Root module containing other modules.
+ Item Relationship Service
+ Root module of Item Relationship Service containing other modules.
+ https://github.com/eclipse-tractusx/item-relationship-service
+
+
+
+ The Apache License, Version 2.0
+ https://www.apache.org/licenses/LICENSE-2.0.txt
+
+
+
+
+ scm:git:git://github.com/eclipse-tractusx/item-relationship-service.git
+ scm:git:ssh://github.com:eclipse-tractusx/item-relationship-service.git
+
+ https://github.com/eclipse-tractusx/item-relationship-service
+
+
+
+
+ ds-jhartmann
+ Jaro Hartmann
+ jaro.hartmann@doubleslash.de
+
+
+
+
+
+ ossrh
+ https://oss.sonatype.org/content/repositories/snapshots
+
+
+ ossrh
+ https://oss.sonatype.org/service/local/staging/deploy/maven2/
+
+
irs-testing
@@ -365,5 +399,117 @@
+
+ release
+
+ true
+
+
+
+
+ org.codehaus.mojo
+ flatten-maven-plugin
+ 1.5.0
+
+ ossrh
+
+
+
+ flatten
+ process-resources
+
+ flatten
+
+
+
+ flatten.clean
+ clean
+
+ clean
+
+
+
+
+
+ org.projectlombok
+ lombok-maven-plugin
+ 1.18.20.0
+
+
+ org.projectlombok
+ lombok
+ 1.18.30
+
+
+
+ ${project.basedir}/src/main/java
+ ${delombok.output}
+ false
+
+
+
+ generate-sources
+
+ delombok
+
+
+
+
+
+ org.sonatype.plugins
+ nexus-staging-maven-plugin
+ 1.6.13
+ true
+
+ ossrh
+ https://oss.sonatype.org/
+ true
+
+
+
+ org.apache.maven.plugins
+ maven-gpg-plugin
+
+
+ sign-artifacts
+ verify
+
+ sign
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-source-plugin
+ 3.3.0
+
+
+ attach-sources
+
+ jar-no-fork
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+ 3.2.0
+
+
+ attach-javadocs
+
+ jar
+
+
+
+
+ ${project.build.directory}/generated-sources/delombok
+
+
+
+
+