diff --git a/kernel/kernel-auditmanager-api/pom.xml b/kernel/kernel-auditmanager-api/pom.xml
index 8b8d544a..a9f2213a 100644
--- a/kernel/kernel-auditmanager-api/pom.xml
+++ b/kernel/kernel-auditmanager-api/pom.xml
@@ -7,117 +7,39 @@
io.mosip.kernel
kernel-auditmanager-api
- 1.2.1-SNAPSHOT
+ 1.2.1-java17-SNAPSHOT
UTF-8
- 11
- 11
+ 17
+ 17
3.8.0
3.0.2
3.1.0
- 3.2.0
+ 3.6.3
2.3
-
- 2.0.2.RELEASE
- 2.0.7.RELEASE
- 5.0.5.RELEASE
- 2.0.4.RELEASE
-
-
- 2.0.7
- 1.5.21
- 2.9.2
-
-
- 3.6.2
- 3.7.0
-
-
-
- 1.2
- 3.0.0
- 1.3
- 2.2
- 2.0.1.Final
- 2.2.6
-
-
- 1.4.197
- 5.1.46
- 42.2.25
- 2.5.0
- 5.2.17.Final
- 6.0.12.Final
-
-
- 4.12
- 2.23.4
- 1.7.4
- 2.0.7
-
-
- 1.2.3
- 1.7.19
- 1.7.7
- 1.7.25
-
-
- 2.9.5
- 2.9.8
- 2.9.6
- 20180130
- 2.2.10
- 20180813
- 1.1.1
-
-
- 3.6.1
- 3.7
- 2.6
- 1.11
- 4.3
- 1.9.2
- 2.2
- 4.5.6
- 19.0
- 1.18.8
- 0.1.54
- 1.4.0
- 7.1.0
- 2.0.0
- 5.5.13
- 2.3.23
- 1.7
- 2.0
- 1.5.2
- 2.1.1
- 1.66
- 63.1
- 1.0.0
- 3.3.3
- 3.1.0
- 4.1.0-incubating
- 1.11.368
- 0.2.4
- 2.3.0
- 3.0.1
- 1.9.12
- 0.6.0
- 2.0.0.AM2
- 1.8.12
- 1.4.2
- 1.4.2
- 1.2.1-SNAPSHOT
- 1.2.1-SNAPSHOT
- 0.8.5
+ 1.2.1-java17-SNAPSHOT
+
+ 0.8.11
**/dto/**,**/constant/**,**/config/**,**/httpfilter/**,**/cache/**,**/entity/**,**/model/**,**/exception/**,**/repository/**,**/request/**,**/spi/**,"**/proxy/**","**/AuditManagerBootApplication.java
"
**/dto/**,**/entity/**,**/config/**
+
+
+
+
+ io.mosip.kernel
+ kernel-bom
+ 1.2.1-java17-SNAPSHOT
+ pom
+ import
+
+
+
io.mosip.kernel
@@ -127,40 +49,32 @@
org.springframework.boot
spring-boot-starter-data-jpa
- ${spring.boot.version}
-
-
- com.h2database
- h2
-
-
org.springframework.boot
spring-boot-starter-validation
- ${spring.boot.version}
-
-
- com.h2database
- h2
-
-
com.h2database
h2
- ${h2.version}
runtime
org.postgresql
postgresql
- ${postgresql.version}
org.modelmapper
modelmapper
- ${modelmapper.version}
+
+
+ junit
+ junit
+ test
+
+
+ org.slf4j
+ slf4j-api
@@ -228,7 +142,7 @@
org.apache.maven.plugins
maven-javadoc-plugin
- 3.2.0
+ ${maven.javadoc.version}
attach-javadocs
diff --git a/kernel/kernel-auditmanager-api/src/main/java/io/mosip/kernel/auditmanager/entity/Audit.java b/kernel/kernel-auditmanager-api/src/main/java/io/mosip/kernel/auditmanager/entity/Audit.java
index c5b7209b..ac05ac9c 100644
--- a/kernel/kernel-auditmanager-api/src/main/java/io/mosip/kernel/auditmanager/entity/Audit.java
+++ b/kernel/kernel-auditmanager-api/src/main/java/io/mosip/kernel/auditmanager/entity/Audit.java
@@ -2,12 +2,11 @@
import java.time.LocalDateTime;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/kernel/kernel-auditmanager-api/src/main/java/io/mosip/kernel/auditmanager/entity/BaseAudit.java b/kernel/kernel-auditmanager-api/src/main/java/io/mosip/kernel/auditmanager/entity/BaseAudit.java
index 81a223e1..e1e27460 100644
--- a/kernel/kernel-auditmanager-api/src/main/java/io/mosip/kernel/auditmanager/entity/BaseAudit.java
+++ b/kernel/kernel-auditmanager-api/src/main/java/io/mosip/kernel/auditmanager/entity/BaseAudit.java
@@ -3,10 +3,9 @@
import java.time.LocalDateTime;
import java.util.UUID;
-import javax.persistence.Column;
-import javax.persistence.Id;
-import javax.persistence.MappedSuperclass;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Id;
+import jakarta.persistence.MappedSuperclass;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -17,9 +16,9 @@
* @since 1.0.0
*
*/
-@MappedSuperclass
@Data
@AllArgsConstructor
+@MappedSuperclass
public class BaseAudit {
/**
diff --git a/kernel/kernel-auditmanager-api/src/main/java/io/mosip/kernel/auditmanager/util/AuditUtils.java b/kernel/kernel-auditmanager-api/src/main/java/io/mosip/kernel/auditmanager/util/AuditUtils.java
index 5cf83348..30eb4cbe 100644
--- a/kernel/kernel-auditmanager-api/src/main/java/io/mosip/kernel/auditmanager/util/AuditUtils.java
+++ b/kernel/kernel-auditmanager-api/src/main/java/io/mosip/kernel/auditmanager/util/AuditUtils.java
@@ -2,14 +2,13 @@
import java.util.Set;
-import javax.validation.ConstraintViolation;
-import javax.validation.Validation;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
-
import io.mosip.kernel.auditmanager.constant.AuditErrorCodes;
import io.mosip.kernel.auditmanager.request.AuditRequestDto;
import io.mosip.kernel.core.auditmanager.exception.AuditManagerException;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
/**
* Utility class for Audit Manager
diff --git a/kernel/kernel-auditmanager-service/pom.xml b/kernel/kernel-auditmanager-service/pom.xml
index 24be0db4..1df2309e 100644
--- a/kernel/kernel-auditmanager-service/pom.xml
+++ b/kernel/kernel-auditmanager-service/pom.xml
@@ -5,225 +5,41 @@
io.mosip.kernel
kernel-auditmanager-service
- 1.2.1-SNAPSHOT
+ 1.2.1-java17-SNAPSHOT
UTF-8
- 11
- 11
+ 17
+ 17
3.8.0
3.0.2
3.1.0
- 3.2.0
+ 3.6.3
2.3
- 2.0.2.RELEASE
- 2.0.7.RELEASE
- 5.0.5.RELEASE
- 2.0.4.RELEASE
-
-
- 2.0.7
- 1.5.21
- 2.9.2
-
-
- 3.6.2
- 3.7.0
-
-
-
- 1.2
- 3.0.0
- 1.3
- 2.2
- 2.0.1.Final
- 2.2.6
-
-
- 1.4.197
- 5.1.46
- 42.2.25
- 2.5.0
- 5.2.17.Final
- 6.0.12.Final
-
-
- 4.12
- 2.23.4
- 1.7.4
- 2.0.7
-
-
- 1.2.3
- 1.7.19
- 1.7.7
- 1.7.25
-
-
- 2.9.5
- 2.9.8
- 2.9.6
- 20180130
- 2.2.10
- 20180813
- 1.1.1
-
-
- 3.6.1
- 3.7
- 2.6
- 1.11
- 4.3
- 1.9.2
- 2.2
- 4.5.6
- 19.0
- 1.18.8
- 0.1.54
- 1.4.0
- 7.1.0
- 2.0.0
- 5.5.13
- 2.3.23
- 1.7
- 2.0
- 1.5.2
- 2.1.1
- 1.66
- 63.1
- 1.0.0
- 3.3.3
- 3.1.0
- 4.1.0-incubating
- 1.11.368
- 0.2.4
- 2.3.0
- 3.0.1
- 1.9.12
- 0.6.0
- 2.0.0.AM2
- 1.8.12
- 1.4.2
- 1.4.2
- UTF-8
-
-
- 11
- 11
- 3.8.0
-
- 3.0.2
- 3.1.0
- 3.2.0
- 2.3
-
-
- 2.0.2.RELEASE
- 2.0.7.RELEASE
- 5.0.5.RELEASE
- 2.0.4.RELEASE
-
-
- 2.0.7
- 1.5.21
- 2.9.2
-
-
- 3.6.2
- 3.7.0
-
-
-
- 1.2
- 3.0.0
- 1.3
- 2.2
- 2.0.1.Final
- 2.2.6
-
-
- 1.4.197
- 5.1.46
- 42.2.25
- 2.5.0
- 5.2.17.Final
- 6.0.12.Final
-
-
- 4.12
- 2.23.4
- 1.7.4
- 2.0.7
-
-
- 1.2.3
- 1.7.19
- 1.7.7
- 1.7.25
- 2.17.1
-
-
- 2.9.5
- 2.9.8
- 2.9.6
- 20180130
- 2.2.10
- 20180813
- 1.1.1
-
-
- 3.6.1
- 3.7
- 2.6
- 1.11
- 4.3
- 1.9.2
- 2.2
- 4.5.6
- 19.0
- 1.18.8
- 0.1.54
- 1.4.0
- 7.1.0
- 2.0.0
- 5.5.13
- 2.3.23
- 1.7
- 2.0
- 1.5.2
- 2.1.1
- 1.66
- 63.1
- 1.0.0
- 3.3.3
- 3.1.0
- 4.1.0-incubating
- 1.11.368
- 0.2.4
- 2.3.0
- 3.0.1
- 1.9.12
- 0.6.0
- 2.0.0.AM2
- 1.8.12
- 1.4.2
- 1.4.2
- 1.5.10
- 1.2.1-SNAPSHOT
- 1.2.1-SNAPSHOT
+ 1.2.1-java17-SNAPSHOT
1.2.1-SNAPSHOT
- 1.2.1-SNAPSHOT
- 1.2.1-SNAPSHOT
- 1.2.1-SNAPSHOT
- 0.8.5
+ 1.2.1-java17-SNAPSHOT
+ 1.2.1-java17-SNAPSHOT
+ 1.2.1-java17-SNAPSHOT
+
**/dto/**,**/constant/**,**/config/**,**/httpfilter/**,**/cache/**,**/entity/**,**/model/**,**/exception/**,**/repository/**,**/request/**,**/spi/**,"**/proxy/**","**/AuditManagerBootApplication.java"
**/dto/**,**/entity/**,**/config/**
- 2.12.0
+
+
+
+ io.mosip.kernel
+ kernel-bom
+ 1.2.1-java17-SNAPSHOT
+ pom
+ import
+
+
+
io.mosip.kernel
@@ -233,7 +49,6 @@
org.postgresql
postgresql
- ${postgresql.version}
io.mosip.kernel
@@ -248,49 +63,45 @@
org.springframework.boot
spring-boot-starter-security
- ${spring.boot.version}
org.springframework.security
spring-security-test
- ${spring.security.test.version}
org.springframework.boot
spring-boot-starter-web
- ${spring.boot.version}
com.googlecode.json-simple
json-simple
- 1.1.1
-
-
- junit
- junit
-
-
org.springdoc
springdoc-openapi-ui
- ${springdoc.version}
org.springframework.boot
spring-boot-configuration-processor
true
- ${spring.boot.version}
com.fasterxml.jackson.datatype
jackson-datatype-jsr310
- ${fasterxml.jackson.module.jsr310.version}
org.apache.logging.log4j
log4j-api
- ${apache.logging.log4j.api.version}
+
+
+ junit
+ junit
+ test
+
+
+ jakarta.servlet
+ jakarta.servlet-api
+ provided
@@ -309,7 +120,6 @@
org.springframework.boot
spring-boot-maven-plugin
- ${spring.boot.version}
true
ZIP
@@ -375,7 +185,7 @@
org.apache.maven.plugins
maven-javadoc-plugin
- 3.2.0
+ ${maven.javadoc.version}
attach-javadocs
@@ -449,7 +259,6 @@
org.jacoco
jacoco-maven-plugin
- ${jacoco.maven.plugin.version}
@@ -497,7 +306,7 @@
io.mosip.kernel
kernel-auth-adapter
- 1.2.1-SNAPSHOT
+ 1.2.1-java17-SNAPSHOT
diff --git a/kernel/kernel-auditmanager-service/src/main/java/io/mosip/kernel/auditmanager/AuditManagerBootApplication.java b/kernel/kernel-auditmanager-service/src/main/java/io/mosip/kernel/auditmanager/AuditManagerBootApplication.java
index e771319e..a2cd2842 100644
--- a/kernel/kernel-auditmanager-service/src/main/java/io/mosip/kernel/auditmanager/AuditManagerBootApplication.java
+++ b/kernel/kernel-auditmanager-service/src/main/java/io/mosip/kernel/auditmanager/AuditManagerBootApplication.java
@@ -10,7 +10,7 @@
* @since 1.0.0
*
*/
-@SpringBootApplication(scanBasePackages = { "io.mosip.kernel.auditmanager.*","${mosip.auth.adapter.impl.basepackage}"
+@SpringBootApplication(scanBasePackages = { "io.mosip.kernel.auditmanager","${mosip.auth.adapter.impl.basepackage}"
,"io.mosip.kernel.core.logger.config"})
public class AuditManagerBootApplication {
diff --git a/kernel/kernel-auditmanager-service/src/main/java/io/mosip/kernel/auditmanager/exception/ApiExceptionHandler.java b/kernel/kernel-auditmanager-service/src/main/java/io/mosip/kernel/auditmanager/exception/ApiExceptionHandler.java
index 73540cf9..fa49a013 100644
--- a/kernel/kernel-auditmanager-service/src/main/java/io/mosip/kernel/auditmanager/exception/ApiExceptionHandler.java
+++ b/kernel/kernel-auditmanager-service/src/main/java/io/mosip/kernel/auditmanager/exception/ApiExceptionHandler.java
@@ -5,8 +5,6 @@
import java.time.ZoneId;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -28,6 +26,7 @@
import io.mosip.kernel.core.exception.ServiceError;
import io.mosip.kernel.core.http.ResponseWrapper;
import io.mosip.kernel.core.util.EmptyCheckUtils;
+import jakarta.servlet.http.HttpServletRequest;
/**
* Class for handling API exceptions
diff --git a/kernel/kernel-auditmanager-service/src/test/java/io/mosip/kernel/auditmanager/test/config/TestSecurityConfig.java b/kernel/kernel-auditmanager-service/src/test/java/io/mosip/kernel/auditmanager/test/config/TestSecurityConfig.java
index d2a37ccf..5cec9786 100644
--- a/kernel/kernel-auditmanager-service/src/test/java/io/mosip/kernel/auditmanager/test/config/TestSecurityConfig.java
+++ b/kernel/kernel-auditmanager-service/src/test/java/io/mosip/kernel/auditmanager/test/config/TestSecurityConfig.java
@@ -4,15 +4,12 @@
import java.util.Arrays;
import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.builders.WebSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
import org.springframework.security.config.http.SessionCreationPolicy;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.core.userdetails.User;
@@ -23,20 +20,21 @@
import org.springframework.security.web.firewall.DefaultHttpFirewall;
import org.springframework.security.web.firewall.HttpFirewall;
+import jakarta.servlet.http.HttpServletResponse;
+
@Configuration
@EnableWebSecurity
-@EnableGlobalMethodSecurity(prePostEnabled = true)
-public class TestSecurityConfig extends WebSecurityConfigurerAdapter {
+@EnableMethodSecurity
+public class TestSecurityConfig {
@Bean
public HttpFirewall defaultHttpFirewall() {
return new DefaultHttpFirewall();
}
- @Override
+ @Bean
public void configure(WebSecurity webSecurity) throws Exception {
- webSecurity.ignoring().antMatchers(allowedEndPoints());
- super.configure(webSecurity);
+ webSecurity.ignoring().requestMatchers(allowedEndPoints());
webSecurity.httpFirewall(defaultHttpFirewall());
}
@@ -46,7 +44,7 @@ private String[] allowedEndPoints() {
"/*/configuration/security", "/*/swagger-resources/**", "/*/swagger-ui.html" };
}
- @Override
+ @Bean
protected void configure(final HttpSecurity httpSecurity) throws Exception {
httpSecurity.csrf().disable();
httpSecurity.httpBasic().and().authorizeRequests().anyRequest().authenticated().and().sessionManagement()