diff --git a/.github/workflows/netlicensing-client-release.yml b/.github/workflows/netlicensing-client-release.yml index 5a6596cb..26afedad 100644 --- a/.github/workflows/netlicensing-client-release.yml +++ b/.github/workflows/netlicensing-client-release.yml @@ -51,5 +51,6 @@ jobs: clean deploy scm:tag \ -P release \ -Drevision=${{ github.event.inputs.release-version }} \ + -Dchangelist= \ -Dmessage="Release ${{ github.event.inputs.release-version }}" \ -Dgpg.passphrase=${{ secrets.GPG_KEY_PASS }} diff --git a/.github/workflows/netlicesning-client-ci.yml b/.github/workflows/netlicesning-client-ci.yml index 71d7853d..7db09b6f 100644 --- a/.github/workflows/netlicesning-client-ci.yml +++ b/.github/workflows/netlicesning-client-ci.yml @@ -29,14 +29,33 @@ jobs: steps: - uses: actions/checkout@v3 + - name: Set up JDK ${{ matrix.java-version }} uses: actions/setup-java@v3 with: java-version: ${{ matrix.java-version }} distribution: 'adopt' cache: maven + + - name: Prepare maven settings.xml + run: | + mkdir -p ~/.m2 + cat << EOF >~/.m2/settings.xml + + + + nlic-snapshots + ${{ secrets.SNAPSHOTS_USER }} + ${{ secrets.SNAPSHOTS_PASS }} + + + + EOF + - name: Build with Maven - run: mvn -B clean verify + run: mvn -B clean install -Drepo.snapshots.url=${{ secrets.SNAPSHOTS_URL }} -Dsha1=${{ github.ref_name }} + - name: Run Demo App run: | ls -la NetLicensingClient-demo/target/ diff --git a/pom.xml b/pom.xml index 459eb65c..8bc90c53 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.labs64.netlicensing netlicensing-client-parent - ${revision} + ${revision}${sha1}${changelist} pom Labs64 :: NetLicensing :: Client :: Parent https://netlicensing.io @@ -63,7 +63,9 @@ - 2.10.0-SNAPSHOT + 2.10.0 + -SNAPSHOT + ${project.name} UTF-8