diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..00930379 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,9 @@ + +version: 2 +updates: + - package-ecosystem: "npm" + directory: "/admin-ui" + schedule: + interval: "daily" + target-branch: "develop" + open-pull-requests-limit: 50 diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml index 97fefe00..a7c2fad8 100644 --- a/.github/workflows/push-trigger.yml +++ b/.github/workflows/push-trigger.yml @@ -119,9 +119,9 @@ jobs: ## FIND JARS & COPY ONLY EXECUTABLE JARs STORED UNDER TARGET DIRECTORY find ${{ env.SERVICE_LOCATION }} -path '*/target/*' -name '*.jar' -type f -exec zip ${{ env.BUILD_ARTIFACT }}.zip {} + - - name: Upload the springboot jars + - name: upload the springboot jars if: ${{ !contains(github.ref, 'master') || !contains(github.ref, 'main') }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.BUILD_ARTIFACT }} path: ${{ env.BUILD_ARTIFACT }}.zip @@ -171,4 +171,4 @@ jobs: OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} GPG_SECRET: ${{ secrets.GPG_SECRET }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} \ No newline at end of file + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} diff --git a/README.md b/README.md index 78362833..5c7b8632 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Admin Portal -[![Maven Package upon a push](https://github.com/mosip/keymanager/actions/workflows/push_trigger.yml/badge.svg?branch=release-1.2.0.1)](https://github.com/mosip/admin-ui/actions/workflows/push_trigger.yml) -[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?branch=release-1.2.0.1&project=mosip_admin-ui&metric=alert_status)](https://sonarcloud.io/dashboard?branch=release-1.2.0.1&id=mosip_admin-ui) +[![Maven Package upon a push](https://github.com/mosip/keymanager/actions/workflows/push-trigger.yml/badge.svg?branch=master)](https://github.com/mosip/admin-ui/actions/workflows/push-trigger.yml) +[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?branch=master&project=mosip_admin-ui&metric=alert_status)](https://sonarcloud.io/dashboard?branch=master&id=mosip_admin-ui) ## Overview See [overview and portal user guide](https://docs.mosip.io/1.2.0/modules/administration/admin-portal-user-guide). diff --git a/admintest/pom.xml b/admintest/pom.xml index 64306597..72d319f6 100644 --- a/admintest/pom.xml +++ b/admintest/pom.xml @@ -401,7 +401,7 @@ ch.qos.logback logback-core - 1.2.6 + 1.3.16 org.slf4j