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..101d872 --- /dev/null +++ b/.github/workflows/release-action.yml @@ -0,0 +1,59 @@ + +# 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: + release_version: + description: "Release number version to create" + required: true + next_version: + 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 -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 new file mode 100644 index 0000000..09172da --- /dev/null +++ b/.github/workflows/snapshot-action.yml @@ -0,0 +1,45 @@ + +# 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 }} + 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/.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 3ac744f..6810f49 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.0.owsi2-SNAPSHOT + 7.2.0.owsi2-SNAPSHOT WQPlot Wicket/WiQuery-JqPlot binding @@ -33,11 +28,12 @@ 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:https://github.com/apidae-tourisme/wiquery-jqplot.git + HEAD + + hielkehoeve @@ -130,6 +126,13 @@ + + + com.gkatzioura.maven.cloud + s3-storage-wagon + 2.3 + + false @@ -220,15 +223,13 @@ - - nexus-owsi-core - Nexus OWSI Core - https://projects.openwide.fr/services/nexus/content/repositories/owsi-core - - - nexus-owsi-core-snapshots - Nexus OWSI Core Snapshots - https://projects.openwide.fr/services/nexus/content/repositories/owsi-core-snapshots - + + snapshot-bucket + s3://apidae-sit-packages/snapshot + + + release-bucket + s3://apidae-sit-packages/release +