Merge remote-tracking branch 'remotes/origin/dev-thomas' into dev-ernst

dlr-eoc · Mar 15, 2024 · daf556e · daf556e
2 parents 5c7ec61 + db33bb1
commit daf556e
Show file tree

Hide file tree

Showing 2,461 changed files with 29,795 additions and 13,499 deletions.
diff --git a/.github/workflows/install_all.yml b/.github/workflows/install_all.yml
@@ -1,10 +1,11 @@
-# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
-# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven 
-
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support 
-# documentation. 
+# install_all.yml
+#
+# (C) 2024 Dr. Bassler & Co. Managementberatung GmbH
+#
+# Installs the whole prosEO project and runs all tests
+# 
+# @author Denys Chaykovskiy
+#
 
 name: Install all 
 
@@ -62,6 +63,12 @@ jobs:
         docker tag openjdk:11 localhost:5000/openjdk:11
         docker push localhost:5000/openjdk:11
         
+    - name: Show current directory
+      run: pwd
+
+    - name: Add minio container for s3 testing
+      run: docker compose -f ./storage-mgr/src/test/resources/docker-compose.yml up -d
+
     - name: Show docker images 
       run: docker images
 

diff --git a/.github/workflows/install_all_notests.yml b/.github/workflows/install_all_notests.yml
@@ -1,10 +1,11 @@
-# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
-# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven 
-
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
+# install_all_notests.yml
+#
+# (C) 2024 Dr. Bassler & Co. Managementberatung GmbH
+#
+# Installs the whole prosEO project without test execution
+# 
+# @author Denys Chaykovskiy
+#
 
 name: Install all no tests
 

diff --git a/api/aip-client/pom.xml b/api/aip-client/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>de.dlr.proseo</groupId>
     <artifactId>proseo-api</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>aip-client</artifactId>
@@ -18,7 +18,6 @@
 	</organization>
 
 	<properties>
-		<module.version>1.0.0</module.version>
         <olingo.version>4.7.1</olingo.version>
         <netty.version>4.1.48.Final</netty.version>
 		<main.basedir>${basedir}/../..</main.basedir>
@@ -188,14 +187,14 @@
                                 <exec executable="docker" failonerror="true">
                                     <arg value="build" />
                                     <arg value="-t" />
-                                    <arg value="${docker.registry}/${project.build.finalName}:${module.version}" />
+                                    <arg value="${docker.registry}/${project.build.finalName}:${project.version}" />
                                     <arg value="--platform" />
                                     <arg value="${project.build.platform}" />
                                     <arg value="." />
                                 </exec>
                                 <exec executable="docker" failonerror="true">
                                     <arg value="push" />
-                                    <arg value="${docker.registry}/${project.build.finalName}:${module.version}" />
+                                    <arg value="${docker.registry}/${project.build.finalName}:${project.version}" />
                                 </exec>
                             </target>
                         </configuration>

diff --git a/api/archive-mgr/pom.xml b/api/archive-mgr/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>de.dlr.proseo</groupId>
 		<artifactId>proseo-api</artifactId>
-		<version>1.0.0</version>
+		<version>1.0.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>proseo-archive-mgr</artifactId>
@@ -18,7 +18,6 @@
 	</organization>
 
 	<properties>
-		<module.version>1.0.0</module.version>
 		<main.basedir>${basedir}/../..</main.basedir>
 		<raml-path>src/main/resources/raml/archive-mgr-api.raml</raml-path>
 		<raml-base-package>de.dlr.proseo.archivemgr.rest</raml-base-package>
@@ -161,14 +160,14 @@
                             	<exec executable="docker" failonerror="true">
                                     <arg value="build" />
                                     <arg value="-t" />
-                                    <arg value="${docker.registry}/${project.build.finalName}:${module.version}" />
+                                    <arg value="${docker.registry}/${project.build.finalName}:${project.version}" />
                                     <arg value="--platform" />
                                     <arg value="${project.build.platform}" />
                                     <arg value="." />
                                 </exec>
                             	<exec executable="docker" failonerror="true">
                                     <arg value="push" />
