Merge pull request #708 from mohanachandran-s/release-1.3.x

MOSIP-34948 - reverted to java11

.github/workflows/push-trigger.yml

@@ -94,7 +94,7 @@ jobs:
       SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
 
   build-maven-apitest-prereg:
-    uses: mosip/kattu/.github/workflows/maven-build.yml@master-java21
+    uses: mosip/kattu/.github/workflows/maven-build.yml@master
     with:
       SERVICE_LOCATION: ./apitest
       BUILD_ARTIFACT: apitest-prereg
@@ -108,7 +108,7 @@ jobs:
   publish_to_nexus_apitest_prereg:
     if: "${{ !contains(github.ref, 'master') && github.event_name != 'pull_request' && github.event_name != 'release' && github.event_name != 'prerelease' && github.event_name != 'publish' }}"
     needs: build-maven-apitest-prereg
-    uses: mosip/kattu/.github/workflows/maven-publish-to-nexus.yml@master-java21
+    uses: mosip/kattu/.github/workflows/maven-publish-to-nexus.yml@master
     with:
       SERVICE_LOCATION: ./apitest
     secrets:
@@ -128,12 +128,12 @@ jobs:
       SERVICE_LOCATION: apitest
       BUILD_ARTIFACT: apitest-prereg-local
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 21
-        uses: actions/setup-java@v3
+      - uses: actions/checkout@v2
+      - name: Set up JDK 11
+        uses: actions/setup-java@v1
         with:
-          distribution: 'temurin'
-          java-version: '21'
+          ref: ${{ github.ref }}
+          java-version: '11'
           server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml
           settings-path: ${{ github.workspace }} # location for the settings.xml file
       - name: Setup the settings file for ossrh server
@@ -176,7 +176,7 @@ jobs:
             ONLY_DOCKER: true
       fail-fast: false
     name: ${{ matrix.SERVICE_NAME }}
-    uses: mosip/kattu/.github/workflows/docker-build.yml@master-java21
+    uses: mosip/kattu/.github/workflows/docker-build.yml@master
     with:
       SERVICE_LOCATION: ${{ matrix.SERVICE_LOCATION }}
       SERVICE_NAME: ${{ matrix.SERVICE_NAME }}
@@ -191,7 +191,7 @@ jobs:
   sonar_analysis_apitest_prereg:
     needs: build-maven-apitest-prereg
     if: "${{  github.event_name != 'pull_request' }}"
-    uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master-java21
+    uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master
     with:
       SERVICE_LOCATION: ./apitest
     secrets:

apitest/Dockerfile

@@ -1,4 +1,4 @@
-FROM mosipdev/openjdk-21-jre:latest
+FROM openjdk:11
 
 ARG SOURCE
 ARG COMMIT_HASH
@@ -23,6 +23,15 @@ ARG container_user_gid=1001
 
 ARG KUBECTL_VERSION=1.22.9
 
+# install packages and create user
+RUN apt-get -y update \
+&& apt-get install -y unzip jq \
+&& groupadd -g ${container_user_gid} ${container_user_group} \
+&& useradd -u ${container_user_uid} -g ${container_user_group} -s /bin/sh -m ${container_user} \
+&& curl -LO "https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl" \
+&& chmod +x kubectl \
+&& mv kubectl /usr/local/bin/
+
 # set working directory for the user
 WORKDIR /home/${container_user}
 
@@ -32,17 +41,14 @@ ADD ./apitest/target/ $work_dir
 
 ADD entrypoint.sh $work_dir/entrypoint.sh
 
-# install packages and create user
-RUN apt-get -y update \
-&& apt-get install -y unzip jq curl \
-&& groupadd -g ${container_user_gid} ${container_user_group} \
-&& useradd -u ${container_user_uid} -g ${container_user_group} -s /bin/bash -m ${container_user} \
-&& curl -LO "https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl" \
-&& mkdir -p /home/${container_user} \
-&& chmod +x kubectl $work_dir/entrypoint.sh \
-&& mv kubectl /usr/local/bin/ \
-&& chown -R ${container_user}:${container_user} /home/${container_user} /etc/ssl/certs/java/cacerts \
-&& chmod 644 /etc/ssl/certs/java/cacerts
+RUN chmod +x $work_dir/entrypoint.sh
+
+#ADD ./testNgXmlFiles/ $work_dir/testNgXmlFiles/
+
+# change permissions of file inside working dir
+RUN chown -R ${container_user}:${container_user} /home/${container_user} /usr/local/openjdk-11/lib/security/cacerts
+
+RUN chmod 644 /usr/local/openjdk-11/lib/security/cacerts
 
 # select container user for all tasks
 USER ${container_user_uid}:${container_user_gid}

apitest/pom.xml

@@ -8,7 +8,7 @@
 	<name>apitest-prereg</name>
 	<description>Parent project of MOSIP Pre-Registration apitests</description>
 	<url>https://github.com/mosip/pre-registration</url>
-	<version>1.2.1-java21-SNAPSHOT</version>
+	<version>1.2.1-SNAPSHOT</version>
 
 	<licenses>
 		<license>
@@ -37,8 +37,8 @@
 		<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.target>11</maven.compiler.target>
+		<maven.compiler.source>11</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>
@@ -49,14 +49,14 @@
 		<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-prereg-1.2.1-java21-SNAPSHOT-jar-with-dependencies</fileName>
+		<fileName>apitest-prereg-1.2.1-SNAPSHOT-jar-with-dependencies</fileName>
 	</properties>
 
 	<dependencies>
 		<dependency>
 			<groupId>io.mosip.testrig.apirig.apitest.commons</groupId>
 			<artifactId>apitest-commons</artifactId>
-			<version>1.2.1-java21-SNAPSHOT</version>
+			<version>1.2.1-SNAPSHOT</version>
 		</dependency>
 	</dependencies>