diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 5de62b4..7ba3fe1 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -14,17 +14,22 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 1.8 + + - name: Set up Java for Apache Maven Central uses: actions/setup-java@v1 with: - java-version: 1.8 - server-id: github # Value of the distributionManagement/repository/id field of the pom.xml - settings-path: ${{ github.workspace }} # location for the settings.xml file - - - name: Build with Maven - run: mvn -B package --file pom.xml + java-version: 11 - - name: Publish to GitHub Packages Apache Maven - run: mvn deploy -s $GITHUB_WORKSPACE/settings.xml + - name: Cache Maven packages + uses: actions/cache@v2 + with: + path: ~/.m2 + key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} + restore-keys: ${{ runner.os }}-m2 + + - name: Publish to Apache Maven Central + run: mvn deploy --batch-mode --update-snapshots -P sign,build-extras env: - GITHUB_TOKEN: ${{ github.token }} + OSSRH_USERNAME: ${{ secrets.OSSRH_JIRA_USERNAME }} + OSSRH_PASSWORD: ${{ secrets.OSSRH_JIRA_PASSWORD }} + GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index c8aeb3a..6c69f72 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -10,15 +10,33 @@ on: branches: [ master ] jobs: + build: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Set up JDK 1.8 + + - name: Set up Java uses: actions/setup-java@v1 with: - java-version: 1.8 - - name: Build with Maven - run: mvn -B package --file pom.xml + java-version: 11 + + - name: Cache Maven packages + uses: actions/cache@v2 + with: + path: ~/.m2 + key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} + restore-keys: ${{ runner.os }}-m2 + + - name: Build witrh Maven + run: mvn --batch-mode --update-snapshots clean compile verify + + - run: mkdir staging && cp target/*.jar staging + + - name: Upload Maven build artifact + uses: actions/upload-artifact@v1 + with: + name: artifact + path: staging \ No newline at end of file diff --git a/.travis.settings.xml b/.travis.settings.xml deleted file mode 100644 index 9de228c..0000000 --- a/.travis.settings.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - bintray-csowada-mvn - csowada - ${env.BINTRAY_TOKEN} - - - snapshots - csowada - ${env.JFROG_TOKEN} - - - - - - bintray - - ${env.PASSPHRASE} - - - - - - false - - bintray-csowada-mvn - bintray - https://dl.bintray.com/csowada/mvn - - - - - snapshots - libs-snapshot - https://oss.jfrog.org/artifactory/libs-snapshot - - - - - - - - false - - bintray-csowada-mvn - bintray-plugins - https://dl.bintray.com/csowada/mvn - - - - - snapshots - plugins-release - https://oss.jfrog.org/artifactory/plugins-release - - - - - - - bintray - - \ No newline at end of file diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 00e056e..0000000 --- a/.travis.yml +++ /dev/null @@ -1,34 +0,0 @@ -language: java -env: - global: - - secure: "I5I+rgtj/2qnyveo70tIJf3BwE9lkVTjBNoIf86CDcldwvnpC27FjWKBjjfnAncLIr2xFMgJEN7KuZDvs6M15DiV9KTdnGBwLfsE6yjNEpS9qEgnvZBJXM5eKsIOHgMkT95KnlFNl3DquAY2L0l+cARcUfi1n1cH/fVgW8whZLVApkeov8PCjzLk/CgSKZL2RAYZxWdt1XE42KpkmsNjAnVODp610RxqEPoAgDAIvT+xURUiDsC1l3yY/6Jo0vtln3omEOm8UZ6J0dajLAcdBaq5KQPRely0rF5ddk8Ht+nG75rhb2AAOdM3Ezh+ooEE4NAafxjC/+YoSFiP1T19hRF6hZ6xxnjj7pus4XZrZQGCVzao49Qw0vQQPKA2f4GbdXP5gPcEYK1cfXT5Dcd4bWqD3QjpPT9JhskcuERU9YVtRCOt2tDVjoaWKm9G6yNBoptPkWE8D83DgyWg5w8tqxLtsTfzgk5J43BeMRKiy1Y3R4+D4yb6VtO+VGSglUnBQvznaD+kCjgPgKkYC5x6/MgmrIZDDkNiPSiPzZT5H7LwMFTc1TfOJ80NQx2/Dhkd4veNDyTlV6fr+b7V0gf1+LQUzd2PrvGyOLmdal2M8zP/0/FQ/oDAXWRHofl+p/FDSafKDl0ug1GkECRhn/iqd7M6gl7QU3bbFmADsMyRDXY=" - - # ^^ OSSRH_JIRA_USERNAME - - secure: "IFDryzBh8kRKbmQlXZt4SwNdcGb7UXcnDSFktG1FYCQAm7/boTzuTL7nXyXBrhVIKW7MeBx/oEUNLlgLgtemNeZeN3YYdfyevcypDdpdmDIt2dwvlo5w95voZSAlrSYSXVsIm8uwzrQpdTfjJpaFJyOR6nX3LFnNB5UT28shA+iP1rjkcWM2YeJvvRXQnasAEvCFIcmSavxvW3Tndg5hVBjSwKuMQL8bWYpb1WaWrSBbC3Ckj6cQFDNbh8lj4L4zqWHlV7no7Ft2dwQhAJkQS1rD3W2/h/EtCA2yBv0NBRekL4TIzOCW/QI8uG6TWuCWFEkqsUBsWrgADs253TMvgAk93ChuIYgSiXOOXeD8vKaDATIjPR054FZfJRYe+48d2tIqIC4iqkVUxNhEl2L136Dh60JLs3p4DFTze0RO13ay7op+/gRwly9z8IdX+XnhPeIocofSizKPk1Aa+LlIwmAuoRqBfu5tbb0VktPrrYT2/3Y2D0J+sirnk62ZqOHpzTCTQuhfmc2FAMDkgDYt7nyfiWVGKdCEb8YAZXm0CdGUfb8BMzQlRLaVS83pqelOKIVqXdKtX+x3vT2SpT5nujf2GetXACWx5/ten59RUx9FZAl180ie/0rRw5ezzFLyXrSuwiIwef1hGRKNnJXdKjaZrGFGZgNbd/Hdp01ky8A=" - - # ^^ OSSRH_JIRA_PASSWORD - - secure: "ZYwuhmulMCE2xHl6Jb5CxuA2PUvX/M6Ixq3bn1QjTAMOHusSXsltOgLnNiwjqY7XNy/GhFfW0Tk8I4E8h7nhJL13POy8OxlFgC39XV1Lw7Ve3wCqbV1jIRVdlxiVh7THsE37lO2wQ/wgiPpSFz+WGUhbJ/cmyZBPDkNVNXkkg4m+VFzx4F7KeKa9U1+HCaivBIl2Vl4DsI55mqd7ecjB33VtJgJYdB6EbEyhjAEWnBDRb0E8Wq/w9FUVd4HIUmHGMYzmralYTJzUp2xsAbpHoJHqCcyQ5cmMPRvT4qIlunAH1SzdvzJbCODtHxq9M9Ha7jBEZDF6l5LIV8ikd9YG9QgYduSQPWT89XtF81EHXASZSYfhaadXU6mnMfM35oSQS1M4fpsuy4dtjsar8SW89+dMe/xaekwWuQvnQZdyiJHzEKUlENxOtCf9EL4zY3QCcdXGbHZ1gYOPk54gccN+8rDZR76I6AvAXafhvP/XPaJdFkbFdla+c+BEtVlaeJ60E6+F0dUc3vSN20ziLM9ilrFsmCl7aLPV3sqarp3h7GNTkSjUnBsh6aZ5CZt+tbULiRRQbfRDRLdAXNYDmh4NYRndXS3Lvssca5Xnx5qjKtqpSD0eZQoT5gr1Bocac0Ri8cbI6BWgqAso9qbjeZPbB0P9yx7UUFTFrqUpb3AT85A=" - - # ^^ GPG_PASSPHRASE - - secure: "lhQS3eaQDEvQ7Y6ddXenXkvGL5K+bOnJkcPZlDVx1HpgRlsarE9TLg2g1nYRe7T+aClHOFAj8pU1sRcG29UTCtwmZCKyPXgVTPih6hoA1oEVns+wrtkKU/OWIJjI4oRcJKKk59D8g3FqvEQyKdFRGi/ofFE0iuHh2v0L3ZpDHgzrWHLoYcOGfXOiSZ5iBXZL5hr3RTWktqhjIFgibkCy3Pee9c8g9voZTa8YWpDdS4s5m/2VOP/krjF1GkIZfMIVPu4bepLd+mLExlkQnuSswXMH46GZEe3GuZNknuqy00SdRc3EEQLeWXivlyG06dHl56+BdjsKWfiXpjSudMJdVmnWK0VSdZ27W5PeAwdEEIgfCa2TBaSOxLNLOLqvJpsMWqYgISeDssyNa1D2TZC3GnqzNuTYtJ3JkmLolfT/1llU/PePwrYg6SLK3c9P7Ln/Vv2bj+69CIhtME0wpiRPY1VNCueboisZMqoZZJCzI+uVtgBleklcREoH5Rl0wta5LnSOiZHiPk67Zo0fkFap//FeR70aPIjaITFs7wQ9iwAd9kpffsvQXiLqzgh/0a87b5Q2qzRBFqBjmw+B57eaqumFkg+QCVNIy+hlQk6XJzcpNHlFrPT3EYy+6pHOoqyh6h3m8Wric5xO1GzIJWt4zlCgJu/f0TbxWe+KsYRKMvA=" - - # ^^ GPG_KEY_NAME - -before_script: - - chmod +x ./cd/before-deploy.sh - - chmod +x ./cd/deploy.sh - -install: mvn install -P !build-extras -DskipTests=true -Dmaven.javadoc.skip=true -B -V - -script: mvn test -P !build-extras -B - -cache: - directories: - - ~/.m2/repository - -after_success: - - ./cd/before-deploy.sh - - ./cd/deploy.sh - -notifications: - email: - recipients: - - opensource@cs-dev.de - on_success: change - on_failure: always diff --git a/cd/before-deploy.sh b/cd/before-deploy.sh deleted file mode 100644 index d858b1e..0000000 --- a/cd/before-deploy.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash -set -ev - -if [ "$TRAVIS_PULL_REQUEST" == 'false' ]; then - openssl aes-256-cbc -K $encrypted_12c8071d2874_key -iv $encrypted_12c8071d2874_iv -in cd/codesigning.asc.enc -out cd/codesigning.asc -d - gpg --fast-import cd/codesigning.asc -fi \ No newline at end of file diff --git a/cd/codesigning.asc.enc b/cd/codesigning.asc.enc deleted file mode 100644 index 74736d0..0000000 Binary files a/cd/codesigning.asc.enc and /dev/null differ diff --git a/cd/deploy.sh b/cd/deploy.sh deleted file mode 100644 index 4fe75ae..0000000 --- a/cd/deploy.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash -set -ev - -if [ "$TRAVIS_PULL_REQUEST" == 'false' ]; then - mvn deploy -P sign,build-extras --settings cd/mvnsettings.xml -fi \ No newline at end of file diff --git a/cd/mvnsettings.xml b/cd/settings.xml similarity index 80% rename from cd/mvnsettings.xml rename to cd/settings.xml index f1a17c7..a89dbe3 100644 --- a/cd/mvnsettings.xml +++ b/cd/settings.xml @@ -6,8 +6,8 @@ ossrh - ${env.OSSRH_JIRA_USERNAME} - ${env.OSSRH_JIRA_PASSWORD} + ${env.OSSRH_USERNAME} + ${env.OSSRH_PASSWORD} @@ -19,7 +19,6 @@ gpg - ${env.GPG_KEY_NAME} ${env.GPG_PASSPHRASE} diff --git a/pom.xml b/pom.xml index 25d5fe9..d836a73 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,8 @@ ${bundle.version} de.csdev.ebus.* resolution:=optional - org.slf4j;$[opt], com.fazecast.jSerialComm;$[opt], gnu.io;$[opt], org.eclipse.jdt.annotation;$[opt], * + org.slf4j;$[opt], com.fazecast.jSerialComm;$[opt], gnu.io;$[opt], + org.eclipse.jdt.annotation;$[opt], * ${maven.build.timestamp} ${buildNumber} @@ -176,6 +177,13 @@ sign + + + + --pinentry-mode + loopback + + @@ -299,16 +307,14 @@ - ossrh https://oss.sonatype.org/content/repositories/snapshots - ossrh https://oss.sonatype.org/service/local/staging/deploy/maven2/ - +