Merge pull request #141 from eclipse-tractusx/fix/3.2.x/tx-qg-3.1

Add application fixes for Tractus-X quality gate 3.1
eclipse-tractusx · May 11, 2023 · 5800999 · 5800999
2 parents 5bcd225 + 8d758df
commit 5800999
Show file tree

Hide file tree

Showing 10 changed files with 105 additions and 108 deletions.
diff --git a/DEPENDENCIES b/DEPENDENCIES
diff --git a/README.md b/README.md
@@ -2,17 +2,17 @@
 
 ## Project Description
 
-This repository is part of the overarching Catena-X project.
+This repository is part of the overarching Eclipse Tractus-X project.
 
 BPDM is an acronym for business partner data management.
-This project provides core services for querying, adding and changing business partner base information in the Catena-X landscape.
+This project provides core services for querying, adding and changing business partner base information in the Eclipse Tractus-X landscape.
 
 Currently, BPDM consists of the Pool and Gate services.
 
 ## BPDM Pool
 
-The BPDM Pool is the single source of truth in Catena-X for business partner base information such as addresses and official identifiers.
-Each record in the Pool has a unique identifier with which it can be referenced across the entire Catena-X landscape, the business partner number.
+The BPDM Pool is the single source of truth in Eclipse Tractus-X for business partner base information such as addresses and official identifiers.
+Each record in the Pool has a unique identifier with which it can be referenced across the entire Eclipse Tractus-X landscape, the business partner number.
 Business partner records are divided into legal entities, sites and partner addresses.
 Self-explanatory, a legal entity record represents the legal entity information about a business partner.
 A site may represent legal entity's plant or campus which is big enough to contain several contact/delivery addresses.
@@ -24,7 +24,8 @@ The Pool offers an API to query these business partner records by BPN, other ide
 
 ## BPDM Gate
 
-The BPDM Gate offers an API for Catena-X members to share their own business partner data with Catena-X. Such members are called sharing members.
+The BPDM Gate offers an API for Eclipse Tractus-X members to share their own business partner data with Eclipse Tractus-X. Such members are called sharing
+members.
 Via the Gate service they can add their own business partner records but also retrieve cleaned and enhanced data back in return over the sharing process.
 Shared business partner records that have successfully gone through the sharing process end up in the BPDM Pool and will receive a BPN there (or merge with an
 existing record).

diff --git a/bpdm-common/pom.xml b/bpdm-common/pom.xml
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.eclipse.tractusx</groupId>
         <artifactId>bpdm-parent</artifactId>
-        <version>3.2.1</version>
+        <version>3.2.2</version>
     </parent>
 
     <dependencies>

diff --git a/bpdm-gate-api/pom.xml b/bpdm-gate-api/pom.xml
@@ -31,7 +31,7 @@
     <parent>
         <artifactId>bpdm-parent</artifactId>
         <groupId>org.eclipse.tractusx</groupId>
-        <version>3.2.1</version>
+        <version>3.2.2</version>
     </parent>
 
     <properties>

diff --git a/bpdm-gate/Dockerfile b/bpdm-gate/Dockerfile
@@ -6,8 +6,12 @@ RUN mvn -B -U clean package -pl bpdm-gate -am -DskipTests
 FROM eclipse-temurin:17-jre-alpine
 COPY --from=build /home/app/bpdm-gate/target/bpdm-gate.jar /usr/local/lib/bpdm/app.jar
 RUN apk update && apk upgrade libssl3 libcrypto3
-RUN addgroup -S bpdm && adduser -S bpdm -G bpdm
-USER bpdm
+ARG USERNAME=bpdm
+ARG USERID=10001
+ARG GID=3000
+RUN addgroup -g $GID -S $USERNAME
+RUN adduser -u $USERID -S $USERNAME $USERNAME
+USER $USERNAME
 WORKDIR /usr/local/lib/bpdm
 EXPOSE 8080
 ENTRYPOINT ["java","-jar","app.jar"]
diff --git a/bpdm-gate/pom.xml b/bpdm-gate/pom.xml
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.eclipse.tractusx</groupId>
         <artifactId>bpdm-parent</artifactId>
-        <version>3.2.1</version>
+        <version>3.2.2</version>
     </parent>
 
     <dependencies>

diff --git a/bpdm-pool-api/pom.xml b/bpdm-pool-api/pom.xml
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.eclipse.tractusx</groupId>
         <artifactId>bpdm-parent</artifactId>
-        <version>3.2.1</version>
+        <version>3.2.2</version>
     </parent>
 
     <properties>

diff --git a/bpdm-pool/Dockerfile b/bpdm-pool/Dockerfile
@@ -6,8 +6,12 @@ RUN mvn -B -U clean package -pl bpdm-pool -am -DskipTests
 FROM eclipse-temurin:17-jre-alpine
 COPY --from=build /home/app/bpdm-pool/target/bpdm-pool.jar /usr/local/lib/bpdm/app.jar
 RUN apk update && apk upgrade libssl3 libcrypto3
-RUN addgroup -S bpdm && adduser -S bpdm -G bpdm
-USER bpdm
+ARG USERNAME=bpdm
+ARG USERID=10001
+ARG GID=3000
+RUN addgroup -g $GID -S $USERNAME
+RUN adduser -u $USERID -S $USERNAME $USERNAME
+USER $USERNAME
 WORKDIR /usr/local/lib/bpdm
 EXPOSE 8080
 ENTRYPOINT ["java","-jar","app.jar"]
diff --git a/bpdm-pool/pom.xml b/bpdm-pool/pom.xml
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.eclipse.tractusx</groupId>
         <artifactId>bpdm-parent</artifactId>
-        <version>3.2.1</version>
+        <version>3.2.2</version>
     </parent>
 
     <properties>

diff --git a/pom.xml b/pom.xml
@@ -27,13 +27,13 @@
     <artifactId>bpdm-parent</artifactId>
     <name>Business Partner Data Management Parent</name>
     <description>Parent pom of Business Partner Data Management</description>
-    <version>3.2.1</version>
+    <version>3.2.2</version>
     <packaging>pom</packaging>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.0.5</version>
+        <version>3.0.6</version>
     </parent>
     <modules>
         <module>bpdm-pool-api</module>
@@ -115,29 +115,17 @@
                 <artifactId>springdoc-openapi-starter-common</artifactId>
                 <version>${springdoc.version}</version>
             </dependency>
-            <!-- Kotlin wrapper for slf4j (Logging)-->
-            <dependency>
-                <groupId>io.github.microutils</groupId>
-                <artifactId>kotlin-logging-jvm</artifactId>
-                <version>${kotlinlogging.version}</version>
-            </dependency>
             <!-- Override snakeyaml version used by transitive dependencies due to security issue -->
             <dependency>
                 <groupId>org.yaml</groupId>
                 <artifactId>snakeyaml</artifactId>
                 <version>2.0</version>
             </dependency>
-            <!-- Override spring expression version used by transitive dependencies due to security issue -->
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-expression</artifactId>
-                <version>6.0.8</version>
-            </dependency>
-            <!-- Override spring core version used by transitive dependencies due to security issue -->
+            <!-- Kotlin wrapper for slf4j (Logging)-->
             <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-core</artifactId>
-                <version>6.0.8</version>
+                <groupId>io.github.microutils</groupId>
+                <artifactId>kotlin-logging-jvm</artifactId>
+                <version>${kotlinlogging.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.github.tomakehurst</groupId>