diff --git a/.github/workflows/kumuluzee-ci.yml b/.github/workflows/kumuluzee-ci.yml new file mode 100644 index 0000000..597020b --- /dev/null +++ b/.github/workflows/kumuluzee-ci.yml @@ -0,0 +1,70 @@ +name: KumuluzEE CI + +on: [push, pull_request] + +jobs: + test: + name: Build and test + runs-on: 'ubuntu-latest' + + strategy: + matrix: + java-version: ['11', '17', '18'] + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Set up JDK ${{ matrix.java-version }} + uses: actions/setup-java@v1 + with: + java-version: ${{ matrix.java-version }} + + - name: Cache Maven packages + uses: actions/cache@v2 + with: + path: ~/.m2 + key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} + restore-keys: ${{ runner.os }}-m2 + + - name: Install + run: mvn --show-version --update-snapshots --batch-mode clean install -DskipTests=true + + - name: Test + run: mvn --batch-mode test + + publish: + name: Publish to OSSRH + runs-on: 'ubuntu-latest' + + needs: test + if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v') + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Set up JDK 11 + uses: actions/setup-java@v1 + with: + java-version: 11 + + - name: Restore cache + uses: actions/cache@v2 + with: + path: ~/.m2 + key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} + restore-keys: ${{ runner.os }}-m2 + + - name: Restore GPG keys + env: + GPG_KEY: ${{ secrets.OSSRH_GPG_KEY }} + GPG_PUB: ${{ secrets.OSSRH_GPG_PUB }} + run: 'printf "$GPG_KEY" | base64 --decode > "$GITHUB_WORKSPACE/gpg.key" && printf "$GPG_PUB" | base64 --decode > "$GITHUB_WORKSPACE/gpg.pub" && gpg --batch --import "$GITHUB_WORKSPACE/gpg.pub" "$GITHUB_WORKSPACE/gpg.key"' + + - name: Publish to OSSRH + env: + OSSRH_USERNAME: Kumuluz + OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} + GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_PASSPHRASE }} + run: mvn --batch-mode source:jar javadoc:jar deploy -Pdeploy -DskipTests=true --settings ./settings.xml; diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index c4e5042..0000000 --- a/.travis.yml +++ /dev/null @@ -1,26 +0,0 @@ -language: java -dist: trusty - -jdk: -- openjdk8 - -env: - global: - - secure: "JLkprrye0JGRJSGd6MhMjwNGySi74ePg/9tvnLwm+fXY0NPS+WEuMd5Hud6YMwMicfqgD1fQFKdGeNxzdmuUJFcwSwEo94Kp6APtwab2+TrX2gEJq0GXZBcC7lIOVFmHKotjjFgG20X7OFcQZHFLA0U+mYjuFZHVheyOXyysAwQwROHGqQdBVdcjUfdEOXS1aMAAMPTeqUDMOVsQlJRFj9oeGQr7+xw0Gq8EayhDgKPxek7/gY5IFTnt2srDV9nXO7U1WkaZ93I6FF8lifwR1bN4hrhTc5OlsfF784mfqvSE4YgQp84fsodqgYpLghxYatlNgDmpRVu470MOTP24YyBWKexbcrkZaj5taDntnYaNHCMItXtiAVR85kOWreXPJug312kBPxoVihF5ZVchol4+cpctN4QVRWDEcblgltSUwsBGdYFb61e806jMnO65amSOsZob111OiHUQC3koYCZ6XELIAhL3G3olY5xQoqwlz/iOIcZVz4LjJQFzy89Uy0c0s4oueZfgODzPYS6gW5y6Vn0bhEC1HU3vjrDaFBIsIQooW0uGVg+alpy+zlZa9Z5jRSBgO6ueiF1H2hB6PqccIyzX1I4IylYM4QUE7gzTcOreuWcEadVayZGgnzU78PMJ2AJiQI+BhqWV9K9ONWyoMU8YTESjlVzTTAHC0nY=" - - secure: "Q0w25AM0poCqlW1crkx0ogUAB5k2K1dd0+h3xlWJ7fhAR+f5/P5Y/sEI7Fho48Xd+OuKFcX2DMZCuWoZH/Z2iKvd7FJPi2HfSpEriP4RFaALsDgWfspUJYAo+atRucYh37T7/52Sdatx5cKKoPbf5K7c3mcJTOENMZRIyTjRmBTS127tSPc/vyrDIJ7S1VvT5cJUVgeyMwtteAica56fNYEYMNSH529Imb9vlsFqhnHBlb4NEKAeVA/ueTCKTvbAuDa4PYYLGO8Fzbj2rxveDTqMaU+tCZvhC5HK27eOCR5V1xLrKAlSDF+4x/AiTncdxK+k8gg5sISWiHG8RxXfvX7BMtitrqEAZFa08P7Mnnvu/an5ZYziM1kRpeVEWJF4nRs6VylA5/n0ODKf7rRx0OAlRroNsoSI7wEOU+NHX7q6QkDzM/Z+SNzVfif2j0ZjKHLtCbC5vY9If7LDz2Bhpx2kxQpcnW1UqaHhH20azm6ny7cryAggbCpFF2hQfF7smNZi0pPmso0kPksmURdOgP1FypGxhSL8qCJAkdTs/Z/7sZfr4d9BhjbY2QNusp90M39A+zUqgv7W+UScm777tcQLbD+KmP0BTpvdPsuPYYQdbyL6E7TaC/6MFPUtU9XfkEbaKBIwDKaqMyfdx/+AmILTr1EyMPLxgmBMWsFkHD8=" - - secure: "NpoOuMuMjimDVl2ugl+YPFN92+TweeJwYzgtHIybCgzhpuRKoi0qRLYpv99byMhNLHF06aNkZtzehKEGa7EJH4JNCTGqxjuDOgSg/Aa3Nq/BOrAZ09QKRWqGIRrHLgd277dP27CqpREM6k3LL0SQhXgeKaW6CfLvEI6ddxMlfL42Q9L88bcI4oQYafqUBsqbVNo6nb0STyrW/6JrQ2QqAUoZEZRMIcmk5JCRZG/55azfQ0zG82EUMUiu5ub0A+QfNh4Toun/jo9Kk7FUuGeoV6mFExi46C+0kGFjAf2JPGzXqzGKaoyWu5hdyIlB5oGViO4BkDvp/oxR2p4N5bxRJm7/QnJ6ij/UeZ5sknCULwOWzp5Oukaonsg+mqYQZBws0XmzFKuuQCp7DugFBGYFmNDUpchvgfOBesc4/etiRcserIYzFjHoDNr0yNoQn5LSJEtL2rvpt4TfKF7BbYY5+UeqrOR+nhF7WrE7uwTei5IdFQdcuLdOGgB1POGh5aWVHOSbSKhcRQWlhfO9hQha76fn8gzn/EJ/pwuNp8U7UyDCUqyW4Of8jN6ncBpDwayDGzR06ZicAE0n5Psxd69Dh2tukCA3tm0VCWYMj6eEqNNJWvfNd1Vji55AQTjkKQ+M60OyJP58Kmm6a8xfdB/EeBYHNS9JEanXO7JJwgBUvxM=" - -cache: - directories: - - "$HOME/.m2" - -install: mvn clean install -DskipTests=true -V -U -script: mvn test - -after_success: -# Deploy to OSSHR -- if [[ $TRAVIS_PULL_REQUEST == "false" && ($TRAVIS_BRANCH == "master" || $TRAVIS_TAG) ]]; then - openssl aes-256-cbc -K $encrypted_f0ab9142a6a6_key -iv $encrypted_f0ab9142a6a6_iv -in gpg.tar.gz.enc -out gpg.tar.gz -d; - tar xvf gpg.tar.gz; - mvn source:jar javadoc:jar deploy -Pdeploy -DskipTests=true --settings ./settings.xml; - fi diff --git a/README.md b/README.md index 09ae944..deca78f 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Additional resources: com.kumuluz.ee.jcache kumuluzee-jcache-caffeine - 1.0.0 + ${kumuluzee-jcache-caffeine.version} ``` diff --git a/caffeine/pom.xml b/caffeine/pom.xml index 766041c..1e08efc 100644 --- a/caffeine/pom.xml +++ b/caffeine/pom.xml @@ -5,7 +5,7 @@ kumuluzee-jcache com.kumuluz.ee.jcache - 1.1.0-SNAPSHOT + 2.0.0-SNAPSHOT 4.0.0 diff --git a/common/pom.xml b/common/pom.xml index a9594ac..e4bf258 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ kumuluzee-jcache com.kumuluz.ee.jcache - 1.1.0-SNAPSHOT + 2.0.0-SNAPSHOT 4.0.0 diff --git a/gpg.tar.gz.enc b/gpg.tar.gz.enc deleted file mode 100644 index 72336ea..0000000 Binary files a/gpg.tar.gz.enc and /dev/null differ diff --git a/pom.xml b/pom.xml index a3e8394..7879502 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.kumuluz.ee.jcache kumuluzee-jcache - 1.1.0-SNAPSHOT + 2.0.0-SNAPSHOT common caffeine @@ -23,11 +23,11 @@ https://ee.kumuluz.com - 1.8 - 1.8 + 11 + 11 UTF-8 - 3.6.0 + 4.0.0 1.1.1 2.8.1 @@ -49,10 +49,10 @@ - cen1 - cen1 - cen.is.imba@gmail.com - https://github.com/cen1 + KumuluzEE Development Team + kumuluz + info@kumuluz.com + https://github.com/kumuluz @@ -70,6 +70,19 @@ + + + sonatype-snapshots + OSS Sonatype repo (snapshots) + https://oss.sonatype.org/content/repositories/snapshots/ + + false + + + true + + + @@ -142,6 +155,12 @@ sign + + + --pinentry-mode + loopback + + diff --git a/settings.xml b/settings.xml index a0fc533..b2948e1 100644 --- a/settings.xml +++ b/settings.xml @@ -25,8 +25,6 @@ 8DCC0AFC - ~/build/${env.TRAVIS_REPO_SLUG}/gpg.key - ~/build/${env.TRAVIS_REPO_SLUG}/gpg.pub ${env.GPG_PASSPHRASE}