-                                    <arg value="${docker.registry}/${project.build.finalName}:${module.version}" />
+                                    <arg value="${docker.registry}/${project.build.finalName}:${project.version}" />
                                 </exec>
                             </target>
                         </configuration>

diff --git a/api/auxip-monitor/pom.xml b/api/auxip-monitor/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>de.dlr.proseo</groupId>
 		<artifactId>proseo-api</artifactId>
-		<version>1.0.0</version>
+		<version>1.0.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>auxip-monitor</artifactId>
@@ -17,7 +17,6 @@
 	</organization>
 
 	<properties>
-		<module.version>1.0.0</module.version>
 		<olingo.version>4.7.1</olingo.version>
 		<main.basedir>${basedir}/../..</main.basedir>
 		<raml-path>src/main/resources/raml/auxip-monitor-api.raml</raml-path>
@@ -197,14 +196,14 @@
                             	<exec executable="docker" failonerror="true">
                                     <arg value="build" />
                                     <arg value="-t" />
-                                    <arg value="${docker.registry}/${project.build.finalName}:${module.version}" />
+                                    <arg value="${docker.registry}/${project.build.finalName}:${project.version}" />
                                     <arg value="--platform" />
                                     <arg value="${project.build.platform}" />
                                     <arg value="." />
                                 </exec>
                             	<exec executable="docker" failonerror="true">
                                     <arg value="push" />
-                                    <arg value="${docker.registry}/${project.build.finalName}:${module.version}" />
+                                    <arg value="${docker.registry}/${project.build.finalName}:${project.version}" />
                                 </exec>
                             </target>
                         </configuration>

diff --git a/api/base-monitor/pom.xml b/api/base-monitor/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>de.dlr.proseo</groupId>
 		<artifactId>proseo-api</artifactId>
-		<version>1.0.0</version>
+		<version>1.0.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>proseo-base-monitor</artifactId>
@@ -19,7 +19,6 @@
     </organization>
 
     <properties>
-        <module.version>1.0.0</module.version>
         <main.basedir>${basedir}/../..</main.basedir>
     </properties>
 

diff --git a/api/cadip-monitor/pom.xml b/api/cadip-monitor/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>de.dlr.proseo</groupId>
 		<artifactId>proseo-api</artifactId>
-		<version>1.0.0</version>
+		<version>1.0.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>cadip-monitor</artifactId>
@@ -17,7 +17,6 @@
 	</organization>
 
 	<properties>
-		<module.version>1.0.0</module.version>
 		<olingo.version>4.7.1</olingo.version>
 		<main.basedir>${basedir}/../..</main.basedir>
 		<raml-path>src/main/resources/raml/cadip-monitor-api.raml</raml-path>
@@ -203,14 +202,14 @@
                             	<exec executable="docker" failonerror="true">
                                     <arg value="build" />
                                     <arg value="-t" />
-                                    <arg value="${docker.registry}/${project.build.finalName}:${module.version}" />
+                                    <arg value="${docker.registry}/${project.build.finalName}:${project.version}" />
                                     <arg value="--platform" />
                                     <arg value="${project.build.platform}" />
                                     <arg value="." />
                                 </exec>
                             	<exec executable="docker" failonerror="true">
                                     <arg value="push" />
-                                    <arg value="${docker.registry}/${project.build.finalName}:${module.version}" />
+                                    <arg value="${docker.registry}/${project.build.finalName}:${project.version}" />
                                 </exec>
                             </target>
                         </configuration>

diff --git a/api/edip-monitor/pom.xml b/api/edip-monitor/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>de.dlr.proseo</groupId>
 		<artifactId>proseo-api</artifactId>
-		<version>1.0.0</version>
+		<version>1.0.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>edip-monitor</artifactId>
@@ -17,7 +17,6 @@
 	</organization>
 
 	<properties>
-		<module.version>1.0.0</module.version>
 		<main.basedir>${basedir}/../..</main.basedir>
 		<raml-path>src/main/resources/raml/edip-monitor-api.raml</raml-path>
 		<raml-base-package>de.dlr.proseo.api.edipmon.rest</raml-base-package>
