From 2e65a9240d52b060e0d306edb593fdd812f83255 Mon Sep 17 00:00:00 2001 From: "stjepan.cvitanovic" Date: Thu, 20 Mar 2025 15:36:03 +0100 Subject: [PATCH 1/7] Update .github/workflows/maven-publish.yml --- .github/workflows/maven-publish.yml | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 81f04c4..e137240 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -68,13 +68,24 @@ jobs: GROUP_ID=$(mvn help:evaluate -Dexpression="project.groupId" -q -DforceStdout) ARTIFACT_ID=$(mvn help:evaluate -Dexpression="project.artifactId" -q -DforceStdout) VERSION=$(mvn help:evaluate -Dexpression="project.version" -q -DforceStdout) + PACKAGING=$(mvn help:evaluate -Dexpression="project.packaging" -q -DforceStdout) echo "Uploading artifact for $GROUP_ID:$ARTIFACT_ID:$VERSION" - mvn deploy:deploy-file \ - -Durl=https://devops.pravilanovait.hr/nexus/repository/maven-snapshots \ - -Dpackaging=jar -DgroupId=$GROUP_ID -DartifactId=$ARTIFACT_ID \ - -Dversion=$VERSION -DrepositoryId=local-nexus \ - -Dfile=target/$ARTIFACT_ID-$VERSION.jar -# curl --request DELETE --user "admin:$NEXUS_ADMIN_PASSWORD" https://devops.pravilanovait.hr/nexus/service/rest/v1/repositories/maven/proxy/amazon-codeartifact/content/$GROUP_ID/$ARTIFACT_ID/$VERSION/$ARTIFACT_ID-$VERSION.jar -# curl --request POST --user "admin:$NEXUS_ADMIN_PASSWORD" https://devops.pravilanovait.hr/nexus/service/rest/v1/repositories/maven/proxy/amazon-codeartifact/invalidate-cache + if [ $PACKAGING == "pom" ]; + then + echo "Packaging is pom, uploading pom.xml" + mvn deploy:deploy-file \ + -Durl=https://devops.pravilanovait.hr/nexus/repository/maven-snapshots \ + -Dpackaging=pom -DgroupId=$GROUP_ID -DartifactId=$ARTIFACT_ID \ + -Dversion=$VERSION -DrepositoryId=local-nexus \ + -Dfile=pom.xml + else + echo "Packaging is $PACKAGING, uploading target/$ARTIFACT_ID-$VERSION.$PACKAGING" + mvn deploy:deploy-file \ + -Durl=https://devops.pravilanovait.hr/nexus/repository/maven-snapshots \ + -Dpackaging=$PACKAGING -DgroupId=$GROUP_ID -DartifactId=$ARTIFACT_ID \ + -Dversion=$VERSION -DrepositoryId=local-nexus \ + -Dfile=target/$ARTIFACT_ID-$VERSION.$PACKAGING + fi + env: NEXUS_ADMIN_PASSWORD: ${{ secrets.NEXUS_ADMIN_PASSWORD }} From 6819eb56f49eae5b79d85203f84dbacbc595865d Mon Sep 17 00:00:00 2001 From: "stjepan.cvitanovic" Date: Thu, 20 Mar 2025 15:45:41 +0100 Subject: [PATCH 2/7] Update .github/workflows/maven-publish.yml --- .github/workflows/maven-publish.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index e137240..3319765 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -72,19 +72,19 @@ jobs: echo "Uploading artifact for $GROUP_ID:$ARTIFACT_ID:$VERSION" if [ $PACKAGING == "pom" ]; then - echo "Packaging is pom, uploading pom.xml" - mvn deploy:deploy-file \ - -Durl=https://devops.pravilanovait.hr/nexus/repository/maven-snapshots \ - -Dpackaging=pom -DgroupId=$GROUP_ID -DartifactId=$ARTIFACT_ID \ - -Dversion=$VERSION -DrepositoryId=local-nexus \ - -Dfile=pom.xml + echo "Packaging is pom, uploading pom.xml" + mvn deploy:deploy-file \ + -Durl=https://devops.pravilanovait.hr/nexus/repository/maven-snapshots \ + -Dpackaging=pom -DgroupId=$GROUP_ID -DartifactId=$ARTIFACT_ID \ + -Dversion=$VERSION -DrepositoryId=local-nexus \ + -Dfile=pom.xml else - echo "Packaging is $PACKAGING, uploading target/$ARTIFACT_ID-$VERSION.$PACKAGING" - mvn deploy:deploy-file \ - -Durl=https://devops.pravilanovait.hr/nexus/repository/maven-snapshots \ - -Dpackaging=$PACKAGING -DgroupId=$GROUP_ID -DartifactId=$ARTIFACT_ID \ - -Dversion=$VERSION -DrepositoryId=local-nexus \ - -Dfile=target/$ARTIFACT_ID-$VERSION.$PACKAGING + echo "Packaging is $PACKAGING, uploading target/$ARTIFACT_ID-$VERSION.$PACKAGING" + mvn deploy:deploy-file \ + -Durl=https://devops.pravilanovait.hr/nexus/repository/maven-snapshots \ + -Dpackaging=$PACKAGING -DgroupId=$GROUP_ID -DartifactId=$ARTIFACT_ID \ + -Dversion=$VERSION -DrepositoryId=local-nexus \ + -Dfile=target/$ARTIFACT_ID-$VERSION.$PACKAGING fi env: From b2206217eda095bd1dfd4ad842b0e069fe818a10 Mon Sep 17 00:00:00 2001 From: "stjepan.cvitanovic" Date: Fri, 21 Mar 2025 11:20:50 +0100 Subject: [PATCH 3/7] Update .github/workflows/maven-publish.yml --- .github/workflows/maven-publish.yml | 37 ++++++++++++++++------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 3319765..abbd188 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -63,28 +63,33 @@ jobs: CODEARTIFACT_AUTH_TOKEN: ${{ secrets.AWS_CA_TOKEN }} - name: Upload snapshot to nexus - if: github.ref != 'refs/heads/feature/T2900-java21' run: | GROUP_ID=$(mvn help:evaluate -Dexpression="project.groupId" -q -DforceStdout) ARTIFACT_ID=$(mvn help:evaluate -Dexpression="project.artifactId" -q -DforceStdout) VERSION=$(mvn help:evaluate -Dexpression="project.version" -q -DforceStdout) - PACKAGING=$(mvn help:evaluate -Dexpression="project.packaging" -q -DforceStdout) - echo "Uploading artifact for $GROUP_ID:$ARTIFACT_ID:$VERSION" - if [ $PACKAGING == "pom" ]; + if [ $VERSION == *-SNAPSHOT ]; then - echo "Packaging is pom, uploading pom.xml" - mvn deploy:deploy-file \ - -Durl=https://devops.pravilanovait.hr/nexus/repository/maven-snapshots \ - -Dpackaging=pom -DgroupId=$GROUP_ID -DartifactId=$ARTIFACT_ID \ - -Dversion=$VERSION -DrepositoryId=local-nexus \ - -Dfile=pom.xml + echo "Version is snapshot version, proceeding with upload to local-nexus snapshots" + PACKAGING=$(mvn help:evaluate -Dexpression="project.packaging" -q -DforceStdout) + echo "Uploading artifact for $GROUP_ID:$ARTIFACT_ID:$VERSION" + if [ $PACKAGING == "pom" ]; + then + echo "Packaging is pom, uploading pom.xml" + mvn deploy:deploy-file \ + -Durl=https://devops.pravilanovait.hr/nexus/repository/maven-snapshots \ + -Dpackaging=pom -DgroupId=$GROUP_ID -DartifactId=$ARTIFACT_ID \ + -Dversion=$VERSION -DrepositoryId=local-nexus \ + -Dfile=pom.xml + else + echo "Packaging is $PACKAGING, uploading target/$ARTIFACT_ID-$VERSION.$PACKAGING" + mvn deploy:deploy-file \ + -Durl=https://devops.pravilanovait.hr/nexus/repository/maven-snapshots \ + -Dpackaging=$PACKAGING -DgroupId=$GROUP_ID -DartifactId=$ARTIFACT_ID \ + -Dversion=$VERSION -DrepositoryId=local-nexus \ + -Dfile=target/$ARTIFACT_ID-$VERSION.$PACKAGING + fi else - echo "Packaging is $PACKAGING, uploading target/$ARTIFACT_ID-$VERSION.$PACKAGING" - mvn deploy:deploy-file \ - -Durl=https://devops.pravilanovait.hr/nexus/repository/maven-snapshots \ - -Dpackaging=$PACKAGING -DgroupId=$GROUP_ID -DartifactId=$ARTIFACT_ID \ - -Dversion=$VERSION -DrepositoryId=local-nexus \ - -Dfile=target/$ARTIFACT_ID-$VERSION.$PACKAGING + echo "Version is not snapshot version, not uploading to local-nexus snapshots" fi env: From f11e42863fd9a53700d7f0f19482254e1df9ac60 Mon Sep 17 00:00:00 2001 From: "stjepan.cvitanovic" Date: Fri, 21 Mar 2025 11:23:37 +0100 Subject: [PATCH 4/7] Update .github/workflows/maven-publish.yml --- .github/workflows/maven-publish.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index abbd188..8ff10a4 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -67,9 +67,9 @@ jobs: GROUP_ID=$(mvn help:evaluate -Dexpression="project.groupId" -q -DforceStdout) ARTIFACT_ID=$(mvn help:evaluate -Dexpression="project.artifactId" -q -DforceStdout) VERSION=$(mvn help:evaluate -Dexpression="project.version" -q -DforceStdout) - if [ $VERSION == *-SNAPSHOT ]; + if [ $VERSION == *SNAPSHOT ]; then - echo "Version is snapshot version, proceeding with upload to local-nexus snapshots" + echo "Version $VERSION is snapshot version, proceeding with upload to local-nexus snapshots" PACKAGING=$(mvn help:evaluate -Dexpression="project.packaging" -q -DforceStdout) echo "Uploading artifact for $GROUP_ID:$ARTIFACT_ID:$VERSION" if [ $PACKAGING == "pom" ]; @@ -89,7 +89,7 @@ jobs: -Dfile=target/$ARTIFACT_ID-$VERSION.$PACKAGING fi else - echo "Version is not snapshot version, not uploading to local-nexus snapshots" + echo "Version $VERSION is not snapshot version, not uploading to local-nexus snapshots" fi env: From dc34f2e60843ffcc92b26ac0363853cdc20da31e Mon Sep 17 00:00:00 2001 From: "stjepan.cvitanovic" Date: Fri, 21 Mar 2025 11:28:35 +0100 Subject: [PATCH 5/7] Update .github/workflows/maven-publish.yml --- .github/workflows/maven-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 8ff10a4..86fbd35 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -67,7 +67,7 @@ jobs: GROUP_ID=$(mvn help:evaluate -Dexpression="project.groupId" -q -DforceStdout) ARTIFACT_ID=$(mvn help:evaluate -Dexpression="project.artifactId" -q -DforceStdout) VERSION=$(mvn help:evaluate -Dexpression="project.version" -q -DforceStdout) - if [ $VERSION == *SNAPSHOT ]; + if [[ $VERSION == *SNAPSHOT ]]; then echo "Version $VERSION is snapshot version, proceeding with upload to local-nexus snapshots" PACKAGING=$(mvn help:evaluate -Dexpression="project.packaging" -q -DforceStdout) From 5b5a06a7ee815e4d659df8ab1b9297f4b169344e Mon Sep 17 00:00:00 2001 From: "stjepan.cvitanovic" Date: Mon, 24 Mar 2025 11:18:38 +0100 Subject: [PATCH 6/7] Update .github/workflows/maven-publish.yml --- .github/workflows/maven-publish.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 86fbd35..2614fcb 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -67,6 +67,7 @@ jobs: GROUP_ID=$(mvn help:evaluate -Dexpression="project.groupId" -q -DforceStdout) ARTIFACT_ID=$(mvn help:evaluate -Dexpression="project.artifactId" -q -DforceStdout) VERSION=$(mvn help:evaluate -Dexpression="project.version" -q -DforceStdout) + FINAL_NAME=$(mvn help:evaluate -Dexpression="project.build.finalName" -q -DforceStdout) if [[ $VERSION == *SNAPSHOT ]]; then echo "Version $VERSION is snapshot version, proceeding with upload to local-nexus snapshots" @@ -86,7 +87,7 @@ jobs: -Durl=https://devops.pravilanovait.hr/nexus/repository/maven-snapshots \ -Dpackaging=$PACKAGING -DgroupId=$GROUP_ID -DartifactId=$ARTIFACT_ID \ -Dversion=$VERSION -DrepositoryId=local-nexus \ - -Dfile=target/$ARTIFACT_ID-$VERSION.$PACKAGING + -Dfile=target/$FINAL_NAME.$PACKAGING fi else echo "Version $VERSION is not snapshot version, not uploading to local-nexus snapshots" From 19ae6718d61c4ebb9d59bb7e0383b3db71b41343 Mon Sep 17 00:00:00 2001 From: "stjepan.cvitanovic" Date: Thu, 27 Mar 2025 09:55:14 +0100 Subject: [PATCH 7/7] Update .github/workflows/maven-publish.yml --- .github/workflows/maven-publish.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 2614fcb..d5f0fce 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -42,6 +42,17 @@ jobs: java-version: '21' distribution: 'corretto' + - name: Clone curh schemas + run: | + git clone git@devops.pravilanovait.hr:curh-backend/curh-schemas.git + cd curh-schemas + git checkout $BRANCH + cd src/main/resources + mkdir -p /opt/rizik + cp -R xsd/ /opt/rizik/ + env: + BRANCH: ${{ github.ref }} + - name: Set up JDK from ENV if: github.ref != 'refs/heads/feature/T2900-java21' && github.ref != 'refs/heads/feature/T2900-java-21' uses: actions/setup-java@v4