Skip to content

Commit

Permalink
Merge pull request mosip#943 from Sohandey/develop
Browse files Browse the repository at this point in the history 
Develop
  • Loading branch information
@ckm007
ckm007 authored Apr 30, 2024
2 parents b6a7483 + e75ca41 commit 1044645
Show file tree
Hide file tree
Showing 4 changed files with 214 additions and 10 deletions.
210 changes: 207 additions & 3 deletions apitest/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<groupId>io.mosip.idrepo</groupId>
<artifactId>apitest-idrepo</artifactId>
<packaging>jar</packaging>
<name>automationtests-idrepo</name>
<name>apitest-idrepo</name>
<description>Parent project of MOSIP functional tests</description>
<url>https://github.com/mosip/mosip-functional-tests</url>
<version>1.2.0.1-SNAPSHOT</version>
Expand Down Expand Up @@ -169,9 +169,213 @@
<rest.assured.version>3.0.7</rest.assured.version>
<testng.version>6.11</testng.version>
<zt.zip.version>1.13</zt.zip.version>
<fileName>automationtests-commons-1.2.0.1-SNAPSHOT-jar-with-dependencies</fileName>
<fileName>apitests-idrepo-1.2.0.1-SNAPSHOT-jar-with-dependencies</fileName>

</properties>
</properties>
<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>3.5.1</version>
<configuration>
<source>11</source>
<target>11</target>
<argLine>-Dfile.encoding=UTF-8</argLine>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.2.0</version>
<configuration>
<doclint>none</doclint>
</configuration>
</plugin>
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
<version>3.0.1</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>1.5</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>3.2.4</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>2.2.1</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>3.0.0</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>



<dependencies>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion apitest/src/main/resources/idRepository/ReactivateVIDsForUIN/ReactivateVIDsForUIN.yml
View file
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
8 changes: 4 additions & 4 deletions apitest/src/main/resources/idRepository/RetrieveAuthTypeStatus/RetrieveAuthTypeStatus.yml
View file
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"
}
]
}'
4 changes: 2 additions & 2 deletions apitest/src/main/resources/idRepository/UpdateVIDStatus/UpdateVidStatus.yml
View file
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"
}'

0 comments on commit 1044645

Please sign in to comment.