@@ -178,14 +177,14 @@
                             	<exec executable="docker" failonerror="true">
                                     <arg value="build" />
                                     <arg value="-t" />
-                                    <arg value="${docker.registry}/${project.build.finalName}:${module.version}" />
+                                    <arg value="${docker.registry}/${project.build.finalName}:${project.version}" />
                                     <arg value="--platform" />
                                     <arg value="${project.build.platform}" />
                                     <arg value="." />
                                 </exec>
                             	<exec executable="docker" failonerror="true">
                                     <arg value="push" />
-                                    <arg value="${docker.registry}/${project.build.finalName}:${module.version}" />
+                                    <arg value="${docker.registry}/${project.build.finalName}:${project.version}" />
                                 </exec>
                             </target>
                         </configuration>

diff --git a/api/odip/pom.xml b/api/odip/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>de.dlr.proseo</groupId>
         <artifactId>proseo-api</artifactId>
-        <version>1.0.0</version>
+        <version>1.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>odip</artifactId>
@@ -22,7 +22,6 @@
 
     <properties>
         <olingo.version>4.7.1</olingo.version>
-        <module.version>1.0.0</module.version>
         <main.basedir>${basedir}/../..</main.basedir>
         <raml-path-query>src/main/resources/raml/odip-query.raml</raml-path-query>
         <raml-path-oauth2>src/main/resources/raml/odip-oauth2.raml</raml-path-oauth2>
@@ -265,15 +264,15 @@
                                     <arg value="build" />
                                     <arg value="-t" />
                                     <arg
-                                        value="${docker.registry}/${project.build.finalName}:${module.version}" />
+                                        value="${docker.registry}/${project.build.finalName}:${project.version}" />
                                     <arg value="--platform" />
                                     <arg value="${project.build.platform}" />
                                     <arg value="." />
                                 </exec>
                                 <exec executable="docker" failonerror="true">
                                     <arg value="push" />
                                     <arg
-                                        value="${docker.registry}/${project.build.finalName}:${module.version}" />
+                                        value="${docker.registry}/${project.build.finalName}:${project.version}" />
                                 </exec>
                             </target>
                         </configuration>

diff --git a/api/pom.xml b/api/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>de.dlr.proseo</groupId>
 		<artifactId>proseo</artifactId>
-		<version>1.0.0</version>
+		<version>1.0.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>proseo-api</artifactId>

diff --git a/api/prip/pom.xml b/api/prip/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>de.dlr.proseo</groupId>
 		<artifactId>proseo-api</artifactId>
-		<version>1.0.0</version>
+		<version>1.0.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>proseo-api-prip</artifactId>
@@ -19,7 +19,6 @@
 
 	<properties>
 		<olingo.version>4.7.1</olingo.version>
-		<module.version>1.0.0</module.version>
 		<main.basedir>${basedir}/../..</main.basedir>
 		<raml-path-query>src/main/resources/raml/prip-query.raml</raml-path-query>
 		<raml-path-download>src/main/resources/raml/prip-download.raml</raml-path-download>
@@ -254,14 +253,14 @@
                             	<exec executable="docker" failonerror="true">
                                     <arg value="build" />
                                     <arg value="-t" />
-                                    <arg value="${docker.registry}/${project.build.finalName}:${module.version}" />
+                                    <arg value="${docker.registry}/${project.build.finalName}:${project.version}" />
                                     <arg value="--platform" />
                                     <arg value="${project.build.platform}" />
                                     <arg value="." />
                                 </exec>
                             	<exec executable="docker" failonerror="true">
                                     <arg value="push" />
-                                    <arg value="${docker.registry}/${project.build.finalName}:${module.version}" />
+                                    <arg value="${docker.registry}/${project.build.finalName}:${project.version}" />
                                 </exec>
                             </target>
                         </configuration>

diff --git a/api/xbip-monitor/pom.xml b/api/xbip-monitor/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>de.dlr.proseo</groupId>
 		<artifactId>proseo-api</artifactId>
-		<version>1.0.0</version>
+		<version>1.0.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>xbip-monitor</artifactId>
@@ -17,7 +17,6 @@
     </organization>
 
     <properties>
