Skip to content

Commit

Permalink
[MOSIP-33145] Merge to develop from develop-java21
Browse files Browse the repository at this point in the history 
Signed-off-by: JanardhanBS-SyncByte <[email protected]>
  • Loading branch information
@JanardhanBS-SyncByte
JanardhanBS-SyncByte committed Jun 18, 2024
1 parent c57ee5d commit 6e2974a
Show file tree
Hide file tree
Showing 29 changed files with 2,119 additions and 672 deletions.
8 changes: 7 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
.idea
*/target*
*/logs
*/logs
.metadata/
.sonarlint/
*/.classpath
*/.project
*/.settings/
*/lib/
231 changes: 125 additions & 106 deletions biosdk-services/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,103 +1,68 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<artifactId>biosdk-services</artifactId>
<groupId>io.mosip.biosdk</groupId>
<version>1.2.1-SNAPSHOT</version>
<name>biosdk-services</name>
<licenses>
<license>
<name>MPL 2.0</name>
<url>https://www.mozilla.org/en-US/MPL/2.0/</url>
</license>
</licenses>
<scm>
<connection>scm:git:git://github.com/mosip/biosdk-services.git</connection>
<developerConnection>scm:git:ssh://github.com:mosip/biosdk-services.git</developerConnection>
<url>https://github.com/mosip/biosdk-services</url>
<tag>HEAD</tag>
</scm>
<developers>
<developer>
<name>Mosip</name>
<email>[email protected]</email>
<organization>io.mosip</organization>
<organizationUrl>https://mosip.io</organizationUrl>
</developer>
</developers>
<description>Sample implementation of biometrics SDK services</description>
<url>https://github.com/mosip/mosip-ref-impl</url>
<url>https://github.com/mosip/biosdk-services</url>

<properties>
<java.version>11</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>21</java.version>

<!-- maven -->
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<!-- Core -->
<spring.boot.version>2.0.2.RELEASE</spring.boot.version>
<spring-cloud-config.version>2.0.2.RELEASE</spring-cloud-config.version>
<maven.surefire.plugin.version>2.22.0</maven.surefire.plugin.version>
<maven.jacoco.plugin.version>0.8.5</maven.jacoco.plugin.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<maven.compiler.version>3.11.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.plugin.version>3.2.0</maven.javadoc.plugin.version>
<maven.shade.plugin.version>2.3</maven.shade.plugin.version>
<jacoco.maven.plugin.version>0.8.11</jacoco.maven.plugin.version>
<maven.deploy.plugin.version>3.1.1</maven.deploy.plugin.version>
<maven.source.plugin.version>3.3.1</maven.source.plugin.version>
<maven.gpg.plugin.version>3.2.3</maven.gpg.plugin.version>
<maven.jar.plugin.version>3.0.2</maven.jar.plugin.version>
<maven.war.plugin.version>3.1.0</maven.war.plugin.version>
<maven.assembly.plugin.version>3.3.0</maven.assembly.plugin.version>
<maven.surefire.plugin.version>3.1.2</maven.surefire.plugin.version>
<spring.boot.maven.plugin.version>3.2.5</spring.boot.maven.plugin.version>
<nexus.staging.maven.plugin.version>1.6.7</nexus.staging.maven.plugin.version>
<maven.sonar.plugin.version>3.7.0.1746</maven.sonar.plugin.version>

<!-- Lombok -->
<lombok.version>1.18.8</lombok.version>
<!-- git -->
<git.commit.id.plugin.version>3.0.1</git.commit.id.plugin.version>

<!-- Swagger -->
<swagger.version>2.9.2</swagger.version>
<springdoc.openapi.starter.webmvc.ui.version>2.5.0</springdoc.openapi.starter.webmvc.ui.version>

<!-- Mosip kernel -->
<kernel.biometrics.api.version>1.2.0.1-B2</kernel.biometrics.api.version>
<kernel.logger.logback.version>1.2.0.1-B1</kernel.logger.logback.version>
<kernel.core.version>1.2.0.1-B1</kernel.core.version>
<!-- Spring -->
<spring.boot.version>2.0.2.RELEASE</spring.boot.version>
<kernel.bom.version>1.2.1-SNAPSHOT</kernel.bom.version>
<kernel.core.version>1.2.1-SNAPSHOT</kernel.core.version>
<kernel.biometrics.api.version>1.2.1-SNAPSHOT</kernel.biometrics.api.version>
<kernel.logger.logback.version>1.2.1-SNAPSHOT</kernel.logger.logback.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring.boot.version}</version>
<groupId>io.mosip.kernel</groupId>
<artifactId>kernel-bom</artifactId>
<version>${kernel.bom.version}</version>
<type>pom</type>
<scope>import</scope>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-json</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.11.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.11.0</version>
</dependency>
</dependencies>
</dependencyManagement>


