Skip to content

Commit

Permalink
Merge branch 'develop-java21' of https://github.com/mosip/id-repository
Browse files Browse the repository at this point in the history
… into MOSIP-32460-neha-migrate-from-java-11-to-java-21
  • Loading branch information
Neha Farheen committed Jun 4, 2024
2 parents 95859d0 + 9f4c772 commit b42c4ce
Show file tree
Hide file tree
Showing 7 changed files with 244 additions and 14 deletions.
2 changes: 1 addition & 1 deletion apitest/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ WORKDIR /home/${container_user}

ENV work_dir=/home/${container_user}

ADD ./target/ $work_dir
ADD ./apitest/target/ $work_dir

ADD entrypoint.sh $work_dir/entrypoint.sh

Expand Down
2 changes: 1 addition & 1 deletion apitest/entrypoint.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash

## Run automationtests
java -jar -Dmodules="$MODULES" -Denv.user="$ENV_USER" -Denv.endpoint="$ENV_ENDPOINT" -Denv.testLevel="$ENV_TESTLEVEL" automationtests.jar;
java -jar -Dmodules="$MODULES" -Denv.user="$ENV_USER" -Denv.endpoint="$ENV_ENDPOINT" -Denv.testLevel="$ENV_TESTLEVEL" apitest-idrepo-*-jar-with-dependencies.jar;
238 changes: 234 additions & 4 deletions apitest/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,245 @@
<tag>HEAD</tag>
</scm>

<developers>
<developer>
<name>Mosip</name>
<email>[email protected]</email>
<organization>io.mosip</organization>
<organizationUrl>https://github.com/mosip/id-repository</organizationUrl>
</developer>
</developers>

<dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<!-- maven -->
<maven.compiler.target>21</maven.compiler.target>
<maven.compiler.source>21</maven.compiler.source>
<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.gpg.plugin.version>1.5</maven.gpg.plugin.version>
<maven.shade.plugin.version>3.2.4</maven.shade.plugin.version>
<maven.antrun.plugin.version>3.0.0</maven.antrun.plugin.version>
<maven.source.plugin.version>2.2.1</maven.source.plugin.version>

<git.commit.id.plugin.version>3.0.1</git.commit.id.plugin.version>
<fileName>apitest-idrepo-1.2.1-java21-SNAPSHOT-jar-with-dependencies</fileName>
</properties>

<dependencies>
<dependency>
<groupId>io.mosip.testrig.apirig.automationtests.commons</groupId>
<artifactId>apitest-commons</artifactId>
<version>1.2.1-java21-SNAPSHOT</version>
</dependency>

</dependencies>

</project>

<build>
<pluginManagement>
<plugins>
</plugins>
</pluginManagement>

