diff --git a/.github/actions/build-sample-app/action.yml b/.github/actions/build-sample-app/action.yml index e7d759a..18aba56 100644 --- a/.github/actions/build-sample-app/action.yml +++ b/.github/actions/build-sample-app/action.yml @@ -19,6 +19,14 @@ inputs: description: 'commands passed to \"jfrog rt mvn\" to publish the app' required: false default: '-B clean install -DskipTests' + artifactory-repo-deploy-snapshots: + description: 'which Artifactory repo to publish snapshot versions to (the \"--repo-deploy-snapshots\" arg passed to \"jfrog rt mvn\")' + required: false + default: 'libs-snapshot-local' + artifactory-repo-deploy-releases: + description: 'which Artifactory repo to publish non-snapshot versions to (the \"--repo-deploy-releases\" arg passed to \"jfrog rt mvn\")' + required: false + default: 'libs-release-local' docker-push: description: 'whether or not to push docker image to docker hub' required: false @@ -69,6 +77,8 @@ runs: app-dir: ${{ inputs.app-dir }} jf-artifactory-spring: ${{ inputs.jf-artifactory-spring }} jf-mvn-build-commands: ${{ inputs.jf-mvn-build-commands }} + artifactory-repo-deploy-snapshots: ${{ inputs.artifactory-repo-deploy-snapshots }} + artifactory-repo-deploy-releases: ${{ inputs.artifactory-repo-deploy-releases }} - uses: ./.github/actions/build-sample-app/docker-push if: ${{ inputs.docker-push == 'true' }} diff --git a/.github/actions/build-sample-app/artifactory-publish/action.yml b/.github/actions/build-sample-app/artifactory-publish/action.yml index 3758b74..5842239 100644 --- a/.github/actions/build-sample-app/artifactory-publish/action.yml +++ b/.github/actions/build-sample-app/artifactory-publish/action.yml @@ -11,6 +11,14 @@ inputs: description: 'commands passed to \"jfrog rt mvn\" to publish the app' required: false default: '-B clean install -DskipTests' + artifactory-repo-deploy-snapshots: + description: 'which Artifactory repo to publish snapshot versions to (the \"--repo-deploy-snapshots\" arg passed to \"jfrog rt mvn\")' + required: false + default: 'libs-snapshot-local' + artifactory-repo-deploy-releases: + description: 'which Artifactory repo to publish non-snapshot versions to (the \"--repo-deploy-releases\" arg passed to \"jfrog rt mvn\")' + required: false + default: 'libs-release-local' runs: using: "composite" steps: @@ -30,8 +38,8 @@ runs: --server-id-deploy=repo.spring.io \ --repo-resolve-releases=libs-milestone \ --repo-resolve-snapshots=libs-snapshot \ - --repo-deploy-releases=release \ - --repo-deploy-snapshots=snapshot + --repo-deploy-releases=$${{ inputs.artifactory-repo-deploy-releases }} \ + --repo-deploy-snapshots=$${{ inputs.artifactory-repo-deploy-snapshots }} echo JFROG_CLI_BUILD_NAME=spring-cloud-dataflow-samples >> $GITHUB_ENV echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV working-directory: ${{ inputs.app-dir }} @@ -43,4 +51,3 @@ runs: jfrog rt build-publish echo "::info ::published ${{ inputs.app-dir }}" working-directory: ${{ inputs.app-dir }} - diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b2055f3..2fc64f3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -316,6 +316,7 @@ jobs: mvn-build-commands: '-B clean install spring-boot:build-image' artifactory-publish: ${{ inputs.maven-build-only != true }} jf-artifactory-spring: ${{ secrets.JF_ARTIFACTORY_SPRING }} + artifactory-repo-deploy-releases: 'libs-milestone-local' docker-push: ${{ inputs.maven-build-only != true }} docker-username: ${{ secrets.DOCKERHUB_USERNAME }} docker-password: ${{ secrets.DOCKERHUB_TOKEN }} @@ -332,6 +333,7 @@ jobs: mvn-build-commands: '-B clean install spring-boot:build-image' artifactory-publish: ${{ inputs.maven-build-only != true }} jf-artifactory-spring: ${{ secrets.JF_ARTIFACTORY_SPRING }} + artifactory-repo-deploy-releases: 'libs-milestone-local' docker-push: ${{ inputs.maven-build-only != true }} docker-username: ${{ secrets.DOCKERHUB_USERNAME }} docker-password: ${{ secrets.DOCKERHUB_TOKEN }} @@ -363,4 +365,4 @@ jobs: steps: - name: 'Completed' shell: bash - run: echo "::info ::completed" \ No newline at end of file + run: echo "::info ::completed" diff --git a/timestamp-task/pom.xml b/timestamp-task/pom.xml index 038cfec..d512d51 100644 --- a/timestamp-task/pom.xml +++ b/timestamp-task/pom.xml @@ -15,7 +15,7 @@ Simple Timestamp sample. - 8 + 17 2022.0.2