Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MOSIP-35671 -Merging java21 with develop #1593

Merged
merged 23 commits into from
Sep 11, 2024
Merged

MOSIP-35671 -Merging java21 with develop #1593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
4fc80ae
MOSIP-34469 Pulled the latest changes from develop
mohanachandran-s Jul 15, 2024
f3605f5
MOSIP-34469 Pulled the latest changes from develop
mohanachandran-s Jul 15, 2024
345ef73
MOSIP-34469 Pulled the latest changes from develop
mohanachandran-s Jul 16, 2024
012affd
MOSIP-34469 Pulled the latest changes from develop
mohanachandran-s Jul 16, 2024
a866729
MOSIP-34469 Pulled the latest changes from develop
mohanachandran-s Jul 16, 2024
f959e9c
Merge pull request #1525 from mohanachandran-s/develop-java21
Sohandey Jul 16, 2024
70800f8
[DSD-5608]Updated pom.xml (#1540)
Mahesh-Binayak Jul 24, 2024
90d2879
MOSIP-34783 - pulled the develop changes
mohanachandran-s Jul 29, 2024
856c2d8
Merge pull request #1548 from mohanachandran-s/develop-java21
lsivanand Jul 29, 2024
4b11eaa
MOSIP-34942 pulled latest changes from develop to java21 branch
mohanachandran-s Aug 2, 2024
f104dc8
Delete pom.xml
mohanachandran-s Aug 2, 2024
e01f757
Merge pull request #1559 from mohanachandran-s/temp
lsivanand Aug 2, 2024
1ee8ff2
MOSIP-35107 - Updated the biometric details w.r.t mock mds java21
mohanachandran-s Aug 7, 2024
b14bf50
Merge pull request #1560 from mohanachandran-s/develop-java21
lsivanand Aug 7, 2024
5de1ecd
MOSIP-35107 - Updated the biometric details w.r.t mock mds java21
mohanachandran-s Aug 7, 2024
3e41896
Merge pull request #1562 from mohanachandran-s/develop-java21
lsivanand Aug 7, 2024
b58f577
Pulled the latest changes from develop branch to java21 branch
mohanachandran-s Aug 12, 2024
d17433c
Pulled latest changes
mohanachandran-s Aug 14, 2024
96a3f4f
MOSIP-35671 - migrating to java21
mohanachandran-s Sep 10, 2024
e2d4fee
Reverted as per develop
mohanachandran-s Sep 10, 2024
4b60d99
Reverted as per develop
mohanachandran-s Sep 10, 2024
de66d51
MOSIP-35671 - migrating to java21
mohanachandran-s Sep 10, 2024
42433ad
MOSIP-35671 - migrating to java21
mohanachandran-s Sep 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 18 additions & 19 deletions .github/workflows/apitest-push-trigger.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ on:

jobs:
build-maven-apitest-commons:
uses: mosip/kattu/.github/workflows/maven-build.yml@master
uses: mosip/kattu/.github/workflows/maven-build.yml@master-java21
with:
SERVICE_LOCATION: ./apitest-commons
BUILD_ARTIFACT: apitest-commons
Expand All @@ -38,7 +38,7 @@ jobs:
publish_to_nexus:
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-commons
uses: mosip/kattu/.github/workflows/maven-publish-to-nexus.yml@master
uses: mosip/kattu/.github/workflows/maven-publish-to-nexus.yml@master-java21
with:
SERVICE_LOCATION: ./apitest-commons
secrets:
Expand All @@ -49,23 +49,22 @@ jobs:
GPG_SECRET: ${{ secrets.GPG_SECRET }}
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}

# api test commons is not migrated to java 21 so commenting out for now so that auth demo service sonar will work.

# sonar_analysis:
# needs: build-maven-apitest-commons
# if: "${{ github.event_name != 'pull_request' }}"
# uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master
# with:
# SERVICE_LOCATION: ./apitest-commons
# secrets:
# SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
# ORG_KEY: ${{ secrets.ORG_KEY }}
# OSSRH_USER: ${{ secrets.OSSRH_USER }}
# OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }}
# OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
# GPG_SECRET: ${{ secrets.GPG_SECRET }}
# SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}

sonar_analysis:
needs: build-maven-apitest-commons
if: "${{ github.event_name != 'pull_request' }}"
uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master-java21
with:
SERVICE_LOCATION: ./apitest-commons
secrets:
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
ORG_KEY: ${{ secrets.ORG_KEY }}
OSSRH_USER: ${{ secrets.OSSRH_USER }}
OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }}
OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
GPG_SECRET: ${{ secrets.GPG_SECRET }}
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}

build-maven-authentication-demo-service:
uses: mosip/kattu/.github/workflows/maven-build.yml@master-java21
with:
Expand All @@ -91,4 +90,4 @@ jobs:
OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }}
OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
GPG_SECRET: ${{ secrets.GPG_SECRET }}
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
Loading
Loading