<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
<configuration>
<doclint>none</doclint>
</configuration>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven.compiler.version}</version>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
<argLine>-Dfile.encoding=UTF-8</argLine>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven.javadoc.version}</version>
<configuration>
<doclint>none</doclint>
</configuration>
</plugin>
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
<version>${git.commit.id.plugin.version}</version>
<executions>
<execution>
<id>populate-git-commit-information</id>
<goals>
<goal>revision</goal>
</goals>
<configuration>
<verbose>true</verbose>
<dateFormat>MM/dd/yyyy HH:mm:ss Z</dateFormat>
<abbrevLength>8</abbrevLength>
<generateGitPropertiesFile>true</generateGitPropertiesFile>
<generateGitPropertiesFilename>
${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
</configuration>
</execution>
</executions>
<configuration>
<dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>${maven.gpg.plugin.version}</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
<configuration>
<gpgArguments>
<arg>--pinentry-mode</arg>
<arg>loopback</arg>
</gpgArguments>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>${maven.shade.plugin.version}</version>
<executions>
<execution>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<finalName>${fileName}</finalName>
<transformers>
<!-- need this to merge the services files
properly -->
<transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
<!-- add Main-Class to manifest file -->
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>
io.mosip.testrig.apirig.testrunner.MosipTestRunner</mainClass>
</transformer>
</transformers>
<!-- add this to prevent some security issues when
merging everything together -->
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
</excludes>
</filter>
</filters>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>${maven.jar.plugin.version}</version>
<configuration>
<archive>
<manifest>
<addClasspath>true</addClasspath>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
<manifestEntries>
<Project-Name>${project.name}</Project-Name>
<Project-Version>${project.version}</Project-Version>
<Built-By>${user.name}</Built-By>
<Built-OS>${os.name}</Built-OS>
<Local-Build-Date>${maven.build.timestamp}</Local-Build-Date>
<Build-Number>${env.BUILD_NUMBER}</Build-Number>
<Build-Date>${env.BUILD_ID}</Build-Date>
<Build-URL>${env.BUILD_URL}</Build-URL>
</manifestEntries>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>${maven.war.plugin.version}</version>
<configuration>
<archive>
<manifest>
<addClasspath>true</addClasspath>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
<manifestEntries>
<Project-Name>${project.name}</Project-Name>
<Project-Version>${project.version}</Project-Version>
<Built-By>${user.name}</Built-By>
<Built-OS>${os.name}</Built-OS>
<Local-Build-Date>${maven.build.timestamp}</Local-Build-Date>
<Build-Number>${env.BUILD_NUMBER}</Build-Number>
<Build-Date>${env.BUILD_ID}</Build-Date>
<Build-URL>${env.BUILD_URL}</Build-URL>
</manifestEntries>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>${maven.source.plugin.version}</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>${maven.antrun.plugin.version}</version>
<executions>
<execution>
<id>make-jar-executable</id>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<!-- Create a shell script to run the JAR file
with executable permission -->
<chmod file="${project.build.directory}/*.jar"
perm="ugo+rx" />
</target>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ ReactivateVIDs:
inputTemplate: idRepository/ReactivateVIDsForUIN/reactivateVIDsForUIN
outputTemplate: idRepository/ReactivateVIDsForUIN/reactivateVIDsForUINResult
input: '{
"UIN": "$ID:AddIdentity_For_DeactivateScen_smoke_Pos_UIN$",
"UIN": "$ID:AddIdentity_ValidParam_smoke_Pos_UIN$",
"requesttime": "$TIMESTAMP$",
"id": "mosip.vid.reactivate",
"version": "v1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ RetrieveAuthTypeStatus:
output: '{
"errors": [
{
"errorCode": "IDR-IDC-004"
"errorCode": "IDR-IDC-002"
}
]
}'
Expand Down Expand Up @@ -77,7 +77,7 @@ RetrieveAuthTypeStatus:
output: '{
"errors": [
{
"errorCode": "IDR-IDC-004"
"errorCode": "IDR-IDC-002"
}
]
}'
Expand All @@ -94,7 +94,7 @@ RetrieveAuthTypeStatus:
output: '{
"errors": [
{
"errorCode": "IDR-IDC-004"
"errorCode": "IDR-IDC-002"
}
]
}'
Expand Down Expand Up @@ -128,7 +128,7 @@ RetrieveAuthTypeStatus:
output: '{
"errors": [
{
"errorCode": "IDR-IDC-004"
"errorCode": "IDR-IDC-002"
}
]
}'
Original file line number Diff line number Diff line change
Expand Up @@ -848,12 +848,12 @@ UpdateVidStatus:
inputTemplate: idRepository/UpdateVIDStatus/updateVidStatus
outputTemplate: idRepository/UpdateVIDStatus/UpdateVidStatusResult
input: '{
"vidStatus": "ACTIVATED",
"vidStatus": "ACTIVE",
"id": "mosip.vid.update",
"VID": "$ID:CreateVID_withValidParameters_For_VidType_Smoke_Temporary_sid_VID$",
"version": "v1",
"requesttime": "$TIMESTAMP$"
}'
output: '{
"vidStatus": "ACTIVATED"
"vidStatus": "ACTIVE"
}'
2 changes: 1 addition & 1 deletion apitest/testNgXmlFiles/IdrepositoryApi.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<!-- Passing Group as parmeter unsing "testType" Possible Groups are: smoke
regression smokeAndRegression -->
<listeners>
<listener class-name="io.mosip.testrig.apirig.report.EmailableReport" />
<listener class-name="io.mosip.testrig.apirig.report.EmailableReport"/>
</listeners>


Expand Down

0 comments on commit b42c4ce

Please sign in to comment.