Merge remote-tracking branch 'origin/proseo-1.0.1' into dev-odip-denys

dlr-eoc · Mar 15, 2024 · c5d9e5f · c5d9e5f
2 parents 1361ef6 + daf556e
commit c5d9e5f
Show file tree

Hide file tree

Showing 2,377 changed files with 31,468 additions and 9,099 deletions.
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/odip/src/main/java/de/dlr/proseo/api/odip/odata/WorkflowSqlFilterExpressionVisitor.java b/api/odip/src/main/java/de/dlr/proseo/api/odip/odata/WorkflowSqlFilterExpressionVisitor.java
@@ -68,7 +68,7 @@ public class WorkflowSqlFilterExpressionVisitor implements ExpressionVisitor<Str
 	/** SQL command parts */
 	private static final String SELECT_CLAUSE = "SELECT DISTINCT p.* ";
 	private static final String SELECT_COUNT_CLAUSE = "SELECT count(DISTINCT p.*) ";
-	private static final String FROM_CLAUSE = "FROM workflow p\n" + "JOIN workflow_option wo ON wo.workflow_id = p.id\n"
+	private static final String FROM_CLAUSE = "FROM workflow p\n" + "LEFT OUTER JOIN workflow_option wo ON wo.workflow_id = p.id\n"
 			+ "LEFT OUTER JOIN product_class ipc ON p.input_product_class_id = ipc.id\n"
 			+ "LEFT OUTER JOIN product_class opc ON p.output_product_class_id = opc.id\n"
 			+ "LEFT OUTER JOIN configured_processor cp ON p.configured_processor_id = cp.id\n"

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/
diff --git a/deploy-single-node/proseo-images/proseo-components/proseo-facility-mgr/Dockerfile b/deploy-single-node/proseo-images/proseo-components/proseo-facility-mgr/Dockerfile
@@ -1,3 +1,3 @@
-FROM localhost:5000/proseo-facility-mgr:1.0.0
+FROM localhost:5000/proseo-facility-mgr:1.0.1-SNAPSHOT
 ADD application.yml /usr/share/proseo-facility-mgr/application.yml
 WORKDIR /usr/share/proseo-facility-mgr/
diff --git a/deploy-single-node/proseo-images/proseo-components/proseo-ingestor/Dockerfile b/deploy-single-node/proseo-images/proseo-components/proseo-ingestor/Dockerfile
@@ -1,4 +1,4 @@
-FROM localhost:5000/proseo-ingestor:1.0.0
+FROM localhost:5000/proseo-ingestor:1.0.1-SNAPSHOT
 ADD application.yml /usr/share/ingestor/application.yml
 WORKDIR /usr/share/ingestor
 

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

diff --git a/deploy-single-node/proseo-images/proseo-components/proseo-order-mgr/Dockerfile b/deploy-single-node/proseo-images/proseo-components/proseo-order-mgr/Dockerfile
@@ -1,3 +1,3 @@
-FROM localhost:5000/proseo-order-mgr:1.0.0
+FROM localhost:5000/proseo-order-mgr:1.0.1-SNAPSHOT
 ADD application.yml /usr/share/proseo-order-mgr/application.yml
 WORKDIR /usr/share/proseo-order-mgr/
diff --git a/deploy-single-node/proseo-images/proseo-components/proseo-planner/Dockerfile b/deploy-single-node/proseo-images/proseo-components/proseo-planner/Dockerfile
@@ -1,4 +1,4 @@
-FROM localhost:5000/proseo-planner:1.0.0
+FROM localhost:5000/proseo-planner:1.0.1-SNAPSHOT
 ADD application.yml /usr/share/planner/application.yml
 
 # Uncomment the next line, if a fixed login to a Kubernetes instance is required, and provide kube_config from the template file

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