Fix #1689: Backport Fix #1687: Error java.net.MalformedURLException: …

…unknown protocol: classpath (#1690)
wultra · Aug 8, 2024 · 09060ab · 09060ab
1 parent f3ab158
commit 09060ab
Show file tree

Hide file tree

Showing 26 changed files with 27 additions and 28 deletions.
diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
 
     <groupId>io.getlime.security</groupId>
     <artifactId>powerauth-webflow-parent</artifactId>
-    <version>1.4.3</version>
+    <version>1.4.4-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <parent>

diff --git a/powerauth-data-adapter-client/pom.xml b/powerauth-data-adapter-client/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <artifactId>powerauth-webflow-parent</artifactId>
         <groupId>io.getlime.security</groupId>
-        <version>1.4.3</version>
+        <version>1.4.4-SNAPSHOT</version>
     </parent>
 
     <dependencies>

diff --git a/powerauth-data-adapter-model/pom.xml b/powerauth-data-adapter-model/pom.xml
@@ -30,7 +30,7 @@
     <parent>
         <artifactId>powerauth-webflow-parent</artifactId>
         <groupId>io.getlime.security</groupId>
-        <version>1.4.3</version>
+        <version>1.4.4-SNAPSHOT</version>
     </parent>
 
     <dependencies>

diff --git a/powerauth-mtoken-model/pom.xml b/powerauth-mtoken-model/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <artifactId>powerauth-webflow-parent</artifactId>
         <groupId>io.getlime.security</groupId>
-        <version>1.4.3</version>
+        <version>1.4.4-SNAPSHOT</version>
     </parent>
 
     <dependencies>

diff --git a/powerauth-nextstep-client/pom.xml b/powerauth-nextstep-client/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <artifactId>powerauth-webflow-parent</artifactId>
         <groupId>io.getlime.security</groupId>
-        <version>1.4.3</version>
+        <version>1.4.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>powerauth-nextstep-client</artifactId>

diff --git a/powerauth-nextstep-model/pom.xml b/powerauth-nextstep-model/pom.xml
@@ -30,7 +30,7 @@
     <parent>
         <groupId>io.getlime.security</groupId>
         <artifactId>powerauth-webflow-parent</artifactId>
-        <version>1.4.3</version>
+        <version>1.4.4-SNAPSHOT</version>
     </parent>
 
     <dependencies>

diff --git a/powerauth-nextstep/pom.xml b/powerauth-nextstep/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>io.getlime.security</groupId>
         <artifactId>powerauth-webflow-parent</artifactId>
-        <version>1.4.3</version>
+        <version>1.4.4-SNAPSHOT</version>
     </parent>
 
     <dependencies>

diff --git a/powerauth-tpp-engine-client/pom.xml b/powerauth-tpp-engine-client/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <artifactId>powerauth-webflow-parent</artifactId>
         <groupId>io.getlime.security</groupId>
-        <version>1.4.3</version>
+        <version>1.4.4-SNAPSHOT</version>
     </parent>
 
     <name>powerauth-tpp-engine-client</name>

diff --git a/powerauth-tpp-engine-model/pom.xml b/powerauth-tpp-engine-model/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>powerauth-webflow-parent</artifactId>
         <groupId>io.getlime.security</groupId>
-        <version>1.4.3</version>
+        <version>1.4.4-SNAPSHOT</version>
     </parent>
 
     <name>powerauth-tpp-engine-model</name>

diff --git a/powerauth-tpp-engine/pom.xml b/powerauth-tpp-engine/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>io.getlime.security</groupId>
         <artifactId>powerauth-webflow-parent</artifactId>
-        <version>1.4.3</version>
+        <version>1.4.4-SNAPSHOT</version>
     </parent>
 
     <dependencies>

diff --git a/powerauth-webflow-authentication-approval-sca/pom.xml b/powerauth-webflow-authentication-approval-sca/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <artifactId>powerauth-webflow-parent</artifactId>
         <groupId>io.getlime.security</groupId>
-        <version>1.4.3</version>
+        <version>1.4.4-SNAPSHOT</version>
     </parent>
 
     <name>powerauth-webflow-authentication-approval-sca</name>

diff --git a/powerauth-webflow-authentication-consent/pom.xml b/powerauth-webflow-authentication-consent/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <artifactId>powerauth-webflow-parent</artifactId>
         <groupId>io.getlime.security</groupId>
-        <version>1.4.3</version>
+        <version>1.4.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>powerauth-webflow-authentication-consent</artifactId>

diff --git a/powerauth-webflow-authentication-form/pom.xml b/powerauth-webflow-authentication-form/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <artifactId>powerauth-webflow-parent</artifactId>
         <groupId>io.getlime.security</groupId>
-        <version>1.4.3</version>
+        <version>1.4.4-SNAPSHOT</version>
     </parent>
 
     <name>powerauth-webflow-authentication-form</name>

diff --git a/powerauth-webflow-authentication-init/pom.xml b/powerauth-webflow-authentication-init/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <artifactId>powerauth-webflow-parent</artifactId>
         <groupId>io.getlime.security</groupId>
-        <version>1.4.3</version>
+        <version>1.4.4-SNAPSHOT</version>
     </parent>
 
     <name>powerauth-webflow-authentication-init</name>

diff --git a/powerauth-webflow-authentication-login-sca/pom.xml b/powerauth-webflow-authentication-login-sca/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <artifactId>powerauth-webflow-parent</artifactId>
         <groupId>io.getlime.security</groupId>
-        <version>1.4.3</version>
+        <version>1.4.4-SNAPSHOT</version>
     </parent>
 
     <name>powerauth-webflow-authentication-login-sca</name>

diff --git a/powerauth-webflow-authentication-mtoken/pom.xml b/powerauth-webflow-authentication-mtoken/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <artifactId>powerauth-webflow-parent</artifactId>
         <groupId>io.getlime.security</groupId>
-        <version>1.4.3</version>
+        <version>1.4.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>powerauth-webflow-authentication-mtoken</artifactId>

diff --git a/powerauth-webflow-authentication-operation-review/pom.xml b/powerauth-webflow-authentication-operation-review/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <artifactId>powerauth-webflow-parent</artifactId>
         <groupId>io.getlime.security</groupId>
-        <version>1.4.3</version>
+        <version>1.4.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>powerauth-webflow-authentication-operation-review</artifactId>

diff --git a/powerauth-webflow-authentication-sms/pom.xml b/powerauth-webflow-authentication-sms/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <artifactId>powerauth-webflow-parent</artifactId>
         <groupId>io.getlime.security</groupId>
-        <version>1.4.3</version>
+        <version>1.4.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>powerauth-webflow-authentication-sms</artifactId>

diff --git a/powerauth-webflow-authentication/pom.xml b/powerauth-webflow-authentication/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <artifactId>powerauth-webflow-parent</artifactId>
         <groupId>io.getlime.security</groupId>
-        <version>1.4.3</version>
+        <version>1.4.4-SNAPSHOT</version>
     </parent>
 
     <groupId>io.getlime.security</groupId>

diff --git a/powerauth-webflow-client/pom.xml b/powerauth-webflow-client/pom.xml
@@ -30,7 +30,7 @@
     <parent>
         <artifactId>powerauth-webflow-parent</artifactId>
         <groupId>io.getlime.security</groupId>
-        <version>1.4.3</version>
+        <version>1.4.4-SNAPSHOT</version>
     </parent>
 
     <dependencies>

diff --git a/powerauth-webflow-i18n/pom.xml b/powerauth-webflow-i18n/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>io.getlime.security</groupId>
         <artifactId>powerauth-webflow-parent</artifactId>
-        <version>1.4.3</version>
+        <version>1.4.4-SNAPSHOT</version>
     </parent>
 
     <dependencies>

diff --git a/powerauth-webflow-resources/pom.xml b/powerauth-webflow-resources/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <artifactId>powerauth-webflow-parent</artifactId>
         <groupId>io.getlime.security</groupId>
-        <version>1.4.3</version>
+        <version>1.4.4-SNAPSHOT</version>
     </parent>
 
     <groupId>io.getlime.security</groupId>

diff --git a/powerauth-webflow/package-lock.json b/powerauth-webflow/package-lock.json
diff --git a/powerauth-webflow/package.json b/powerauth-webflow/package.json
@@ -1,6 +1,6 @@
 {
   "name": "powerauth-webflow",
-  "version": "1.4.0-SNAPSHOT",
+  "version": "1.4.4-SNAPSHOT",
   "description": "Federated Authentication and Authorization Server for Web",
   "repository": {
     "type": "git",

diff --git a/powerauth-webflow/pom.xml b/powerauth-webflow/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>io.getlime.security</groupId>
         <artifactId>powerauth-webflow-parent</artifactId>
-        <version>1.4.3</version>
+        <version>1.4.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>powerauth-webflow</artifactId>

diff --git a/...ain/java/io/getlime/security/powerauth/app/webflow/configuration/WebMvcConfiguration.java b/...ain/java/io/getlime/security/powerauth/app/webflow/configuration/WebMvcConfiguration.java
@@ -33,7 +33,6 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
-import org.springframework.core.io.UrlResource;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
@@ -148,7 +147,7 @@ public Resource languageSettingSource() throws MalformedURLException {
         Resource resource = resourceLoader.getResource(configuration.getResourcesLocation() + "lang.json");
         if (!resource.exists()) {
             logger.info("The lang.json file was not found in {}, using default location", configuration.getResourcesLocation());
-            resource = new UrlResource("classpath:/static/resources/lang.json");
+            resource = resourceLoader.getResource("classpath:/static/resources/lang.json");
         }
         return resource;
     }