From 98a90fdd218183b3b338ccacabf8a5829f070230 Mon Sep 17 00:00:00 2001 From: Jan Dusil Date: Wed, 25 Oct 2023 20:08:36 -0600 Subject: [PATCH 01/14] Fix #1457: Executable war - PA nextstep - executable war - Clean deps --- powerauth-nextstep/pom.xml | 40 ++++++++++++++------------------------ 1 file changed, 15 insertions(+), 25 deletions(-) diff --git a/powerauth-nextstep/pom.xml b/powerauth-nextstep/pom.xml index 8de118210..1ad01ee80 100644 --- a/powerauth-nextstep/pom.xml +++ b/powerauth-nextstep/pom.xml @@ -31,6 +31,21 @@ 1.6.0-SNAPSHOT + + + + org.springframework.boot + spring-boot-starter-tomcat + provided + + + org.apache.tomcat.embed + tomcat-embed-el + provided + + + + @@ -42,10 +57,6 @@ log4j-to-slf4j org.apache.logging.log4j - - org.springframework.boot - spring-boot-starter-tomcat - @@ -59,12 +70,6 @@ org.springframework.boot spring-boot-starter-validation - - - org.apache.tomcat.embed - tomcat-embed-el - - org.springframework.boot @@ -148,11 +153,6 @@ spring-boot-starter-test test - - tomcat-embed-websocket - org.apache.tomcat.embed - test - io.getlime.security powerauth-nextstep-client @@ -220,16 +220,6 @@ - - standalone - - - org.springframework.boot - spring-boot-starter-tomcat - provided - - - liquibase From 00d5c2a75d2d1235a62562480dc431a84feba585 Mon Sep 17 00:00:00 2001 From: Jan Dusil Date: Wed, 25 Oct 2023 20:35:59 -0600 Subject: [PATCH 02/14] Fix #1457: Executable war - PA tpp engine - executable war - Clean deps --- powerauth-tpp-engine/pom.xml | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/powerauth-tpp-engine/pom.xml b/powerauth-tpp-engine/pom.xml index a5823f3ae..6e50c99fe 100644 --- a/powerauth-tpp-engine/pom.xml +++ b/powerauth-tpp-engine/pom.xml @@ -31,6 +31,21 @@ 1.6.0-SNAPSHOT + + + + org.springframework.boot + spring-boot-starter-tomcat + provided + + + org.apache.tomcat.embed + tomcat-embed-el + provided + + + + @@ -41,21 +56,11 @@ log4j-to-slf4j org.apache.logging.log4j - - org.springframework.boot - spring-boot-starter-tomcat - org.springframework.boot spring-boot-starter-validation - - - org.apache.tomcat.embed - tomcat-embed-el - - org.springframework.boot @@ -182,16 +187,6 @@ - - standalone - - - org.springframework.boot - spring-boot-starter-tomcat - provided - - - liquibase From a0bcda774a19a2bae49a0b10635a54830ec91370 Mon Sep 17 00:00:00 2001 From: Jan Dusil Date: Wed, 25 Oct 2023 20:45:20 -0600 Subject: [PATCH 03/14] Fix #1457: Executable war - PA web flow - executable war - Clean deps --- powerauth-webflow/pom.xml | 39 +++++++++++++++------------------------ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/powerauth-webflow/pom.xml b/powerauth-webflow/pom.xml index fe3dc2b2f..7615ce75d 100644 --- a/powerauth-webflow/pom.xml +++ b/powerauth-webflow/pom.xml @@ -32,6 +32,21 @@ Federated Authentication and Authorization Server for Web war + + + + org.springframework.boot + spring-boot-starter-tomcat + provided + + + org.apache.tomcat.embed + tomcat-embed-el + provided + + + + @@ -43,10 +58,6 @@ log4j-to-slf4j org.apache.logging.log4j - - org.springframework.boot - spring-boot-starter-tomcat - @@ -170,11 +181,6 @@ spring-boot-starter-test test - - tomcat-embed-websocket - org.apache.tomcat.embed - test - com.h2database h2 @@ -265,21 +271,6 @@ - - standalone - - - org.springframework.boot - spring-boot-starter-tomcat - provided - - - tomcat-embed-websocket - org.apache.tomcat.embed - provided - - - liquibase From 717e883fb6363d5f7b30e765572350475656e569 Mon Sep 17 00:00:00 2001 From: Jan Dusil Date: Mon, 30 Oct 2023 07:31:39 -0600 Subject: [PATCH 04/14] Fix #1457: Executable war - PA web flow client - executable war - Clean deps --- powerauth-webflow-client/pom.xml | 39 ++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/powerauth-webflow-client/pom.xml b/powerauth-webflow-client/pom.xml index d3bb00440..e0b879ead 100644 --- a/powerauth-webflow-client/pom.xml +++ b/powerauth-webflow-client/pom.xml @@ -33,9 +33,34 @@ 1.6.0-SNAPSHOT + + + + org.springframework.boot + spring-boot-starter-tomcat + provided + + + org.apache.tomcat.embed + tomcat-embed-el + provided + + + + + + org.springframework.boot + spring-boot-starter-web + + + log4j-to-slf4j + org.apache.logging.log4j + + + org.springframework.boot spring-boot-starter-thymeleaf @@ -113,10 +138,6 @@ org.projectlombok lombok - - jakarta.servlet - jakarta.servlet-api - @@ -145,16 +166,6 @@ - - standalone - - - org.springframework.boot - spring-boot-starter-tomcat - provided - - - \ No newline at end of file From ee39ec2cd30d0cf66a457bd50221451036cdfe81 Mon Sep 17 00:00:00 2001 From: Jan Dusil Date: Mon, 30 Oct 2023 08:07:48 -0600 Subject: [PATCH 05/14] Fix #1457: Executable war - Clean deps - Move deps management to root --- pom.xml | 17 +++++++++++++++++ powerauth-nextstep-model/pom.xml | 6 ------ powerauth-nextstep/pom.xml | 16 ---------------- powerauth-tpp-engine-client/pom.xml | 6 ------ powerauth-tpp-engine/pom.xml | 15 --------------- powerauth-webflow-authentication/pom.xml | 6 ------ powerauth-webflow-client/pom.xml | 16 ---------------- powerauth-webflow-resources/pom.xml | 6 ------ powerauth-webflow/pom.xml | 16 ---------------- 9 files changed, 17 insertions(+), 87 deletions(-) diff --git a/pom.xml b/pom.xml index 13e5cd8f4..870dca828 100644 --- a/pom.xml +++ b/pom.xml @@ -99,6 +99,8 @@ 1.4.2 20220608.1 7.4 + 11.0.0-M13 + 3.1.5 1.7.0 @@ -268,6 +270,21 @@ logstash-logback-encoder ${logstash.version} + + + + org.springframework.boot + spring-boot-starter-tomcat + ${spring-boot-starter-tomcat.version} + provided + + + org.apache.tomcat.embed + tomcat-embed-el + ${tomcat-embeded.version} + provided + + diff --git a/powerauth-nextstep-model/pom.xml b/powerauth-nextstep-model/pom.xml index 92077106e..f53bcffee 100644 --- a/powerauth-nextstep-model/pom.xml +++ b/powerauth-nextstep-model/pom.xml @@ -45,12 +45,6 @@ org.springframework.boot spring-boot-starter-validation - - - org.apache.tomcat.embed - tomcat-embed-el - - diff --git a/powerauth-nextstep/pom.xml b/powerauth-nextstep/pom.xml index 1ad01ee80..4824b63c0 100644 --- a/powerauth-nextstep/pom.xml +++ b/powerauth-nextstep/pom.xml @@ -30,22 +30,6 @@ powerauth-webflow-parent 1.6.0-SNAPSHOT - - - - - org.springframework.boot - spring-boot-starter-tomcat - provided - - - org.apache.tomcat.embed - tomcat-embed-el - provided - - - - diff --git a/powerauth-tpp-engine-client/pom.xml b/powerauth-tpp-engine-client/pom.xml index 7b41d6adc..7129794ef 100644 --- a/powerauth-tpp-engine-client/pom.xml +++ b/powerauth-tpp-engine-client/pom.xml @@ -38,12 +38,6 @@ org.springframework.boot spring-boot-starter-web - - - org.apache.tomcat.embed - tomcat-embed-el - - diff --git a/powerauth-tpp-engine/pom.xml b/powerauth-tpp-engine/pom.xml index 6e50c99fe..8ab37a725 100644 --- a/powerauth-tpp-engine/pom.xml +++ b/powerauth-tpp-engine/pom.xml @@ -31,21 +31,6 @@ 1.6.0-SNAPSHOT - - - - org.springframework.boot - spring-boot-starter-tomcat - provided - - - org.apache.tomcat.embed - tomcat-embed-el - provided - - - - diff --git a/powerauth-webflow-authentication/pom.xml b/powerauth-webflow-authentication/pom.xml index 9831057c7..f05fa5c89 100644 --- a/powerauth-webflow-authentication/pom.xml +++ b/powerauth-webflow-authentication/pom.xml @@ -63,12 +63,6 @@ org.springframework.boot spring-boot-starter-validation - - - org.apache.tomcat.embed - tomcat-embed-el - - diff --git a/powerauth-webflow-client/pom.xml b/powerauth-webflow-client/pom.xml index e0b879ead..23fe2b5af 100644 --- a/powerauth-webflow-client/pom.xml +++ b/powerauth-webflow-client/pom.xml @@ -32,22 +32,6 @@ io.getlime.security 1.6.0-SNAPSHOT - - - - - org.springframework.boot - spring-boot-starter-tomcat - provided - - - org.apache.tomcat.embed - tomcat-embed-el - provided - - - - diff --git a/powerauth-webflow-resources/pom.xml b/powerauth-webflow-resources/pom.xml index 3bf79bd82..0adef744e 100644 --- a/powerauth-webflow-resources/pom.xml +++ b/powerauth-webflow-resources/pom.xml @@ -37,12 +37,6 @@ org.springframework.boot spring-boot-starter-web - - - org.apache.tomcat.embed - tomcat-embed-el - - org.springframework.boot diff --git a/powerauth-webflow/pom.xml b/powerauth-webflow/pom.xml index 7615ce75d..644b58c87 100644 --- a/powerauth-webflow/pom.xml +++ b/powerauth-webflow/pom.xml @@ -31,22 +31,6 @@ powerauth-webflow Federated Authentication and Authorization Server for Web war - - - - - org.springframework.boot - spring-boot-starter-tomcat - provided - - - org.apache.tomcat.embed - tomcat-embed-el - provided - - - - From 3206737ae5477d7fe1dda7fb04b9c589675704c2 Mon Sep 17 00:00:00 2001 From: Jan Dusil Date: Mon, 30 Oct 2023 08:19:18 -0600 Subject: [PATCH 06/14] Fix #1457: Executable war - Clean up --- powerauth-nextstep/pom.xml | 1 + powerauth-webflow-client/pom.xml | 1 + powerauth-webflow/pom.xml | 1 + 3 files changed, 3 insertions(+) diff --git a/powerauth-nextstep/pom.xml b/powerauth-nextstep/pom.xml index 4824b63c0..efd68b1f7 100644 --- a/powerauth-nextstep/pom.xml +++ b/powerauth-nextstep/pom.xml @@ -30,6 +30,7 @@ powerauth-webflow-parent 1.6.0-SNAPSHOT + diff --git a/powerauth-webflow-client/pom.xml b/powerauth-webflow-client/pom.xml index 23fe2b5af..e82e473bc 100644 --- a/powerauth-webflow-client/pom.xml +++ b/powerauth-webflow-client/pom.xml @@ -32,6 +32,7 @@ io.getlime.security 1.6.0-SNAPSHOT + diff --git a/powerauth-webflow/pom.xml b/powerauth-webflow/pom.xml index 644b58c87..80706db7d 100644 --- a/powerauth-webflow/pom.xml +++ b/powerauth-webflow/pom.xml @@ -31,6 +31,7 @@ powerauth-webflow Federated Authentication and Authorization Server for Web war + From 4ae523a71683759088d39041baf5fea155e2c55b Mon Sep 17 00:00:00 2001 From: Jan Dusil Date: Mon, 30 Oct 2023 08:23:37 -0600 Subject: [PATCH 07/14] Fix #1457: Executable war - Update docs --- doc-private/Developer-How-To-Start.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/doc-private/Developer-How-To-Start.md b/doc-private/Developer-How-To-Start.md index b3ee5ea15..0baadda44 100644 --- a/doc-private/Developer-How-To-Start.md +++ b/doc-private/Developer-How-To-Start.md @@ -6,7 +6,6 @@ ### Standalone Run -- Enable maven profile `standalone` - Use IntelliJ Idea run configuration at `../.run/PowerAuthWebFlowApplication.run.xml` - Open [http://localhost:9080/powerauth-webflow/actuator/health](http://localhost:9080/powerauth-webflow/actuator/health) and you should get `{"status":"UP"}` @@ -29,7 +28,6 @@ liquibase --changelog-file=./docs/db/changelog/changesets/powerauth-webflow/db.c ### Standalone Run -- Enable maven profile `standalone` - Use IntelliJ Idea run configuration at `../.run/TppEngineApplication.run.xml` - Open [http://localhost:9081/tpp-engine/actuator/health](http://localhost:9081/tpp-engine/actuator/health) and you should get `{"status":"UP"}` @@ -52,7 +50,6 @@ liquibase --changelog-file=./docs/db/changelog/changesets/powerauth-tpp-engine/d ### Standalone Run -- Enable maven profile `standalone` - Use IntelliJ Idea run configuration at `../.run/NextStepApplication.run.xml` - Open [http://localhost:9082/powerauth-nextstep/actuator/health](http://localhost:9082/powerauth-nextstep/actuator/health) and you should get `{"status":"UP"}` @@ -85,6 +82,5 @@ ALTER TABLE ns_authentication ADD CONSTRAINT ns_auth_user_fk FOREIGN KEY (user_i ### Standalone Run -- Enable maven profile `standalone` - Use IntelliJ Idea run configuration at `../.run/PowerAuthWebFlowClientApplication.run.xml` - Open [http://localhost:9083/powerauth-webflow-client/actuator/health](http://localhost:9083/powerauth-webflow-client/actuator/health) and you should get `{"status":"UP"}` From 322e8eb5e8dbeca9be36416e333d3c207606b73a Mon Sep 17 00:00:00 2001 From: Jan Dusil Date: Tue, 31 Oct 2023 06:22:21 -0600 Subject: [PATCH 08/14] Fix #1457: Executable war - Fix version dep - Add exclusion --- pom.xml | 2 +- powerauth-webflow-client/pom.xml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 870dca828..0fcb50733 100644 --- a/pom.xml +++ b/pom.xml @@ -99,7 +99,7 @@ 1.4.2 20220608.1 7.4 - 11.0.0-M13 + 10.1.15 3.1.5 diff --git a/powerauth-webflow-client/pom.xml b/powerauth-webflow-client/pom.xml index e82e473bc..05ce2fd93 100644 --- a/powerauth-webflow-client/pom.xml +++ b/powerauth-webflow-client/pom.xml @@ -123,6 +123,10 @@ org.projectlombok lombok + + jakarta.servlet + jakarta.servlet-api + From 290fa7fa96141327c72f6238051f7a9b9f32c7d4 Mon Sep 17 00:00:00 2001 From: Jan Dusil Date: Wed, 1 Nov 2023 02:14:43 -0600 Subject: [PATCH 09/14] Fix #1457: Executable war - More elegant version --- pom.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 0fcb50733..d6e8884cf 100644 --- a/pom.xml +++ b/pom.xml @@ -99,8 +99,6 @@ 1.4.2 20220608.1 7.4 - 10.1.15 - 3.1.5 1.7.0 @@ -275,13 +273,13 @@ org.springframework.boot spring-boot-starter-tomcat - ${spring-boot-starter-tomcat.version} + ${project.parent.version} provided org.apache.tomcat.embed tomcat-embed-el - ${tomcat-embeded.version} + ${tomcat.version} provided From 95a4adc66de5d974b77cd8fdaf27b67dec6b0a4c Mon Sep 17 00:00:00 2001 From: Jan Dusil Date: Wed, 1 Nov 2023 03:33:30 -0600 Subject: [PATCH 10/14] Fix #1457: Executable war - More elegant version --- pom.xml | 2 -- powerauth-data-adapter-client/pom.xml | 8 -------- powerauth-nextstep-client/pom.xml | 8 -------- powerauth-tpp-engine-client/pom.xml | 6 ------ powerauth-webflow-authentication-mtoken/pom.xml | 5 ----- powerauth-webflow-authentication/pom.xml | 5 ++--- powerauth-webflow-resources/pom.xml | 5 ----- 7 files changed, 2 insertions(+), 37 deletions(-) diff --git a/pom.xml b/pom.xml index d6e8884cf..8114296a5 100644 --- a/pom.xml +++ b/pom.xml @@ -273,13 +273,11 @@ org.springframework.boot spring-boot-starter-tomcat - ${project.parent.version} provided org.apache.tomcat.embed tomcat-embed-el - ${tomcat.version} provided diff --git a/powerauth-data-adapter-client/pom.xml b/powerauth-data-adapter-client/pom.xml index fa30db74c..c50fdf941 100644 --- a/powerauth-data-adapter-client/pom.xml +++ b/powerauth-data-adapter-client/pom.xml @@ -33,14 +33,6 @@ - - - - org.springframework.boot - spring-boot-starter-tomcat - provided - - io.getlime.security diff --git a/powerauth-nextstep-client/pom.xml b/powerauth-nextstep-client/pom.xml index 0828ce039..56f9f655c 100644 --- a/powerauth-nextstep-client/pom.xml +++ b/powerauth-nextstep-client/pom.xml @@ -34,14 +34,6 @@ jar - - - - org.springframework.boot - spring-boot-starter-tomcat - provided - - io.getlime.security diff --git a/powerauth-tpp-engine-client/pom.xml b/powerauth-tpp-engine-client/pom.xml index 7129794ef..24be02c31 100644 --- a/powerauth-tpp-engine-client/pom.xml +++ b/powerauth-tpp-engine-client/pom.xml @@ -40,12 +40,6 @@ spring-boot-starter-web - - org.springframework.boot - spring-boot-starter-tomcat - provided - - io.getlime.core diff --git a/powerauth-webflow-authentication-mtoken/pom.xml b/powerauth-webflow-authentication-mtoken/pom.xml index 9c7026bae..40c7741e9 100644 --- a/powerauth-webflow-authentication-mtoken/pom.xml +++ b/powerauth-webflow-authentication-mtoken/pom.xml @@ -56,11 +56,6 @@ io.getlime.security powerauth-webflow-authentication - - org.springframework.boot - spring-boot-starter-tomcat - provided - jakarta.servlet jakarta.servlet-api diff --git a/powerauth-webflow-authentication/pom.xml b/powerauth-webflow-authentication/pom.xml index f05fa5c89..2a36d692b 100644 --- a/powerauth-webflow-authentication/pom.xml +++ b/powerauth-webflow-authentication/pom.xml @@ -40,9 +40,8 @@ spring-boot-starter-security - org.springframework.boot - spring-boot-starter-tomcat - provided + jakarta.servlet + jakarta.servlet-api org.springframework.boot diff --git a/powerauth-webflow-resources/pom.xml b/powerauth-webflow-resources/pom.xml index 0adef744e..2b188bcae 100644 --- a/powerauth-webflow-resources/pom.xml +++ b/powerauth-webflow-resources/pom.xml @@ -38,11 +38,6 @@ org.springframework.boot spring-boot-starter-web - - org.springframework.boot - spring-boot-starter-tomcat - provided - org.springframework.boot spring-boot-starter-security From 8d3e29500f81d100ef3c5faa87b29f476baff3a1 Mon Sep 17 00:00:00 2001 From: Jan Dusil Date: Wed, 1 Nov 2023 04:02:49 -0600 Subject: [PATCH 11/14] Fix #1457: Executable war - More elegant version --- powerauth-webflow-client/pom.xml | 1 - powerauth-webflow-resources/pom.xml | 4 ---- 2 files changed, 5 deletions(-) diff --git a/powerauth-webflow-client/pom.xml b/powerauth-webflow-client/pom.xml index 05ce2fd93..5bfdee838 100644 --- a/powerauth-webflow-client/pom.xml +++ b/powerauth-webflow-client/pom.xml @@ -32,7 +32,6 @@ io.getlime.security 1.6.0-SNAPSHOT - diff --git a/powerauth-webflow-resources/pom.xml b/powerauth-webflow-resources/pom.xml index 2b188bcae..4d68635d2 100644 --- a/powerauth-webflow-resources/pom.xml +++ b/powerauth-webflow-resources/pom.xml @@ -34,10 +34,6 @@ jar - - org.springframework.boot - spring-boot-starter-web - org.springframework.boot spring-boot-starter-security From a9cbb89818c378203766f71b5a3e9fe71bf2c679 Mon Sep 17 00:00:00 2001 From: Jan Dusil Date: Wed, 1 Nov 2023 10:15:45 -0600 Subject: [PATCH 12/14] Fix #1457: Executable war - Remove log4j-to-slf4j exclusions from spring-boot-starter --- powerauth-nextstep/pom.xml | 10 ---------- powerauth-tpp-engine/pom.xml | 10 ---------- powerauth-webflow-authentication/pom.xml | 1 + powerauth-webflow-client/pom.xml | 10 ---------- powerauth-webflow/pom.xml | 6 ------ 5 files changed, 1 insertion(+), 36 deletions(-) diff --git a/powerauth-nextstep/pom.xml b/powerauth-nextstep/pom.xml index efd68b1f7..e0ed7e222 100644 --- a/powerauth-nextstep/pom.xml +++ b/powerauth-nextstep/pom.xml @@ -37,12 +37,6 @@ org.springframework.boot spring-boot-starter-web - - - log4j-to-slf4j - org.apache.logging.log4j - - org.springframework.boot @@ -173,10 +167,6 @@ org.projectlombok lombok - - jakarta.servlet - jakarta.servlet-api - diff --git a/powerauth-tpp-engine/pom.xml b/powerauth-tpp-engine/pom.xml index 8ab37a725..210124028 100644 --- a/powerauth-tpp-engine/pom.xml +++ b/powerauth-tpp-engine/pom.xml @@ -36,12 +36,6 @@ org.springframework.boot spring-boot-starter-web - - - log4j-to-slf4j - org.apache.logging.log4j - - org.springframework.boot @@ -140,10 +134,6 @@ org.projectlombok lombok - - jakarta.servlet - jakarta.servlet-api - diff --git a/powerauth-webflow-authentication/pom.xml b/powerauth-webflow-authentication/pom.xml index 2a36d692b..c07c46b46 100644 --- a/powerauth-webflow-authentication/pom.xml +++ b/powerauth-webflow-authentication/pom.xml @@ -42,6 +42,7 @@ jakarta.servlet jakarta.servlet-api + provided org.springframework.boot diff --git a/powerauth-webflow-client/pom.xml b/powerauth-webflow-client/pom.xml index 5bfdee838..5adee4c68 100644 --- a/powerauth-webflow-client/pom.xml +++ b/powerauth-webflow-client/pom.xml @@ -38,12 +38,6 @@ org.springframework.boot spring-boot-starter-web - - - log4j-to-slf4j - org.apache.logging.log4j - - org.springframework.boot @@ -122,10 +116,6 @@ org.projectlombok lombok - - jakarta.servlet - jakarta.servlet-api - diff --git a/powerauth-webflow/pom.xml b/powerauth-webflow/pom.xml index 80706db7d..eba33381f 100644 --- a/powerauth-webflow/pom.xml +++ b/powerauth-webflow/pom.xml @@ -38,12 +38,6 @@ org.springframework.boot spring-boot-starter-web - - - log4j-to-slf4j - org.apache.logging.log4j - - org.springframework.boot From 929f11f060df664b130aad7553873e364597aeab Mon Sep 17 00:00:00 2001 From: Jan Dusil Date: Wed, 1 Nov 2023 18:56:26 -0600 Subject: [PATCH 13/14] Fix #1457: Executable war - Remove log4j-to-slf4j exclusions from spring-boot-starter --- powerauth-webflow-client/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/powerauth-webflow-client/pom.xml b/powerauth-webflow-client/pom.xml index 5adee4c68..2a88f7169 100644 --- a/powerauth-webflow-client/pom.xml +++ b/powerauth-webflow-client/pom.xml @@ -32,6 +32,7 @@ io.getlime.security 1.6.0-SNAPSHOT + From 9d8e0b64e6dafecd34e0e6b1f97bcf0b82d961aa Mon Sep 17 00:00:00 2001 From: Jan Dusil Date: Thu, 2 Nov 2023 01:40:11 -0600 Subject: [PATCH 14/14] Fix #1457: Executable war - Add exclusions of servlet apis --- pom.xml | 1 - powerauth-nextstep/pom.xml | 4 ++++ powerauth-tpp-engine/pom.xml | 4 ++++ powerauth-webflow-client/pom.xml | 4 ++++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8114296a5..b4ee1e352 100644 --- a/pom.xml +++ b/pom.xml @@ -269,7 +269,6 @@ ${logstash.version} - org.springframework.boot spring-boot-starter-tomcat diff --git a/powerauth-nextstep/pom.xml b/powerauth-nextstep/pom.xml index e0ed7e222..4918a6d4a 100644 --- a/powerauth-nextstep/pom.xml +++ b/powerauth-nextstep/pom.xml @@ -167,6 +167,10 @@ org.projectlombok lombok + + jakarta.servlet + jakarta.servlet-api + diff --git a/powerauth-tpp-engine/pom.xml b/powerauth-tpp-engine/pom.xml index 210124028..91c3a3814 100644 --- a/powerauth-tpp-engine/pom.xml +++ b/powerauth-tpp-engine/pom.xml @@ -134,6 +134,10 @@ org.projectlombok lombok + + jakarta.servlet + jakarta.servlet-api + diff --git a/powerauth-webflow-client/pom.xml b/powerauth-webflow-client/pom.xml index 2a88f7169..9d6b8ffbd 100644 --- a/powerauth-webflow-client/pom.xml +++ b/powerauth-webflow-client/pom.xml @@ -117,6 +117,10 @@ org.projectlombok lombok + + jakarta.servlet + jakarta.servlet-api +