From d444dfcc04dd9e8b1acb1600e7b70b1999401aa9 Mon Sep 17 00:00:00 2001 From: Mithun James Date: Fri, 21 Mar 2025 11:43:14 +0530 Subject: [PATCH 1/3] Fix .java-version, add plugins for successful build --- .java-version | 2 +- pom.xml | 22 +++++++++++++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/.java-version b/.java-version index 62593409..03b6389f 100644 --- a/.java-version +++ b/.java-version @@ -1 +1 @@ -1.8 +17.0 diff --git a/pom.xml b/pom.xml index f29e4dca..0e48f9ca 100644 --- a/pom.xml +++ b/pom.xml @@ -516,7 +516,27 @@ 17 - + + org.apache.maven.plugins + maven-compiler-plugin + 3.12.1 + + ${java.version} + ${java.version} + + + org.projectlombok + lombok + ${lombok.version} + + + org.mapstruct + mapstruct-processor + ${org.mapstruct.version} + + + + org.apache.maven.plugins maven-resources-plugin From 920de5c7e00d86dcaa8de94d27aa1473a8d3fe51 Mon Sep 17 00:00:00 2001 From: Mithun James Date: Fri, 21 Mar 2025 11:58:51 +0530 Subject: [PATCH 2/3] Add swagger UI to skip JWT checks --- pom.xml | 2 +- .../java/com/iemr/common/utils/JwtUserIdValidationFilter.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0e48f9ca..f75d0f2a 100644 --- a/pom.xml +++ b/pom.xml @@ -527,7 +527,7 @@ org.projectlombok lombok - ${lombok.version} + ${org.projectlombok.version} org.mapstruct diff --git a/src/main/java/com/iemr/common/utils/JwtUserIdValidationFilter.java b/src/main/java/com/iemr/common/utils/JwtUserIdValidationFilter.java index 0c12c3a6..2eb2ee2e 100644 --- a/src/main/java/com/iemr/common/utils/JwtUserIdValidationFilter.java +++ b/src/main/java/com/iemr/common/utils/JwtUserIdValidationFilter.java @@ -55,6 +55,8 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo // Skip login and public endpoints if (path.equals(contextPath + "/user/userAuthenticate") || path.equalsIgnoreCase(contextPath + "/user/logOutUserFromConcurrentSession") + || path.startsWith(contextPath + "/swagger-ui") + || path.startsWith(contextPath + "/v3/api-docs") || path.startsWith(contextPath + "/public")) { logger.info("Skipping filter for path: " + path); filterChain.doFilter(servletRequest, servletResponse); From 31b65e331f1b409c2e44e142e14afb2c1a3edbb7 Mon Sep 17 00:00:00 2001 From: Mithun James Date: Fri, 21 Mar 2025 12:22:51 +0530 Subject: [PATCH 3/3] update lombok version --- pom.xml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index f75d0f2a..db199065 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ 17 jdt_apt 1.2.0.Final - 1.16.18 + 1.18.36 commonapi-v1.0 ${ENV_VAR} target/classes/application.properties @@ -511,18 +511,10 @@ org.apache.maven.plugins maven-compiler-plugin + 3.14.0 17 17 - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.12.1 - - ${java.version} - ${java.version} org.projectlombok