-        <module.version>1.0.0</module.version>
         <main.basedir>${basedir}/../..</main.basedir>
         <raml-path>src/main/resources/raml/xbip-monitor-api.raml</raml-path>
         <raml-base-package>de.dlr.proseo.api.xbipmon.rest</raml-base-package>
@@ -172,14 +171,14 @@
                                 <exec executable="docker" failonerror="true">
                                     <arg value="build" />
                                     <arg value="-t" />
-                                    <arg value="${docker.registry}/${project.build.finalName}:${module.version}" />
+                                    <arg value="${docker.registry}/${project.build.finalName}:${project.version}" />
                                     <arg value="--platform" />
                                     <arg value="${project.build.platform}" />
                                     <arg value="." />
                                 </exec>
                                 <exec executable="docker" failonerror="true">
                                     <arg value="push" />
-                                    <arg value="${docker.registry}/${project.build.finalName}:${module.version}" />
+                                    <arg value="${docker.registry}/${project.build.finalName}:${project.version}" />
                                 </exec>
                             </target>
                         </configuration>

diff --git a/base-wrapper/pom.xml b/base-wrapper/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>de.dlr.proseo</groupId>
         <artifactId>proseo</artifactId>
-        <version>1.0.0</version>
+        <version>1.0.1-SNAPSHOT</version>
     </parent>
 
 	<artifactId>proseo-base-wrapper</artifactId>
@@ -19,7 +19,6 @@
 	</organization>
 
 	<properties>
-		<module.version>1.0.0</module.version>
 		<resteasy.version>3.14.0.Final</resteasy.version>
 		<!-- Properties below to raise dependencies from Spring Boot 2.1.6 to Resteasy 3.14.0 -->
         <commons-codec.version>1.14</commons-codec.version>

diff --git a/common/pom.xml b/common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>de.dlr.proseo</groupId>
         <artifactId>proseo</artifactId>
-        <version>1.0.0</version>
+        <version>1.0.1-SNAPSHOT</version>
     </parent>
 
 	<artifactId>proseo-common</artifactId>

diff --git a/deploy-single-node/proseo-images/proseo-components/proseo-api-aip/Dockerfile b/deploy-single-node/proseo-images/proseo-components/proseo-api-aip/Dockerfile
@@ -1,4 +1,4 @@
-FROM localhost:5000/proseo-aip-client:1.0.0
+FROM localhost:5000/proseo-aip-client:1.0.1-SNAPSHOT
 ADD application.yml /usr/share/api/aip-client/application.yml
 WORKDIR /usr/share/api/aip-client
 

diff --git a/deploy-single-node/proseo-images/proseo-components/proseo-api-odip/Dockerfile b/deploy-single-node/proseo-images/proseo-components/proseo-api-odip/Dockerfile
@@ -1,4 +1,4 @@
-FROM localhost:5000/proseo-api-odip:1.0.0
+FROM localhost:5000/proseo-api-odip:1.0.1-SNAPSHOT
 ADD application.yml /usr/share/api/odip/application.yml
 WORKDIR /usr/share/api/odip
 

diff --git a/deploy-single-node/proseo-images/proseo-components/proseo-api-prip/Dockerfile b/deploy-single-node/proseo-images/proseo-components/proseo-api-prip/Dockerfile
@@ -1,4 +1,4 @@
-FROM localhost:5000/proseo-api-prip:1.0.0
+FROM localhost:5000/proseo-api-prip:1.0.1-SNAPSHOT
 ADD application.yml /usr/share/api/prip/application.yml
 WORKDIR /usr/share/api/prip
 

diff --git a/deploy-single-node/proseo-images/proseo-components/proseo-archive-mgr/Dockerfile b/deploy-single-node/proseo-images/proseo-components/proseo-archive-mgr/Dockerfile
@@ -1,3 +1,3 @@
-FROM localhost:5000/proseo-archive-mgr:1.0.0
+FROM localhost:5000/proseo-archive-mgr:1.0.1-SNAPSHOT
 ADD application.yml /usr/share/proseo-archive-mgr/application.yml
 WORKDIR /usr/share/proseo-archive-mgr/