Skip to content
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

[MOSIP-32460]Migration to develop from develop-java21 #1301

Open
wants to merge 1 commit into
base: develop-java21
Choose a base branch
from
Open

[MOSIP-32460]Migration to develop from develop-java21 #1301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
512 changes: 165 additions & 347 deletions authentication/authentication-authtypelockfilter-impl/pom.xml
View file
Open in desktop

Large diffs are not rendered by default.

119 changes: 66 additions & 53 deletions authentication/authentication-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?xml version="1.0"?>
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.mosip.authentication</groupId>
Expand All @@ -11,19 +12,34 @@
<version>1.2.1-java21-SNAPSHOT</version>
<artifactId>authentication-common</artifactId>
<name>authentication-common</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.mosip.kernel</groupId>
<artifactId>kernel-bom</artifactId>
<version>${kernel.bom.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.mosip.authentication</groupId>
<artifactId>authentication-core</artifactId>
<version>${authentication-core.version}</version>
<version>${authentication.core.version}</version>
</dependency>
<dependency>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why Kernel-core is added as dependency? kernel-bom will include the kernel-core. please remove all the dependency which are getting added thru bom.

<groupId>io.mosip.kernel</groupId>
<artifactId>kernel-core</artifactId>
<version>${kernel-core.version}</version>
<version>${kernel.core.version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
Expand All @@ -40,12 +56,12 @@
<dependency>
<groupId>io.mosip.authentication</groupId>
<artifactId>authentication-filter-api</artifactId>
<version>${authentication-filter-api.version}</version>
<version>${authentication.filter.api.version}</version>
</dependency>
<dependency>
<groupId>io.mosip.kernel</groupId>
<artifactId>kernel-dataaccess-hibernate</artifactId>
<version>${kernel-dataaccess-hibernate.version}</version>
<version>${kernel.dataaccess.hibernate.version}</version>
</dependency>
<dependency>
<groupId>com.jayway.jsonpath</groupId>
Expand All @@ -58,12 +74,12 @@
<dependency>
<groupId>io.mosip.kernel</groupId>
<artifactId>kernel-pinvalidator</artifactId>
<version>${kernel-pinvalidator.version}</version>
<version>${kernel.pinvalidator.version}</version>
</dependency>
<dependency>
<groupId>io.mosip.idrepository</groupId>
<artifactId>id-repository-core</artifactId>
<version>${id-repository-core.version}</version>
<version>${id.repository.core.version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
Expand All @@ -80,7 +96,7 @@
<artifactId>kernel-auth-adapter</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependency>
<!-- Sprint Boot -->
<dependency>
<groupId>org.springframework.boot</groupId>
Expand All @@ -96,13 +112,13 @@
<dependency>
<groupId>org.springframework.kafka</groupId>
<artifactId>spring-kafka</artifactId>
<version>2.5.8.RELEASE</version>
<!-- <version>${org.springframework.kafka.version}</version>-->
</dependency>
<!-- Kernel Template -->
<dependency>
<groupId>io.mosip.kernel</groupId>
<artifactId>kernel-templatemanager-velocity</artifactId>
<version>${kernel-templatemanager-velocity.version}</version>
<version>${kernel.templatemanager.velocity.version}</version>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>
Expand All @@ -115,42 +131,39 @@
</exclusions>
</dependency>
<!-- Commons Lang -->
<dependency>
<groupId>javax.xml.parsers</groupId>
<artifactId>jaxp-api</artifactId>
<version>1.4.5</version>
</dependency>
<dependency>
<groupId>org.tensorflow</groupId>
<artifactId>tensorflow</artifactId>
<version>1.15.0</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
<version>4.5.9</version>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>


<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
<groupId>javax.xml.parsers</groupId>
<artifactId>jaxp-api</artifactId>
<version>${javax.xml.parsers.api.version}</version>
</dependency>
<dependency>
<groupId>org.tensorflow</groupId>
<artifactId>tensorflow</artifactId>
<version>${org.tensorflow.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<scope>compile</scope>
</dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
<version>${org.apache.httpcomponents.httpmime.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito2</artifactId>
Expand All @@ -164,7 +177,7 @@
<dependency>
<groupId>io.mosip.kernel</groupId>
<artifactId>kernel-keymanager-service</artifactId>
<version>${kernel-keymanager-service.version}</version>
<version>${kernel.keymanager.service.version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
Expand All @@ -186,7 +199,7 @@
<dependency>
<groupId>io.mosip.kernel</groupId>
<artifactId>kernel-biosdk-provider</artifactId>
<version>${kernel-biosdk-provider.version}</version>
<version>${kernel.biosdk.provider.version}</version>
<exclusions>
<exclusion>
<groupId>io.mosip.kernel</groupId>
Expand All @@ -201,7 +214,7 @@
<dependency>
<groupId>io.mosip.kernel</groupId>
<artifactId>kernel-cbeffutil-api</artifactId>
<version>${kernel-cbeffutil-api.version}</version>
<version>${kernel.cbeffutil.api.version}</version>
<exclusions>
<exclusion>
<groupId>io.mosip.kernel</groupId>
Expand All @@ -222,12 +235,12 @@
<dependency>
<groupId>io.mosip.kernel</groupId>
<artifactId>kernel-websubclient-api</artifactId>
<version>${kernel-websubclient-api.version}</version>
<version>${kernel.websubclient.api.version}</version>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
<version>${springdoc.version}</version>
<version>${springdoc.openapi.starter.webmvc.ui.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand All @@ -242,7 +255,7 @@
<dependency>
<groupId>io.mosip.kernel</groupId>
<artifactId>kernel-logger-logback</artifactId>
<version>${kernel-logger-logback.version}</version>
<version>${kernel.logger.logback.version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
Expand All @@ -261,4 +274,4 @@
<artifactId>spring-batch-infrastructure</artifactId>
</dependency>
</dependencies>
</project>
</project>
33 changes: 0 additions & 33 deletions ...mmon/src/main/java/io/mosip/authentication/common/service/entity/DataEncryptKeystore.java
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this file deleted? if yes why it is deleted?

This file was deleted.

41 changes: 27 additions & 14 deletions authentication/authentication-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,29 @@
<name>authentication-core</name>
<description>Maven project of MOSIP ID-Authentication Core</description>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.mosip.kernel</groupId>
<artifactId>kernel-bom</artifactId>
<version>${kernel.bom.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>
<!-- Kernel Core -->
<dependency>
<groupId>io.mosip.kernel</groupId>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove the kernel-core dependency.

<artifactId>kernel-core</artifactId>
<version>${kernel-core.version}</version>
<version>${kernel.core.version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
Expand All @@ -35,8 +52,6 @@
</exclusion>
</exclusions>
</dependency>


<!-- Commons Codec -->
<dependency>
<groupId>commons-codec</groupId>
Expand All @@ -61,7 +76,6 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-cache</artifactId>
</dependency>

<!-- Open Source Fingerprint SDK -->
<dependency>
<groupId>com.machinezoo.sourceafis</groupId>
Expand All @@ -74,11 +88,10 @@
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>io.mosip.idrepository</groupId>
<artifactId>id-repository-core</artifactId>
<version>${id-repository-core.version}</version>
<version>${id.repository.core.version}</version>
<exclusions>
<exclusion>
<groupId>io.mosip.kernel</groupId>
Expand All @@ -99,7 +112,7 @@
<dependency>
<groupId>io.mosip.kernel</groupId>
<artifactId>kernel-biosdk-provider</artifactId>
<version>${kernel-biosdk-provider.version}</version>
<version>${kernel.biosdk.provider.version}</version>
<exclusions>
<exclusion>
<groupId>io.mosip.kernel</groupId>
Expand All @@ -114,7 +127,7 @@
<dependency>
<groupId>io.mosip.kernel</groupId>
<artifactId>kernel-demographics-api</artifactId>
<version>${kernel-demoapi.version}</version>
<version>${kernel.demoapi.version}</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
Expand All @@ -135,12 +148,12 @@
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
<version>${springdoc.version}</version>
<version>${springdoc.openapi.starter.webmvc.ui.version}</version>
</dependency>
<dependency>
<groupId>io.mosip.kernel</groupId>
<artifactId>kernel-logger-logback</artifactId>
<version>${kernel-logger-logback.version}</version>
<version>${kernel.logger.logback.version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
Expand All @@ -159,13 +172,13 @@
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-afterburner</artifactId>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-afterburner</artifactId>
</dependency>
<dependency>
<groupId>io.mosip.kernel</groupId>
<artifactId>kernel-biometrics-api</artifactId>
<version>${kernel-biometrics-api.version}</version>
<version>${kernel.biometrics.api.version}</version>
<exclusions>
<exclusion>
<groupId>io.mosip.kernel</groupId>
Expand All @@ -178,4 +191,4 @@
</exclusions>
</dependency>
</dependencies>
</project>
</project>
Loading
Loading