Skip to content

MOSIP-31617- java 17 migration #142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
loganathan-sekaran wants to merge 7 commits into
base: develop
Choose a base branch
from
Draft

MOSIP-31617- java 17 migration #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6ffd1ef
WIP-Updated auditmanager api
Mar 13, 2024
ecf4fec
Test fix
Mar 13, 2024
4101618
Committing changes.
Mar 15, 2024
303ea43
Committing changes.
Mar 15, 2024
b2b60eb
Used BBOM file for dependencies
Mar 19, 2024
e656b2e
Used BBOM file for dependencies
Mar 19, 2024
f663e58
Fix to entity classes
Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
144 changes: 29 additions & 115 deletions kernel/kernel-auditmanager-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,117 +7,39 @@
<groupId>io.mosip.kernel</groupId>

<artifactId>kernel-auditmanager-api</artifactId>
<version>1.2.1-SNAPSHOT</version>
<version>1.2.1-java17-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<!-- maven -->
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.version>3.8.0</maven.compiler.version>

<maven.jar.plugin.version>3.0.2</maven.jar.plugin.version>
<maven.war.plugin.version>3.1.0</maven.war.plugin.version>
<maven.javadoc.version>3.2.0</maven.javadoc.version>
<maven.javadoc.version>3.6.3</maven.javadoc.version>
<maven-shade-plugin.version>2.3</maven-shade-plugin.version>

<!-- spring -->
<spring.boot.version>2.0.2.RELEASE</spring.boot.version>
<spring.data.jpa.version>2.0.7.RELEASE</spring.data.jpa.version>
<spring.security.test.version>5.0.5.RELEASE</spring.security.test.version>
<spring-cloud-config.version>2.0.4.RELEASE</spring-cloud-config.version>

<!-- swagger -->
<swagger.core.version>2.0.7</swagger.core.version>
<swagger.annotations.version>1.5.21</swagger.annotations.version>
<springfox.version>2.9.2</springfox.version>

<!-- vertx -->
<vertx.version>3.6.2</vertx.version>
<vertx.health.check.version>3.7.0</vertx.health.check.version>


<!-- javax -->
<javax.interceptor.version>1.2</javax.interceptor.version>
<javax.el-api.version>3.0.0</javax.el-api.version>
<javax.transaction.api.version>1.3</javax.transaction.api.version>
<javax.persistence.api.version>2.2</javax.persistence.api.version>
<javax.validation-api.version>2.0.1.Final</javax.validation-api.version>
<glassfish.javax.el>2.2.6</glassfish.javax.el>

<!-- data -->
<h2.version>1.4.197</h2.version>
<mysql.connector.version>5.1.46</mysql.connector.version>
<postgresql.version>42.2.25</postgresql.version>
<eclipselink.version>2.5.0</eclipselink.version>
<hibernate.version>5.2.17.Final</hibernate.version>
<hibernate.validator.version>6.0.12.Final</hibernate.validator.version>

<!-- test -->
<junit.version>4.12</junit.version>
<mockito.version>2.23.4</mockito.version>
<powermock.version>1.7.4</powermock.version>
<powermock.beta.version>2.0.7</powermock.beta.version>

<!-- logger -->
<logback.version>1.2.3</logback.version>
<slf4j.version>1.7.19</slf4j.version>
<log4j-over-slf4j>1.7.7</log4j-over-slf4j>
<jcl.to.slf4j.version>1.7.25</jcl.to.slf4j.version>

<!-- json -->
<jackson.version>2.9.5</jackson.version>
<jackson.datatype.version>2.9.8</jackson.datatype.version>
<jackson.databind>2.9.6</jackson.databind>
<json.utility.version>20180130</json.utility.version>
<json.schema.validator.version>2.2.10</json.schema.validator.version>
<json.version>20180813</json.version>
<jsonsimple.version>1.1.1</jsonsimple.version>

