From 09060abcd31d7357b4d59e58bb5b1afac0694476 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20=C5=A0trobl?= Date: Thu, 8 Aug 2024 10:27:20 +0200 Subject: [PATCH] Fix #1689: Backport Fix #1687: Error java.net.MalformedURLException: unknown protocol: classpath (#1690) --- pom.xml | 2 +- powerauth-data-adapter-client/pom.xml | 2 +- powerauth-data-adapter-model/pom.xml | 2 +- powerauth-mtoken-model/pom.xml | 2 +- powerauth-nextstep-client/pom.xml | 2 +- powerauth-nextstep-model/pom.xml | 2 +- powerauth-nextstep/pom.xml | 2 +- powerauth-tpp-engine-client/pom.xml | 2 +- powerauth-tpp-engine-model/pom.xml | 2 +- powerauth-tpp-engine/pom.xml | 2 +- powerauth-webflow-authentication-approval-sca/pom.xml | 2 +- powerauth-webflow-authentication-consent/pom.xml | 2 +- powerauth-webflow-authentication-form/pom.xml | 2 +- powerauth-webflow-authentication-init/pom.xml | 2 +- powerauth-webflow-authentication-login-sca/pom.xml | 2 +- powerauth-webflow-authentication-mtoken/pom.xml | 2 +- powerauth-webflow-authentication-operation-review/pom.xml | 2 +- powerauth-webflow-authentication-sms/pom.xml | 2 +- powerauth-webflow-authentication/pom.xml | 2 +- powerauth-webflow-client/pom.xml | 2 +- powerauth-webflow-i18n/pom.xml | 2 +- powerauth-webflow-resources/pom.xml | 2 +- powerauth-webflow/package-lock.json | 4 ++-- powerauth-webflow/package.json | 2 +- powerauth-webflow/pom.xml | 2 +- .../app/webflow/configuration/WebMvcConfiguration.java | 3 +-- 26 files changed, 27 insertions(+), 28 deletions(-) diff --git a/pom.xml b/pom.xml index 98d6da47c..2d18284e8 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ io.getlime.security powerauth-webflow-parent - 1.4.3 + 1.4.4-SNAPSHOT pom diff --git a/powerauth-data-adapter-client/pom.xml b/powerauth-data-adapter-client/pom.xml index 45dfc69ad..15a8ba16b 100644 --- a/powerauth-data-adapter-client/pom.xml +++ b/powerauth-data-adapter-client/pom.xml @@ -29,7 +29,7 @@ powerauth-webflow-parent io.getlime.security - 1.4.3 + 1.4.4-SNAPSHOT diff --git a/powerauth-data-adapter-model/pom.xml b/powerauth-data-adapter-model/pom.xml index 90016c63d..c98b8df2a 100644 --- a/powerauth-data-adapter-model/pom.xml +++ b/powerauth-data-adapter-model/pom.xml @@ -30,7 +30,7 @@ powerauth-webflow-parent io.getlime.security - 1.4.3 + 1.4.4-SNAPSHOT diff --git a/powerauth-mtoken-model/pom.xml b/powerauth-mtoken-model/pom.xml index 1435f0740..eda1ce386 100644 --- a/powerauth-mtoken-model/pom.xml +++ b/powerauth-mtoken-model/pom.xml @@ -27,7 +27,7 @@ powerauth-webflow-parent io.getlime.security - 1.4.3 + 1.4.4-SNAPSHOT diff --git a/powerauth-nextstep-client/pom.xml b/powerauth-nextstep-client/pom.xml index 401123aad..d3a9dae97 100644 --- a/powerauth-nextstep-client/pom.xml +++ b/powerauth-nextstep-client/pom.xml @@ -25,7 +25,7 @@ powerauth-webflow-parent io.getlime.security - 1.4.3 + 1.4.4-SNAPSHOT powerauth-nextstep-client diff --git a/powerauth-nextstep-model/pom.xml b/powerauth-nextstep-model/pom.xml index 7d04c0c25..bd0668ab9 100644 --- a/powerauth-nextstep-model/pom.xml +++ b/powerauth-nextstep-model/pom.xml @@ -30,7 +30,7 @@ io.getlime.security powerauth-webflow-parent - 1.4.3 + 1.4.4-SNAPSHOT diff --git a/powerauth-nextstep/pom.xml b/powerauth-nextstep/pom.xml index 33868249a..68dc3d571 100644 --- a/powerauth-nextstep/pom.xml +++ b/powerauth-nextstep/pom.xml @@ -28,7 +28,7 @@ io.getlime.security powerauth-webflow-parent - 1.4.3 + 1.4.4-SNAPSHOT diff --git a/powerauth-tpp-engine-client/pom.xml b/powerauth-tpp-engine-client/pom.xml index ec9614822..e30a7f6b2 100644 --- a/powerauth-tpp-engine-client/pom.xml +++ b/powerauth-tpp-engine-client/pom.xml @@ -25,7 +25,7 @@ powerauth-webflow-parent io.getlime.security - 1.4.3 + 1.4.4-SNAPSHOT powerauth-tpp-engine-client diff --git a/powerauth-tpp-engine-model/pom.xml b/powerauth-tpp-engine-model/pom.xml index b6e85e5fc..1b39eeadb 100644 --- a/powerauth-tpp-engine-model/pom.xml +++ b/powerauth-tpp-engine-model/pom.xml @@ -24,7 +24,7 @@ powerauth-webflow-parent io.getlime.security - 1.4.3 + 1.4.4-SNAPSHOT powerauth-tpp-engine-model diff --git a/powerauth-tpp-engine/pom.xml b/powerauth-tpp-engine/pom.xml index a100cd05d..457b7bcb9 100644 --- a/powerauth-tpp-engine/pom.xml +++ b/powerauth-tpp-engine/pom.xml @@ -28,7 +28,7 @@ io.getlime.security powerauth-webflow-parent - 1.4.3 + 1.4.4-SNAPSHOT diff --git a/powerauth-webflow-authentication-approval-sca/pom.xml b/powerauth-webflow-authentication-approval-sca/pom.xml index 00f5c5069..73029cb6b 100644 --- a/powerauth-webflow-authentication-approval-sca/pom.xml +++ b/powerauth-webflow-authentication-approval-sca/pom.xml @@ -25,7 +25,7 @@ powerauth-webflow-parent io.getlime.security - 1.4.3 + 1.4.4-SNAPSHOT powerauth-webflow-authentication-approval-sca diff --git a/powerauth-webflow-authentication-consent/pom.xml b/powerauth-webflow-authentication-consent/pom.xml index 8963a9825..f0dab6a3f 100644 --- a/powerauth-webflow-authentication-consent/pom.xml +++ b/powerauth-webflow-authentication-consent/pom.xml @@ -25,7 +25,7 @@ powerauth-webflow-parent io.getlime.security - 1.4.3 + 1.4.4-SNAPSHOT powerauth-webflow-authentication-consent diff --git a/powerauth-webflow-authentication-form/pom.xml b/powerauth-webflow-authentication-form/pom.xml index 5a98e02f8..14a933b3a 100644 --- a/powerauth-webflow-authentication-form/pom.xml +++ b/powerauth-webflow-authentication-form/pom.xml @@ -25,7 +25,7 @@ powerauth-webflow-parent io.getlime.security - 1.4.3 + 1.4.4-SNAPSHOT powerauth-webflow-authentication-form diff --git a/powerauth-webflow-authentication-init/pom.xml b/powerauth-webflow-authentication-init/pom.xml index 70e9f767b..92f66b7d5 100644 --- a/powerauth-webflow-authentication-init/pom.xml +++ b/powerauth-webflow-authentication-init/pom.xml @@ -25,7 +25,7 @@ powerauth-webflow-parent io.getlime.security - 1.4.3 + 1.4.4-SNAPSHOT powerauth-webflow-authentication-init diff --git a/powerauth-webflow-authentication-login-sca/pom.xml b/powerauth-webflow-authentication-login-sca/pom.xml index ecd0c727d..78ce6b1c5 100644 --- a/powerauth-webflow-authentication-login-sca/pom.xml +++ b/powerauth-webflow-authentication-login-sca/pom.xml @@ -25,7 +25,7 @@ powerauth-webflow-parent io.getlime.security - 1.4.3 + 1.4.4-SNAPSHOT powerauth-webflow-authentication-login-sca diff --git a/powerauth-webflow-authentication-mtoken/pom.xml b/powerauth-webflow-authentication-mtoken/pom.xml index f1d0bae52..7fe23f0d5 100644 --- a/powerauth-webflow-authentication-mtoken/pom.xml +++ b/powerauth-webflow-authentication-mtoken/pom.xml @@ -25,7 +25,7 @@ powerauth-webflow-parent io.getlime.security - 1.4.3 + 1.4.4-SNAPSHOT powerauth-webflow-authentication-mtoken diff --git a/powerauth-webflow-authentication-operation-review/pom.xml b/powerauth-webflow-authentication-operation-review/pom.xml index 1dd022feb..49d27b132 100644 --- a/powerauth-webflow-authentication-operation-review/pom.xml +++ b/powerauth-webflow-authentication-operation-review/pom.xml @@ -25,7 +25,7 @@ powerauth-webflow-parent io.getlime.security - 1.4.3 + 1.4.4-SNAPSHOT powerauth-webflow-authentication-operation-review diff --git a/powerauth-webflow-authentication-sms/pom.xml b/powerauth-webflow-authentication-sms/pom.xml index dbe0e2fb2..afc29d92f 100644 --- a/powerauth-webflow-authentication-sms/pom.xml +++ b/powerauth-webflow-authentication-sms/pom.xml @@ -25,7 +25,7 @@ powerauth-webflow-parent io.getlime.security - 1.4.3 + 1.4.4-SNAPSHOT powerauth-webflow-authentication-sms diff --git a/powerauth-webflow-authentication/pom.xml b/powerauth-webflow-authentication/pom.xml index 4e78ac356..b81b7ac2f 100644 --- a/powerauth-webflow-authentication/pom.xml +++ b/powerauth-webflow-authentication/pom.xml @@ -25,7 +25,7 @@ powerauth-webflow-parent io.getlime.security - 1.4.3 + 1.4.4-SNAPSHOT io.getlime.security diff --git a/powerauth-webflow-client/pom.xml b/powerauth-webflow-client/pom.xml index aa7d5fc9b..57cd2089a 100644 --- a/powerauth-webflow-client/pom.xml +++ b/powerauth-webflow-client/pom.xml @@ -30,7 +30,7 @@ powerauth-webflow-parent io.getlime.security - 1.4.3 + 1.4.4-SNAPSHOT diff --git a/powerauth-webflow-i18n/pom.xml b/powerauth-webflow-i18n/pom.xml index d5da1b755..2e2e9f0f1 100644 --- a/powerauth-webflow-i18n/pom.xml +++ b/powerauth-webflow-i18n/pom.xml @@ -29,7 +29,7 @@ io.getlime.security powerauth-webflow-parent - 1.4.3 + 1.4.4-SNAPSHOT diff --git a/powerauth-webflow-resources/pom.xml b/powerauth-webflow-resources/pom.xml index 6872a8e65..cb08a3e26 100644 --- a/powerauth-webflow-resources/pom.xml +++ b/powerauth-webflow-resources/pom.xml @@ -25,7 +25,7 @@ powerauth-webflow-parent io.getlime.security - 1.4.3 + 1.4.4-SNAPSHOT io.getlime.security diff --git a/powerauth-webflow/package-lock.json b/powerauth-webflow/package-lock.json index 8d9f9a38e..7952d1463 100644 --- a/powerauth-webflow/package-lock.json +++ b/powerauth-webflow/package-lock.json @@ -1,12 +1,12 @@ { "name": "powerauth-webflow", - "version": "1.4.0-SNAPSHOT", + "version": "1.4.4-SNAPSHOT", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "powerauth-webflow", - "version": "1.4.0-SNAPSHOT", + "version": "1.4.4-SNAPSHOT", "license": "Apache-2.0", "dependencies": { "@snyk/protect": "^1.1080.0", diff --git a/powerauth-webflow/package.json b/powerauth-webflow/package.json index 7a7c449c0..c58c42f7b 100644 --- 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 index 5753e08fc..87e7d484d 100644 --- a/powerauth-webflow/pom.xml +++ b/powerauth-webflow/pom.xml @@ -24,7 +24,7 @@ io.getlime.security powerauth-webflow-parent - 1.4.3 + 1.4.4-SNAPSHOT powerauth-webflow diff --git a/powerauth-webflow/src/main/java/io/getlime/security/powerauth/app/webflow/configuration/WebMvcConfiguration.java b/powerauth-webflow/src/main/java/io/getlime/security/powerauth/app/webflow/configuration/WebMvcConfiguration.java index 802542f90..1366d7ebf 100644 --- a/powerauth-webflow/src/main/java/io/getlime/security/powerauth/app/webflow/configuration/WebMvcConfiguration.java +++ b/powerauth-webflow/src/main/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; }