Merge pull request #646 from /issues/645-update-version

Fix #645: Update version to 1.2.0
wultra · Dec 21, 2021 · 138e6eb · 138e6eb
2 parents a8c0b1b + e3ec845
commit 138e6eb
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 28 deletions.
diff --git a/pom.xml b/pom.xml
@@ -26,7 +26,7 @@
 
     <groupId>io.getlime.security</groupId>
     <artifactId>powerauth-server-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.0</version>
     <packaging>pom</packaging>
 
     <parent>
@@ -86,8 +86,8 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
         <maven-deploy-plugin.version>3.0.0-M1</maven-deploy-plugin.version>
-        <maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
-        <maven-war-plugin.version>3.3.1</maven-war-plugin.version>
+        <maven-javadoc-plugin.version>3.3.1</maven-javadoc-plugin.version>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
 
         <!-- Spring Dependencies -->
         <spring-cloud-vault.version>3.1.0</spring-cloud-vault.version>
@@ -107,17 +107,17 @@
         <saaj-impl.version>1.5.3</saaj-impl.version>
 
         <!-- Documentation Dependencies -->
-        <springdoc-openapi.version>1.6.0</springdoc-openapi.version>
+        <springdoc-openapi.version>1.6.1</springdoc-openapi.version>
 
         <!-- Scheduled Job Dependencies -->
         <schedlock.version>4.30.0</schedlock.version>
 
         <!-- Test Dependencies -->
-        <junit-jupiter-engine.version>5.7.2</junit-jupiter-engine.version>
+        <junit-jupiter-engine.version>5.8.2</junit-jupiter-engine.version>
         <h2.version>1.4.197</h2.version> <!-- Tests fail in version 1.4.200, upgrade reverted -->
 
         <!-- Other Dependencies -->
-        <axis2.version>1.7.9</axis2.version>
+        <jackson.version>2.13.0</jackson.version>
         <commons-text.version>1.9</commons-text.version>
 
     </properties>

diff --git a/powerauth-client-model/pom.xml b/powerauth-client-model/pom.xml
@@ -22,14 +22,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>powerauth-client-model</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.0</version>
     <name>powerauth-client-model</name>
     <description>PowerAuth Server Client Model</description>
 
     <parent>
         <groupId>io.getlime.security</groupId>
         <artifactId>powerauth-server-parent</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.12.3</version>
+            <version>${jackson.version}</version>
         </dependency>
         <dependency>
             <groupId>javax.xml.bind</groupId>

diff --git a/powerauth-java-server/pom.xml b/powerauth-java-server/pom.xml
@@ -24,13 +24,13 @@
     <name>powerauth-java-server</name>
     <description>PowerAuth Server</description>
     <artifactId>powerauth-java-server</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.0</version>
     <packaging>war</packaging>
 
     <parent>
         <groupId>io.getlime.security</groupId>
         <artifactId>powerauth-server-parent</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -112,7 +112,7 @@
         <dependency>
             <groupId>io.getlime.security</groupId>
             <artifactId>powerauth-client-model</artifactId>
-            <version>1.2.0-SNAPSHOT</version>
+            <version>1.2.0</version>
         </dependency>
         <dependency>
             <groupId>io.getlime.security</groupId>

diff --git a/.../getlime/security/powerauth/app/server/service/behavior/tasks/v3/CallbackUrlBehavior.java b/.../getlime/security/powerauth/app/server/service/behavior/tasks/v3/CallbackUrlBehavior.java
@@ -158,20 +158,22 @@ public UpdateCallbackUrlResponse updateCallbackUrl(UpdateCallbackUrlRequest requ
         // Retain existing passwords in case new password is not set
         HttpAuthenticationPrivate authRequest = request.getAuthentication();
         HttpAuthenticationPrivate authExisting = entity.getAuthentication();
-        if (authRequest.getCertificate() != null && authExisting.getCertificate() != null) {
-            if (authExisting.getCertificate().getKeyStorePassword() != null && authRequest.getCertificate().getKeyStorePassword() == null) {
-                authRequest.getCertificate().setKeyStorePassword(authExisting.getCertificate().getKeyStorePassword());
-            }
-            if (authExisting.getCertificate().getKeyPassword() != null && authRequest.getCertificate().getKeyPassword() == null) {
-                authRequest.getCertificate().setKeyPassword(authExisting.getCertificate().getKeyPassword());
-            }
-            if (authExisting.getCertificate().getTrustStorePassword() != null && authRequest.getCertificate().getTrustStorePassword() == null) {
-                authRequest.getCertificate().setTrustStorePassword(authExisting.getCertificate().getTrustStorePassword());
+        if (authRequest != null) {
+            if (authRequest.getCertificate() != null && authExisting.getCertificate() != null) {
+                if (authExisting.getCertificate().getKeyStorePassword() != null && authRequest.getCertificate().getKeyStorePassword() == null) {
+                    authRequest.getCertificate().setKeyStorePassword(authExisting.getCertificate().getKeyStorePassword());
+                }
+                if (authExisting.getCertificate().getKeyPassword() != null && authRequest.getCertificate().getKeyPassword() == null) {
+                    authRequest.getCertificate().setKeyPassword(authExisting.getCertificate().getKeyPassword());
+                }
+                if (authExisting.getCertificate().getTrustStorePassword() != null && authRequest.getCertificate().getTrustStorePassword() == null) {
+                    authRequest.getCertificate().setTrustStorePassword(authExisting.getCertificate().getTrustStorePassword());
+                }
             }
-        }
-        if (authRequest.getHttpBasic() != null && authExisting.getHttpBasic() != null) {
-            if (authExisting.getHttpBasic().getPassword() != null && authRequest.getHttpBasic().getPassword() == null) {
-                authRequest.getHttpBasic().setPassword(authExisting.getHttpBasic().getPassword());
+            if (authRequest.getHttpBasic() != null && authExisting.getHttpBasic() != null) {
+                if (authExisting.getHttpBasic().getPassword() != null && authRequest.getHttpBasic().getPassword() == null) {
+                    authRequest.getHttpBasic().setPassword(authExisting.getHttpBasic().getPassword());
+                }
             }
         }
         entity.setAuthentication(authRequest);

diff --git a/powerauth-rest-client-spring/pom.xml b/powerauth-rest-client-spring/pom.xml
@@ -22,14 +22,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>powerauth-rest-client-spring</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.0</version>
     <name>powerauth-rest-client-spring</name>
     <description>PowerAuth Server REST Service Client</description>
 
     <parent>
         <groupId>io.getlime.security</groupId>
         <artifactId>powerauth-server-parent</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>io.getlime.security</groupId>
             <artifactId>powerauth-client-model</artifactId>
-            <version>1.2.0-SNAPSHOT</version>
+            <version>1.2.0</version>
         </dependency>
         <dependency>
             <groupId>io.getlime.core</groupId>