From 6260a0bc94f796ec04d5e5c3016ad5c40a80df36 Mon Sep 17 00:00:00 2001 From: jubav Date: Wed, 22 Sep 2021 09:33:28 +0200 Subject: [PATCH 1/6] v 7.1.1.owsi2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3ac744f..f308670 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ nl.topicus wqplot jar - 7.1.0.owsi2-SNAPSHOT + 7.1.1.owsi2 WQPlot Wicket/WiQuery-JqPlot binding From b43504dbd0d78a8418ea3335303fdc1cb2afe909 Mon Sep 17 00:00:00 2001 From: mfourt Date: Thu, 23 Sep 2021 09:32:13 +0200 Subject: [PATCH 2/6] feat(): add github action for snapshot/release build and deploy --- .github/workflows/pull-request-action.yml | 22 +++++++++ .github/workflows/release-action.yml | 57 +++++++++++++++++++++++ .github/workflows/snapshot-action.yml | 42 +++++++++++++++++ .gitignore | 2 + pom.xml | 28 ++++------- 5 files changed, 132 insertions(+), 19 deletions(-) create mode 100644 .github/workflows/pull-request-action.yml create mode 100644 .github/workflows/release-action.yml create mode 100644 .github/workflows/snapshot-action.yml diff --git a/.github/workflows/pull-request-action.yml b/.github/workflows/pull-request-action.yml new file mode 100644 index 0000000..1baca89 --- /dev/null +++ b/.github/workflows/pull-request-action.yml @@ -0,0 +1,22 @@ + +# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time +# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven + +name: CI test pull request + +on: + pull_request: + types: [opened, synchronize, reopened] +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 8 + uses: actions/setup-java@v2 + with: + java-version: '8' + distribution: 'adopt' + cache: maven + - name: Verify + run: mvn --batch-mode --update-snapshots verify diff --git a/.github/workflows/release-action.yml b/.github/workflows/release-action.yml new file mode 100644 index 0000000..e2646aa --- /dev/null +++ b/.github/workflows/release-action.yml @@ -0,0 +1,57 @@ + +# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time +# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven + +name: Release, deploy and create next iteration + +on: + workflow_dispatch: + inputs: + releaseVersion: + description: "Release number version to create" + required: true + nextVersion: + description: "SNAPSHOT number of the next development version" + required: true + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 8 + uses: actions/setup-java@v2 + with: + java-version: '8' + distribution: 'adopt' + cache: maven + - name: Verify + run: mvn --batch-mode --update-snapshots verify + + prepare-release: + runs-on: ubuntu-latest + needs: [build] + permissions: + contents: read + packages: write + steps: + - uses: actions/checkout@v2 + with: + token: ${{secrets.TOKEN_RELEASE}} + - name: Set up JDK 8 + uses: actions/setup-java@v2 + with: + java-version: '8' + distribution: 'adopt' + cache: maven + - name: Configure Git user email + run: git config user.email "actions@github.com" + - name: Configure Git username + run: git config user.name "GitHub Actions" + - name: prepare + run: mvn --batch-mode -Dtag=${{ github.event.inputs.release_version }} release:prepare -DreleaseVersion=${{ github.event.inputs.release_version }} -DdevelopmentVersion=${{ github.event.inputs.next_version }} + - name: perform + run: mvn --batch-mode release:perform + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + diff --git a/.github/workflows/snapshot-action.yml b/.github/workflows/snapshot-action.yml new file mode 100644 index 0000000..68eab66 --- /dev/null +++ b/.github/workflows/snapshot-action.yml @@ -0,0 +1,42 @@ + +# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time +# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven + +name: Build and deploy snapshot version of the project + +on: + push: + branches: [owsi] + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 8 + uses: actions/setup-java@v2 + with: + java-version: '8' + distribution: 'adopt' + cache: maven + - name: Verify + run: mvn --batch-mode --update-snapshots verify + + deploy: + runs-on: ubuntu-latest + needs: [build] + permissions: + contents: read + packages: write + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 8 + uses: actions/setup-java@v2 + with: + java-version: '8' + distribution: 'adopt' + cache: maven + - name: Build + run: mvn --batch-mode deploy + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.gitignore b/.gitignore index 2e3be5c..c3ec9f2 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ target .project /.settings /.gitignore +/.idea +*.iml diff --git a/pom.xml b/pom.xml index f308670..f2d75aa 100644 --- a/pom.xml +++ b/pom.xml @@ -1,16 +1,11 @@ 4.0.0 - - org.sonatype.oss - oss-parent - 7 - nl.topicus wqplot jar - 7.1.1.owsi2 + 7.1.1.owsi2-SNAPSHOT WQPlot Wicket/WiQuery-JqPlot binding @@ -33,11 +28,11 @@ https://github.com/openwide-java/wiquery-jqplot/openwide-release - git@github.com:openwide-java/wiquery-jqplot.git - scm:git:git@github.com:openwide-java/wiquery-jqplot.git - scm:git:git@github.com:openwide-java/wiquery-jqplot.git + git@github.com:apidae-tourisme/wiquery-jqplot.git + scm:git:git@github.com:apidae-tourisme/wiquery-jqplot.git + scm:git:git@github.com:apidae-tourisme/wiquery-jqplot.git - + hielkehoeve @@ -218,17 +213,12 @@ - + - nexus-owsi-core - Nexus OWSI Core - https://projects.openwide.fr/services/nexus/content/repositories/owsi-core + github + github OWSI Core + https://maven.pkg.github.com/apidae-tourisme/wiquery-jqplot - - nexus-owsi-core-snapshots - Nexus OWSI Core Snapshots - https://projects.openwide.fr/services/nexus/content/repositories/owsi-core-snapshots - From 290f6d76fc20f0ddec31f3ad4c17335e0459682a Mon Sep 17 00:00:00 2001 From: mfourt Date: Tue, 28 Sep 2021 09:28:03 +0200 Subject: [PATCH 3/6] fix(): skip generate javadoc & fix action inputs --- .github/workflows/release-action.yml | 6 +++--- pom.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release-action.yml b/.github/workflows/release-action.yml index e2646aa..cfe7a9b 100644 --- a/.github/workflows/release-action.yml +++ b/.github/workflows/release-action.yml @@ -7,10 +7,10 @@ name: Release, deploy and create next iteration on: workflow_dispatch: inputs: - releaseVersion: + release_version: description: "Release number version to create" required: true - nextVersion: + next_version: description: "SNAPSHOT number of the next development version" required: true @@ -51,7 +51,7 @@ jobs: - name: prepare run: mvn --batch-mode -Dtag=${{ github.event.inputs.release_version }} release:prepare -DreleaseVersion=${{ github.event.inputs.release_version }} -DdevelopmentVersion=${{ github.event.inputs.next_version }} - name: perform - run: mvn --batch-mode release:perform + run: mvn --batch-mode release:perform -Darguments="-Dmaven.javadoc.skip=true" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/pom.xml b/pom.xml index f2d75aa..ca3abef 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ git@github.com:apidae-tourisme/wiquery-jqplot.git scm:git:git@github.com:apidae-tourisme/wiquery-jqplot.git - scm:git:git@github.com:apidae-tourisme/wiquery-jqplot.git + scm:git:https://github.com/apidae-tourisme/wiquery-jqplot.git From 05a7dcb7684b2a610cd15d5cede68f0ec0ad7710 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Tue, 28 Sep 2021 07:39:40 +0000 Subject: [PATCH 4/6] [maven-release-plugin] prepare release 7.1.1.owsi2 --- pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ca3abef..9e0e6a0 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ nl.topicus wqplot jar - 7.1.1.owsi2-SNAPSHOT + 7.1.1.owsi2 WQPlot Wicket/WiQuery-JqPlot binding @@ -31,7 +31,8 @@ git@github.com:apidae-tourisme/wiquery-jqplot.git scm:git:git@github.com:apidae-tourisme/wiquery-jqplot.git scm:git:https://github.com/apidae-tourisme/wiquery-jqplot.git - + 7.1.1.owsi2 + From e21d8846cdc7f158644d41b3da7118acb67a0f91 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Tue, 28 Sep 2021 07:39:41 +0000 Subject: [PATCH 5/6] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 9e0e6a0..81af01e 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ nl.topicus wqplot jar - 7.1.1.owsi2 + 7.2.0.owsi2-SNAPSHOT WQPlot Wicket/WiQuery-JqPlot binding @@ -31,7 +31,7 @@ git@github.com:apidae-tourisme/wiquery-jqplot.git scm:git:git@github.com:apidae-tourisme/wiquery-jqplot.git scm:git:https://github.com/apidae-tourisme/wiquery-jqplot.git - 7.1.1.owsi2 + HEAD From ceaa6326c663af6d19ffa6740bded06db4478e57 Mon Sep 17 00:00:00 2001 From: mfourt Date: Fri, 15 Oct 2021 14:44:23 +0200 Subject: [PATCH 6/6] feat(): now deploy to s3 bucket --- .github/workflows/release-action.yml | 4 +++- .github/workflows/snapshot-action.yml | 3 +++ pom.xml | 22 ++++++++++++++++------ 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release-action.yml b/.github/workflows/release-action.yml index cfe7a9b..101d872 100644 --- a/.github/workflows/release-action.yml +++ b/.github/workflows/release-action.yml @@ -54,4 +54,6 @@ jobs: run: mvn --batch-mode release:perform -Darguments="-Dmaven.javadoc.skip=true" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - + AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }} diff --git a/.github/workflows/snapshot-action.yml b/.github/workflows/snapshot-action.yml index 68eab66..09172da 100644 --- a/.github/workflows/snapshot-action.yml +++ b/.github/workflows/snapshot-action.yml @@ -40,3 +40,6 @@ jobs: run: mvn --batch-mode deploy env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }} diff --git a/pom.xml b/pom.xml index 81af01e..6810f49 100644 --- a/pom.xml +++ b/pom.xml @@ -126,6 +126,13 @@ + + + com.gkatzioura.maven.cloud + s3-storage-wagon + 2.3 + + false @@ -214,12 +221,15 @@ - + - - github - github OWSI Core - https://maven.pkg.github.com/apidae-tourisme/wiquery-jqplot - + + snapshot-bucket + s3://apidae-sit-packages/snapshot + + + release-bucket + s3://apidae-sit-packages/release +