<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-config</artifactId>
<version>${spring-cloud-config.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>${spring.boot.version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
Expand All @@ -106,26 +71,21 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
<version>${spring.boot.version}</version>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-commons</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
<version>${spring.boot.version}</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>${swagger.version}</version>
<scope>compile</scope>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
<version>${swagger.version}</version>
<scope>compile</scope>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
<version>${springdoc.openapi.starter.webmvc.ui.version}</version>
</dependency>
<dependency>
<groupId>io.mosip.kernel</groupId>
Expand All @@ -145,28 +105,49 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
<scope>compile</scope>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.6</version>
</dependency>

<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven.compiler.version}</version>
<configuration>
<release>${java.version}</release>
<compilerArgs>
<arg>--enable-preview</arg>
<arg>-Xlint:unchecked</arg>
<arg>-Xlint:deprecation</arg>
</compilerArgs>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.5</version>
<version>${maven.gpg.plugin.version}</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand All @@ -191,16 +172,25 @@
<skipTests>${skipTests}</skipTests>
<skip>false</skip>
<argLine>
${argLine} --add-opens
java.xml/jdk.xml.internal=ALL-UNNAMED
--illegal-access=permit
${argLine}
--add-modules=ALL-SYSTEM
--add-opens java.xml/jdk.xml.internal=ALL-UNNAMED
--add-opens java.base/java.lang.reflect=ALL-UNNAMED
--add-opens java.base/java.lang.stream=ALL-UNNAMED
--add-opens java.base/java.time=ALL-UNNAMED
--add-opens java.base/java.time.LocalDate=ALL-UNNAMED
--add-opens
java.base/java.time.LocalDateTime=ALL-UNNAMED
--add-opens
java.base/java.time.LocalDateTime.date=ALL-UNNAMED
--enable-preview
</argLine>
</configuration>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>${maven.jacoco.plugin.version}</version>
<version>${jacoco.maven.plugin.version}</version>
<executions>
<execution>
<goals>
Expand All @@ -216,42 +206,47 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>${spring.boot.version}</version>
<version>${spring.boot.maven.plugin.version}</version>
<configuration>
<layout>ZIP</layout>
<executable>true</executable>
<jvmArguments>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
<!-- -Dspring.application.admin.enabled=true-->
</jvmArguments>
</configuration>

<executions>
<execution>
<goals>
<goal>build-info</goal>
<goal>repackage</goal>
</goals>
</execution>
<!--
<execution>
<id>pre-integration-test</id>
<goals>
<goal>start</goal>
</goals>
</execution>
<execution>
<id>post-integration-test</id>
<goals>
<goal>stop</goal>
</goals>
</execution>-->
</executions>

</plugin>

<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
<version>3.0.1</version>
<version>${git.commit.id.plugin.version}</version>
<executions>
<execution>
<id>get-the-git-infos</id>
Expand All @@ -263,18 +258,19 @@
</executions>
<configuration>
<generateGitPropertiesFile>true</generateGitPropertiesFile>
<generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
<generateGitPropertiesFilename>
${project.build.outputDirectory}/service-git.properties</generateGitPropertiesFilename>
<includeOnlyProperties>
<includeOnlyProperty>^git.build.(time|version)$</includeOnlyProperty>
<includeOnlyProperty>^git.commit.id.(abbrev|full)$</includeOnlyProperty>
</includeOnlyProperties>
<commitIdGenerationMode>full</commitIdGenerationMode>
<dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
<!-- <format>json</format> -->
</configuration>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>sonar</id>
Expand Down Expand Up @@ -306,4 +302,27 @@
</build>
</profile>
</profiles>

<licenses>
<license>
<name>MPL 2.0</name>
<url>https://www.mozilla.org/en-US/MPL/2.0/</url>
</license>
</licenses>

<scm>
<connection>scm:git:git://github.com/mosip/biosdk-services.git</connection>
<developerConnection>scm:git:ssh://github.com:mosip/biosdk-services.git</developerConnection>
<url>https://github.com/mosip/biosdk-services</url>
<tag>HEAD</tag>
</scm>

<developers>
<developer>
<name>Mosip</name>
<email>[email protected]</email>
<organization>io.mosip</organization>
<organizationUrl>https://mosip.io</organizationUrl>
</developer>
</developers>
</project>
Loading

0 comments on commit 6e2974a

Please sign in to comment.