diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index fb33c75..5ce9377 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -1,5 +1,5 @@ # -# Copyright © 2019 Dominokit +# Copyright © ${year} Dominokit # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -18,40 +18,45 @@ name: Deploy on: push: - branches: [ master , develop] + branches: [ master , develop ] jobs: verify: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 strategy: matrix: - java-version: [ 8, 11 ] + java-version: [ 11 ] steps: - name: Check out Git repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Install Java and Maven - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: java-version: ${{ matrix.java-version }} - - run: mvn verify + distribution: 'temurin' + - run: mvn verify -B -e release: needs: verify - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - name: Check out Git repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Install Java and Maven - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: java-version: 11 - - - name: Release Maven package - uses: samuelmeuli/action-maven-publish@v1 - with: - gpg_private_key: ${{ secrets.gpg_private_key }} - gpg_passphrase: ${{ secrets.gpg_passphrase }} - nexus_username: ${{ secrets.nexus_username }} - nexus_password: ${{ secrets.nexus_password }} - maven_args: -Dci=true \ No newline at end of file + distribution: 'temurin' + server-id: ossrh + server-username: SONATYPE_USERNAME + server-password: SONATYPE_PASSWORD + - id: install-secret-key + name: Install gpg secret key + run: | + cat <(echo -e "${{ secrets.gpg_private_key }}") | gpg --batch --import + - name: publish + run: mvn --no-transfer-progress clean deploy -B -e -Dci=true -Dgpg.passphrase=${{ secrets.gpg_passphrase }} + env: + SONATYPE_USERNAME: ${{ secrets.nexus_username }} + SONATYPE_PASSWORD: ${{ secrets.nexus_password }} \ No newline at end of file diff --git a/domino-aggregator-shared/pom.xml b/domino-aggregator-shared/pom.xml index 718b2fa..514dfda 100644 --- a/domino-aggregator-shared/pom.xml +++ b/domino-aggregator-shared/pom.xml @@ -20,7 +20,7 @@ net.ltgt.gwt.maven gwt-maven-plugin - 1.0.0 + 1.1.0 true org.dominokit.domino.Aggregate diff --git a/pom.xml b/pom.xml index ff0f65d..7cfc9bc 100644 --- a/pom.xml +++ b/pom.xml @@ -63,20 +63,31 @@ HEAD-SNAPSHOT 1.0.3 - 1.8 - 1.8 + 11 + 11 UTF-8 UTF-8 - 1.0.3 + + 3.11.0 + 3.0.1 + 2.10.4 + 1.6 + 1.6.8 + 3.0.0-M1 2.9 + 3.0.0-M1 3.0 + 3.0.0-M1 + 1.1.0 + + 1.0.5 junit junit - 4.13.1 + 4.13.2 test @@ -87,16 +98,59 @@ + + + + com.google.guava + guava + 32.1.3-jre + + + com.google.auto + auto-common + 1.2.2 + + + + org.apache.maven.plugins maven-compiler-plugin - 3.7.0 + ${maven.compiler.plugin} + + 11 + - org.apache.maven.plugins maven-source-plugin + ${maven.source.plugin} + + + attach-sources + package + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven.javadoc.plugin} + + false + + + + attach-javadocs + + jar + + + com.coveo @@ -147,6 +201,14 @@ + + org.apache.maven.plugins + maven-deploy-plugin + ${maven.deploy.plugin} + + true + + org.dominokit gitflow-maven-plugin @@ -175,47 +237,32 @@ + + org.apache.maven.plugins + maven-enforcer-plugin + 3.0.0-M3 + + + enforce + + + + + + + enforce + + + + + - - org.apache.maven.plugins - maven-compiler-plugin - 3.7.0 - - - maven-source-plugin - 3.0.1 - - - attach-sources - package - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.2.0 - - false - - - - attach-javadocs - - jar - - - - org.apache.maven.plugins maven-gpg-plugin - 1.6 + ${maven.gpg.plugin} sign-artifacts @@ -236,7 +283,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.8 + ${maven.nexus.staging.plugin} true ossrh @@ -244,30 +291,31 @@ false + + net.ltgt.gwt.maven + gwt-maven-plugin + 1.1.0 + true + + + -Duser.timezone=UTC + 1.8 + true + true + + -generateJsInteropExports + + + -generateJsInteropExports + + + - dev - - true - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins - maven-source-plugin - - - - - - deploy + production ci @@ -276,18 +324,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins - maven-source-plugin - - - org.apache.maven.plugins - maven-javadoc-plugin - org.apache.maven.plugins maven-gpg-plugin