diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml
index 1fbfc3c6..da738a7c 100644
--- a/.github/workflows/push-trigger.yml
+++ b/.github/workflows/push-trigger.yml
@@ -67,7 +67,7 @@ jobs:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
build-maven-uitest-admin:
- uses: mosip/kattu/.github/workflows/maven-build.yml@master
+ uses: mosip/kattu/.github/workflows/maven-build.yml@master-java21
with:
SERVICE_LOCATION: ./uitest-admin
BUILD_ARTIFACT: uitest-admin
@@ -87,12 +87,12 @@ jobs:
SERVICE_LOCATION: uitest-admin
BUILD_ARTIFACT: uitest-admin-local
steps:
- - uses: actions/checkout@v2
- - name: Set up JDK 11
- uses: actions/setup-java@v1
+ - uses: actions/checkout@v3
+ - name: Set up JDK 21
+ uses: actions/setup-java@v3
with:
- ref: ${{ github.ref }}
- java-version: 11
+ distribution: 'temurin'
+ java-version: 21
server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml
settings-path: ${{ github.workspace }} # location for the settings.xml file
@@ -145,7 +145,7 @@ jobs:
BUILD_ARTIFACT: 'uitest-admin-local'
fail-fast: false
name: ${{ matrix.SERVICE_NAME }}
- uses: mosip/kattu/.github/workflows/docker-build.yml@master
+ uses: mosip/kattu/.github/workflows/docker-build.yml@master-java21
with:
SERVICE_LOCATION: ${{ matrix.SERVICE_LOCATION }}
SERVICE_NAME: ${{ matrix.SERVICE_NAME }}
@@ -159,7 +159,7 @@ jobs:
sonar-analysis-uitest-admin:
needs: build-uitest-admin-local
if: "${{ github.event_name != 'pull_request' }}"
- uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master
+ uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master-java21
with:
SERVICE_LOCATION: uitest-admin
SONAR_URL: 'https://sonarcloud.io'
diff --git a/uitest-admin/pom.xml b/uitest-admin/pom.xml
index 2181c59b..0923ff45 100644
--- a/uitest-admin/pom.xml
+++ b/uitest-admin/pom.xml
@@ -1,175 +1,35 @@
- 4.0.0
- io.mosip.testrig.adminui
- adminui
- 1.2.1
- admin-ui-automation
- admin-ui-automation
- https://github.com/mosip/admin-ui
-
-
-
- MPL 2.0
- https://www.mozilla.org/en-US/MPL/2.0/
-
-
-
- scm:git:git://github.com/mosip/admin-ui.git
- scm:git:ssh://github.com:mosip/admin-ui.git
- https://github.com/mosip/admin-ui
- HEAD
-
+ 4.0.0
+ io.mosip.testrig.adminui
+ uitest-admin
+ 1.2.1-SNAPSHOT
+ uitest-admin
+ Parent project of uitest-admin
+ https://github.com/mosip/admin-ui
+
+
+
+ MPL 2.0
+ https://www.mozilla.org/en-US/MPL/2.0/
+
+
+
+ scm:git:git://github.com/mosip/admin-ui.git
+ scm:git:ssh://github.com:mosip/admin-ui.git
+ https://github.com/mosip/admin-ui
+ HEAD
+
-
- Mosip
- mosip.emailnotifier@gmail.com
- io.mosip
- https://github.com/mosip/admin-ui
-
-
-
-
- UTF-8
-
-
- 11
- 11
- 3.7.0
- 3.0.2
- 3.1.0
- 2.9
- 0.8.1
- 3.2
- 3.0.1
- 2.3
- true
- 3.7.0.1746
-
- 2.0.2.RELEASE
- 2.0.7.RELEASE
- 5.0.5.RELEASE
- 2.0.0.RELEASE
-
- 2.0.7
- 1.5.20
- 2.9.2
-
- 3.6.2
- 3.7.0
-
-
-
- 1.2
- 3.0.0
- 1.3
- 2.2
- 2.0.1.Final
- 2.2.6
-
-
- 1.4.197
- 5.1.46
- 42.2.2
- 2.5.0
- 6.0.12.Final
-
-
- 1.10.19
- 1.7.4
- 2.0.0-beta.5
-
-
- 1.2.3
- 1.7.19
- 2.16.0
- 1.7.25
-
-
- 2.9.5
- 20180130
- 2.2.10
- 20180130
-
-
- 3.6.1
- 3.7
- 2.6
- 1.11
- 4.3
- 1.9.2
- 2.2
- 4.5.6
- 19.0
- 1.18.8
- 0.1.54
- 1.4.0
- 7.1.0
- 2.0.0
- 5.5.13
- 2.3.23
- 1.7
- 2.0
- 1.5.2
- 2.1.1
- 1.60
- 63.1
- 1.0.0
- 3.3.3
- 2.8.1
- 4.1.0-incubating
- 1.11.368
- 0.2.4
- 2.3.0
- 3.0.1
- 1.9.12
- 0.6.0
- 2.0.0.AM2
-
-
-
-
-
-
-
- 0.8.2
- 2.2
- 3.2
- UTF-8
- 3.7.0
- 3.0.1
-
-
- 1.1.6
- 1.7.19
- 1.10.19
-
-
- 1.4.6
-
-
- 5.0.6.RELEASE
-
-
- 5.4.2.Final
-
-
- 2.1.1
-
-
- 10.13.1.1
-
-
- 3.4.0
-
-
- 1.3.5
-
-
- 0.3.12
-
-
- 0.3.0
-
+
+ Mosip
+ mosip.emailnotifier@gmail.com
+ io.mosip
+ https://github.com/mosip/admin-ui
+
+
+
+ 31.1-jre
+ 7.10.1
1.1.2-incubating
1.2.0.1
@@ -183,13 +43,166 @@
1.13
adminui-1.2.1-SNAPSHOT-jar-with-dependencies
+
+ 21
+ 21
+ 3.8.0
+ 3.0.2
+ 3.1.0
+ 3.7.0.1746
-
-
-
+
+
+
+
+ io.mosip.kernel
+ kernel-bom
+ 1.2.1-SNAPSHOT
+ pom
+ import
+
+
+
+
+
+ org.seleniumhq.selenium
+ selenium-java
+
+
+ org.json
+ json
+
+
+ com.aventstack
+ extentreports
+ 5.0.9
+
+
+ io.github.bonigarcia
+ webdrivermanager
+ 5.8.0
+
+
+ org.testng
+ testng
+ ${testng.version}
+
+
+ io.minio
+ minio
+ 8.4.3
+
+
+ org.postgresql
+ postgresql
+
+
+ org.hibernate
+ hibernate-core
+ 5.6.7.Final
+
+
+ io.rest-assured
+ rest-assured
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ org.keycloak
+ keycloak-admin-client
+ 17.0.1
+
+
+ commons-beanutils
+ commons-beanutils
+ 1.9.4
+
+
+ com.googlecode.json-simple
+ json-simple
+
+
+ commons-lang
+ commons-lang
+ 2.6
+
+
+ com.amazonaws
+ aws-java-sdk-s3
+ 1.12.470
+
+
+ com.google.guava
+ guava
+ ${guava.version}
+
+
+ com.fasterxml.jackson.core
+ jackson-core
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+
+
+
+ org.awaitility
+ awaitility
+
+
+ ch.qos.logback
+ logback-core
+
+
+ org.slf4j
+ slf4j-api
+
+
+ ch.qos.logback
+ logback-classic
+
+
+ com.paulhammant
+ ngwebdriver
+ 1.1.5
+
+
+ commons-io
+ commons-io
+
+
+ org.jboss.resteasy
+ resteasy-jaxrs
+ 3.15.0.Final
+
+
+ junit
+ junit
+ test
+
+
+ org.apache.logging.log4j
+ log4j-api
+
+
+ javax.ws.rs
+ javax.ws.rs-api
+ 2.1.1
+
+
+ org.apache.commons
+ commons-collections4
+
+
+ javax.validation
+ validation-api
+
+
+
-
-
+
@@ -213,40 +226,15 @@
- pl.project13.maven
- git-commit-id-plugin
- 3.0.1
-
-
- get-the-git-infos
-
- revision
-
- validate
-
-
-
- true
- ${project.build.outputDirectory}/git.properties
-
- ^git.build.(time|version)$
- ^git.commit.id.(abbrev|full)$
-
- full
- ${project.basedir}/.git
-
-
-
-
+ org.apache.maven.plugins
maven-compiler-plugin
- 3.5.1
+ ${maven.compiler.version}
-
- 11
+
+ ${maven.compiler.target}
-Dfile.encoding=UTF-8
-
org.apache.maven.plugins
maven-antrun-plugin
@@ -261,283 +249,69 @@
-
+
-
- pl.project13.maven
- git-commit-id-plugin
- 3.0.1
-
-
- populate-git-commit-information
-
- revision
-
-
- true
- MM/dd/yyyy HH:mm:ss Z
- 8
- true
- ${project.build.outputDirectory}/git.properties
-
-
-
-
- ${project.basedir}/.git
-
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-shade-plugin
- 3.2.4
-
-
-
- shade
-
-
- ${fileName}
-
-
-
-
-
- io.mosip.testrig.adminui.utility.TestRunner
-
-
-
-
-
- *:*
-
- META-INF/*.SF
- META-INF/*.DSA
- META-INF/*.RSA
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- org.seleniumhq.selenium
- selenium-java
- 3.141.59
-
-
-
-
-
- org.json
- json
- 20210307
-
-
-
-
- com.fasterxml.jackson.core
- jackson-core
- 2.12.5
-
-
-
- com.fasterxml.jackson.core
- jackson-databind
- 2.12.5
-
-
-
-
-
- org.awaitility
- awaitility
- 4.0.3
-
-
- ch.qos.logback
- logback-core
- 1.2.6
-
-
- org.slf4j
- slf4j-api
- 1.7.30
-
-
-
-
- ch.qos.logback
- logback-classic
- 1.2.6
-
-
- com.paulhammant
- ngwebdriver
- 1.1.5
-
-
-
-
-
-
-
-
-
- io.github.bonigarcia
- webdrivermanager
- 5.2.0
-
-
-
- org.testng
- testng
- 7.1.0
-
-
-
-
-
- commons-io
- commons-io
- 2.6
-
-
-
- org.jboss.resteasy
- resteasy-jaxrs
- 3.15.0.Final
-
-
-
- io.minio
- minio
- 8.4.3
-
-
-
- org.postgresql
- postgresql
- 42.6.0
-
-
- org.hibernate
- hibernate-core
- 5.6.7.Final
-
-
-
-
-
- junit
- junit
- 3.8.1
- test
-
-
-
- io.rest-assured
- rest-assured
- 5.3.0
-
-
- org.apache.logging.log4j
- log4j-api
- 2.11.1
-
-
- org.slf4j
- slf4j-log4j12
- 1.6.2
-
-
- javax.ws.rs
- javax.ws.rs-api
- 2.1.1
-
-
- org.json
- json
- 20230227
-
-
- org.keycloak
- keycloak-admin-client
- 17.0.1
-
-
- commons-beanutils
- commons-beanutils
- 1.9.4
-
-
- com.googlecode.json-simple
- json-simple
- 1.1.1
-
-
- org.apache.commons
- commons-collections4
- 4.4
-
-
- commons-lang
- commons-lang
- 2.6
-
-
-
- com.amazonaws
- aws-java-sdk-s3
- 1.12.470
-
-
-
-
-
-
+
+
+ org.apache.maven.plugins
+ maven-shade-plugin
+ 3.2.4
+
+
+
+ shade
+
+
+ ${fileName}
+
+
+
+
+
+ io.mosip.testrig.adminui.utility.TestRunner
+
+
+
+
+
+ *:*
+
+ META-INF/*.SF
+ META-INF/*.DSA
+ META-INF/*.RSA
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file