<!-- utilities -->
<commons-math3>3.6.1</commons-math3>
<commons-lang3>3.7</commons-lang3>
<commons-io>2.6</commons-io>
<commons-codec>1.11</commons-codec>
<commons-collections4.version>4.3</commons-collections4.version>
<commons.beanutils.version>1.9.2</commons.beanutils.version>
<commons.configuration2.version>2.2</commons.configuration2.version>
<apache.httpcomponents.version>4.5.6</apache.httpcomponents.version>
<guava.version>19.0</guava.version>
<lombok.version>1.18.8</lombok.version>
<jsch.version>0.1.54</jsch.version>
<sshd.version>1.4.0</sshd.version>
<itextcore.version>7.1.0</itextcore.version>
<itexthtml2pdf.version>2.0.0</itexthtml2pdf.version>
<itext.version>5.5.13</itext.version>
<freemarker.version>2.3.23</freemarker.version>
<velocity.version>1.7</velocity.version>
<velocity.tool.version>2.0</velocity.tool.version>
<datamapper.orika>1.5.2</datamapper.orika>
<modelmapper.version>2.1.1</modelmapper.version>
<bouncycastle.version>1.66</bouncycastle.version>
<icu4j.version>63.1</icu4j.version>
<seventeam-otp.version>1.0.0</seventeam-otp.version>
<google.zxing.version>3.3.3</google.zxing.version>
<hadoop-client>3.1.0</hadoop-client>
<htrace-core4>4.1.0-incubating</htrace-core4>
<aws.javasdk.version>1.11.368</aws.javasdk.version>
<s3mock.version>0.2.4</s3mock.version>
<ignite.version>2.3.0</ignite.version>
<findbugs.version>3.0.1</findbugs.version>
<byte.buddy.version>1.9.12</byte.buddy.version>
<io.jsonwebtoken.jjwt.version>0.6.0</io.jsonwebtoken.jjwt.version>
<apache.directory.api.version>2.0.0.AM2</apache.directory.api.version>
<aspectjweaver.version>1.8.12</aspectjweaver.version>
<micrometer.core.version>1.4.2</micrometer.core.version>
<micrometer.registry.prometheus.version>1.4.2</micrometer.registry.prometheus.version>
<kernel.core.version>1.2.1-SNAPSHOT</kernel.core.version>
<kernel.dataaccess-hibernate.version>1.2.1-SNAPSHOT</kernel.dataaccess-hibernate.version>
<jacoco.maven.plugin.version>0.8.5</jacoco.maven.plugin.version>
<kernel.core.version>1.2.1-java17-SNAPSHOT</kernel.core.version>

<jacoco.maven.plugin.version>0.8.11</jacoco.maven.plugin.version>
<sonar.coverage.exclusions>**/dto/**,**/constant/**,**/config/**,**/httpfilter/**,**/cache/**,**/entity/**,**/model/**,**/exception/**,**/repository/**,**/request/**,**/spi/**,"**/proxy/**","**/AuditManagerBootApplication.java
"</sonar.coverage.exclusions>
<sonar.cpd.exclusions>**/dto/**,**/entity/**,**/config/**</sonar.cpd.exclusions>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.mosip.kernel</groupId>
<artifactId>kernel-bom</artifactId>
<version>1.2.1-java17-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>io.mosip.kernel</groupId>
Expand All @@ -127,40 +49,32 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
<version>${spring.boot.version}</version>
<exclusions>
<exclusion>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
<version>${spring.boot.version}</version>
<exclusions>
<exclusion>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>${h2.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>${postgresql.version}</version>
</dependency>
<dependency>
<groupId>org.modelmapper</groupId>
<artifactId>modelmapper</artifactId>
<version>${modelmapper.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
</dependencies>

Expand Down Expand Up @@ -228,7 +142,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.2.0</version>
<version>${maven.javadoc.version}</version>
<executions>
<execution>
<id>attach-javadocs</id>
Expand Down
11 changes: 5 additions & 6 deletions kernel/kernel-auditmanager-api/src/main/java/io/mosip/kernel/auditmanager/entity/Audit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
9 changes: 4 additions & 5 deletions .../kernel-auditmanager-api/src/main/java/io/mosip/kernel/auditmanager/entity/BaseAudit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -17,9 +16,9 @@
* @since 1.0.0
*
*/
@MappedSuperclass
@Data
@AllArgsConstructor
@MappedSuperclass
public class BaseAudit {

/**
Expand Down
9 changes: 4 additions & 5 deletions ...l/kernel-auditmanager-api/src/main/java/io/mosip/kernel/auditmanager/util/AuditUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading