Merge branch 'develop'

AbsaOSS · May 6, 2022 · 1635d8c · 1635d8c
2 parents c759f81 + 62435f0
commit 1635d8c
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 14 deletions.
diff --git a/dao/pom.xml b/dao/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>za.co.absa.enceladus</groupId>
         <artifactId>parent</artifactId>
-        <version>2.27.0</version>
+        <version>2.27.1</version>
     </parent>
 
     <properties>

diff --git a/data-model/pom.xml b/data-model/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>za.co.absa.enceladus</groupId>
         <artifactId>parent</artifactId>
-        <version>2.27.0</version>
+        <version>2.27.1</version>
     </parent>
 
     <properties>

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>za.co.absa.enceladus</groupId>
         <artifactId>parent</artifactId>
-        <version>2.27.0</version>
+        <version>2.27.1</version>
     </parent>
 
     <properties>

diff --git a/menas/pom.xml b/menas/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>za.co.absa.enceladus</groupId>
         <artifactId>parent</artifactId>
-        <version>2.27.0</version>
+        <version>2.27.1</version>
     </parent>
 
     <properties>

diff --git a/menas/ui/components/mappingTable/mappingTableDetail.view.xml b/menas/ui/components/mappingTable/mappingTableDetail.view.xml
@@ -22,7 +22,7 @@
             <Bar>
                 <contentMiddle>
                     <HBox alignItems="Center" justifyContent="End" renderType="Bare">
-                        <Title text="Mapping Table: {/currentMappingTable/name} (v{/currentMappingTable/version})">
+                        <Title text="Mapping Table: {/currentMappingTable/name} (v{/currentMappingTable/version})" />
                         <core:Icon src="sap-icon://locked"
                                    visible="{= ${/currentMappingTable/locked} === true}"
                                    tooltip="Locked by {/currentMappingTable/userLocked} at {/currentMappingTable/dateLocked}"/>

diff --git a/migrations-cli/pom.xml b/migrations-cli/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>za.co.absa.enceladus</groupId>
         <artifactId>parent</artifactId>
-        <version>2.27.0</version>
+        <version>2.27.1</version>
     </parent>
 
     <properties>

diff --git a/migrations/pom.xml b/migrations/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>za.co.absa.enceladus</groupId>
         <artifactId>parent</artifactId>
-        <version>2.27.0</version>
+        <version>2.27.1</version>
     </parent>
 
     <properties>

diff --git a/plugins-api/pom.xml b/plugins-api/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>za.co.absa.enceladus</groupId>
         <artifactId>parent</artifactId>
-        <version>2.27.0</version>
+        <version>2.27.1</version>
     </parent>
 
     <properties>

diff --git a/plugins-builtin/pom.xml b/plugins-builtin/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>za.co.absa.enceladus</groupId>
         <artifactId>parent</artifactId>
-        <version>2.27.0</version>
+        <version>2.27.1</version>
     </parent>
 
     <properties>

diff --git a/pom.xml b/pom.xml
@@ -18,7 +18,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>za.co.absa.enceladus</groupId>
     <artifactId>parent</artifactId>
-    <version>2.27.0</version>
+    <version>2.27.1</version>
     <packaging>pom</packaging>
 
     <name>Enceladus</name>

diff --git a/spark-jobs/pom.xml b/spark-jobs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>za.co.absa.enceladus</groupId>
         <artifactId>parent</artifactId>
-        <version>2.27.0</version>
+        <version>2.27.1</version>
     </parent>
 
     <properties>

diff --git a/utils/pom.xml b/utils/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>za.co.absa.enceladus</groupId>
         <artifactId>parent</artifactId>
-        <version>2.27.0</version>
+        <version>2.27.1</version>
     </parent>
 
     <properties>

diff --git a/utils/src/test/scala/za/co/absa/enceladus/utils/config/SecureConfigSuite.scala b/utils/src/test/scala/za/co/absa/enceladus/utils/config/SecureConfigSuite.scala
@@ -84,12 +84,12 @@ class SecureConfigSuite extends AnyFlatSpec with Matchers {
   "it" should "javaOptsStringFromConfigMap to convert config map to -Dx=y string" in {
     val driverEnvMap = Map(
       "javax.net.ssl.keyStore" -> "/path/to/my-keystore.jks",
-      "javax.net.ssl.keyStorePassword" -> "ksPassword1",
+      "javax.net.ssl.keyStorePassword" -> "examplePwd1",
       "somethingElse" -> "whatever"
     )
 
     SecureConfig.javaOptsStringFromConfigMap(driverEnvMap) shouldBe
-      "-Djavax.net.ssl.keyStore=/path/to/my-keystore.jks -Djavax.net.ssl.keyStorePassword=ksPassword1 -DsomethingElse=whatever"
+      "-Djavax.net.ssl.keyStore=/path/to/my-keystore.jks -Djavax.net.ssl.keyStorePassword=examplePwd1 -DsomethingElse=whatever"
   }
 
 }