Merge pull request #597 from catenax-ng/feature/TRI-1468-enable-full-…

…library-release Feature/tri 1468 enable full library release
eclipse-tractusx · Oct 26, 2023 · 773edc7 · 773edc7
2 parents 5dd2fbf + f9bfa8b
commit 773edc7
Show file tree

Hide file tree

Showing 14 changed files with 213 additions and 83 deletions.
diff --git 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:
             </servers>
           </settings>" > $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
@@ -25,7 +25,7 @@
         <dependency>
             <groupId>org.eclipse.tractusx.irs</groupId>
             <artifactId>irs-edc-client</artifactId>
-            <version>${revision}</version>
+            <version>${irs-registry-client.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.tractusx.irs</groupId>
@@ -148,7 +148,7 @@
         <dependency>
             <groupId>org.eclipse.tractusx.irs</groupId>
             <artifactId>irs-models</artifactId>
-            <version>${project.version}</version>
+            <version>${irs-registry-client.version}</version>
         </dependency>
         <dependency>
             <groupId>net.jimblackler</groupId>
@@ -171,7 +171,7 @@
         <dependency>
             <groupId>org.eclipse.tractusx.irs</groupId>
             <artifactId>irs-testing</artifactId>
-            <version>${revision}</version>
+            <version>${irs-registry-client.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/irs-common/pom.xml b/irs-common/pom.xml
@@ -74,7 +74,7 @@
         <dependency>
             <groupId>org.eclipse.tractusx.irs</groupId>
             <artifactId>irs-testing</artifactId>
-            <version>${revision}</version>
+            <version>${irs-registry-client.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/irs-cucumber-tests/pom.xml b/irs-cucumber-tests/pom.xml
@@ -75,7 +75,7 @@
         <dependency>
             <groupId>org.eclipse.tractusx.irs</groupId>
             <artifactId>irs-models</artifactId>
-            <version>${project.version}</version>
+            <version>${irs-registry-client.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.yaml</groupId>

diff --git a/irs-edc-client/pom.xml b/irs-edc-client/pom.xml
@@ -10,15 +10,24 @@
         <relativePath>../irs-parent-spring-boot</relativePath>
     </parent>
 
+    <url>https://github.com/eclipse-tractusx/item-relationship-service</url>
+    <scm>
+        <connection>scm:git:git://github.com/eclipse-tractusx/item-relationship-service.git</connection>
+        <developerConnection>scm:git:ssh://github.com:eclipse-tractusx/item-relationship-service.git
+        </developerConnection>
+        <url>https://github.com/eclipse-tractusx/item-relationship-service</url>
+    </scm>
+
     <artifactId>irs-edc-client</artifactId>
+    <version>${irs-registry-client.version}</version>
     <name>EDC Client</name>
     <description>Client library to easily talk to the EDC</description>
 
     <dependencies>
         <dependency>
             <groupId>org.eclipse.tractusx.irs</groupId>
             <artifactId>irs-models</artifactId>
-            <version>${project.version}</version>
+            <version>${irs-registry-client.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.yaml</groupId>
@@ -163,7 +172,7 @@
         <dependency>
             <groupId>org.eclipse.tractusx.irs</groupId>
             <artifactId>irs-testing</artifactId>
-            <version>${revision}</version>
+            <version>${irs-registry-client.version}</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>

diff --git a/irs-integration-tests/pom.xml b/irs-integration-tests/pom.xml
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>org.eclipse.tractusx.irs</groupId>
             <artifactId>irs-models</artifactId>
-            <version>${revision}</version>
+            <version>${irs-registry-client.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.yaml</groupId>

diff --git a/irs-models/pom.xml b/irs-models/pom.xml
@@ -10,8 +10,16 @@
         <relativePath>../irs-parent-spring-boot</relativePath>
     </parent>
 
-    <artifactId>irs-models</artifactId>
+    <url>https://github.com/eclipse-tractusx/item-relationship-service</url>
+    <scm>
+        <connection>scm:git:git://github.com/eclipse-tractusx/item-relationship-service.git</connection>
+        <developerConnection>scm:git:ssh://github.com:eclipse-tractusx/item-relationship-service.git
+        </developerConnection>
+        <url>https://github.com/eclipse-tractusx/item-relationship-service</url>
+    </scm>
 
+    <artifactId>irs-models</artifactId>
+    <version>${irs-registry-client.version}</version>
     <name>IRS Models</name>
     <description>Data Transfer Object definitions shared between controllers and clients. Part of OpenAPI definition.
     </description>

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
@@ -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<Description> 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
@@ -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
@@ -60,12 +60,12 @@
         <dependency>
             <groupId>org.eclipse.tractusx.irs</groupId>
             <artifactId>irs-edc-client</artifactId>
-            <version>${revision}</version>
+            <version>${irs-registry-client.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.tractusx.irs</groupId>
             <artifactId>irs-models</artifactId>
-            <version>${revision}</version>
+            <version>${irs-registry-client.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.yaml</groupId>
@@ -99,7 +99,7 @@
         <dependency>
             <groupId>org.eclipse.tractusx.irs</groupId>
             <artifactId>irs-testing</artifactId>
-            <version>${revision}</version>
+            <version>${irs-registry-client.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/irs-registry-client/pom.xml b/irs-registry-client/pom.xml
@@ -10,6 +10,14 @@
         <relativePath>../irs-parent-spring-boot</relativePath>
     </parent>
 
+    <url>https://github.com/eclipse-tractusx/item-relationship-service</url>
+    <scm>
+        <connection>scm:git:git://github.com/eclipse-tractusx/item-relationship-service.git</connection>
+        <developerConnection>scm:git:ssh://github.com:eclipse-tractusx/item-relationship-service.git
+        </developerConnection>
+        <url>https://github.com/eclipse-tractusx/item-relationship-service</url>
+    </scm>
+
     <artifactId>irs-registry-client</artifactId>
     <name>Digital Twin Registry Client</name>
     <version>${irs-registry-client.version}</version>
@@ -19,12 +27,12 @@
         <dependency>
             <groupId>org.eclipse.tractusx.irs</groupId>
             <artifactId>irs-edc-client</artifactId>
-            <version>${revision}</version>
+            <version>${irs-registry-client.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.tractusx.irs</groupId>
             <artifactId>irs-models</artifactId>
-            <version>${revision}</version>
+            <version>${irs-registry-client.version}</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -54,58 +62,8 @@
         <dependency>
             <groupId>org.eclipse.tractusx.irs</groupId>
             <artifactId>irs-testing</artifactId>
-            <version>${revision}</version>
+            <version>${irs-registry-client.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>${maven-assembly-plugin.version}</version>
-                <configuration>
-                    <descriptorRefs>
-                        <descriptorRef>jar-with-dependencies</descriptorRef>
-                    </descriptorRefs>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>make-assembly</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>3.3.0</version>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <goals>
-                            <goal>jar-no-fork</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.2.0</version>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 </project>
diff --git a/irs-report-aggregate/pom.xml b/irs-report-aggregate/pom.xml
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>irs-models</artifactId>
-            <version>${project.version}</version>
+            <version>${irs-registry-client.version}</version>
         </dependency>
     </dependencies>
     <build>

diff --git a/irs-testing/pom.xml b/irs-testing/pom.xml
@@ -10,8 +10,16 @@
         <relativePath>../irs-parent-spring-boot</relativePath>
     </parent>
 
-    <artifactId>irs-testing</artifactId>
+    <url>https://github.com/eclipse-tractusx/item-relationship-service</url>
+    <scm>
+        <connection>scm:git:git://github.com/eclipse-tractusx/item-relationship-service.git</connection>
+        <developerConnection>scm:git:ssh://github.com:eclipse-tractusx/item-relationship-service.git
+        </developerConnection>
+        <url>https://github.com/eclipse-tractusx/item-relationship-service</url>
+    </scm>
 
+    <artifactId>irs-testing</artifactId>
+    <version>${irs-registry-client.version}</version>
     <name>IRS Testing Utilities</name>
     <description>Item Relationship Service Testing Utilities</description>
 
@@ -65,7 +73,7 @@
         <dependency>
             <groupId>org.eclipse.tractusx.irs</groupId>
             <artifactId>irs-models</artifactId>
-            <version>${revision}</version>
+            <version>${irs-registry-client.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>