From 03e043f81c6e5a91be37371fb524da0a1c322f94 Mon Sep 17 00:00:00 2001 From: Simon Taylor Date: Thu, 14 Apr 2022 00:30:37 +0100 Subject: [PATCH] Updated dependencies to align with Spring Boot 2.6.6 and fully automated the release process --- .travis.yml | 56 +++++++++++++++++++++++++++++-------- .travis/gpg.asc.enc | Bin 0 -> 3808 bytes .travis/maven-settings.xml | 30 ++++++++++++++++++++ pom.xml | 31 ++++++++++++-------- 4 files changed, 93 insertions(+), 24 deletions(-) create mode 100644 .travis/gpg.asc.enc create mode 100644 .travis/maven-settings.xml diff --git a/.travis.yml b/.travis.yml index 1da57d4..7c31c4b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,21 +1,53 @@ language: java jdk: - - openjdk8 + - openjdk17 + +# Need a full git clone in order to be able to tag the release +git: + clone: false + +install: + - git clone https://github.com/$TRAVIS_REPO_SLUG.git $TRAVIS_REPO_SLUG + - cd $TRAVIS_REPO_SLUG + - git checkout $TRAVIS_BRANCH + - POM_VERSION=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec | sed -e 's/-SNAPSHOT//') + - openssl aes-256-cbc -K $encrypted_044baa266d1a_key -iv $encrypted_044baa266d1a_iv -in .travis/gpg.asc.enc -out .travis/gpg.asc -d + - gpg --fast-import .travis/gpg.asc + +env: + global: + # Environment variables referenced in .travis/maven-settings.xml. To encrypt and escape values correctly, run the following + # command and enter ENV_VAR=value when prompted: + # read -r && travis encrypt "$(printf %q "$REPLY")" + - secure: P2wr7U/GoEXXhQ7jZe3I+nrxAuUTjvkP0MZ63v5Oz+JBnfGyEux+cXHsKSEO9jSyNcewibzjwyoX1Qb/hJ7VrxsV0cA3DT6rUCKkOGyb1SoC/rkisEJEQuYGTZYtSPMQ0agBWSR/Pyw5M3M6IBQDZ4lQMWMHnhkQDNoTi0TvprSRjLXI5novQx1dFUU3VyTmc9dovNrjoFWsxCn1DeNYpfZfFBXvK0lHdZFyMfQKNy+Or9Bvb/K+HFmWP0xvUCZz2/ZEAoXEKx4rfR7ZRfFIxN/x4DmqpS1ReFVH6ASsO+CwQuwVPXnX7HQxQllm7FrImxZjqap4CfTj9ce3vUQP4pVK82il6IVJIMfQO+YYhMDfC6IwrQLHuED5EWcuX6jIOcNuNYXzMiBzxGv8+fSt4SLnGMCe6QIOmh0OuBFutAI/eH2E4yNi4KPnBHwCn9+dcMjw7UlOa/c+PBmcSa4STrC5hUR8DlMjyYPNwaZRFROLY2Ezz0cGQd42BQkAnTc9tTDCpyBAaU8pJlh7qZEr+exLbpaceK53nKesyIftnw72zPGCTffwy4qPAQmTxE/ifM0wRNbhsytLq3ewNZaNb6/tdm7WpEnx5nCG4DvgsqCaD+r+SogETInZ3ICDqnATjYDwUaDLHU0XNGtSAZSt1BwjH2YgsAMxrO6Qp+kIfok= + - secure: j/yy67LPHCuS5CqkDtcJKwtR7uD1eMo3arLZKMjDpwth2+JzFDqQNu3Ai2vd7zMrVANJxjROV8APxLRp+xB4fKLW7WDCjuI+qce74CqwwA3ViN25JYRJt7y8qXy3smNpjPdFzhM5HDRSA40Ju9UAaijRUotWQWd+kgneu+Z9X2kdZHCUcXoSZMCnNZQUGvPsmW+2YzOgyA/KlZ5g99dyJCte9sxjJx+swc4mtemxs7LBBeN+CG9uHMYex72AVq8VKGwYQQJckP7PsW8/CbdSBe+gG1G9x96mpYjRRa/Y/cR14wS7InYVS3JyRtRqwqHtwrnZs6Y3unVPbseD72SdAswNmxIC8VhisKFlR5+ZBWEUj7R9RCOMjaaSMtaRKVCp8zeFFiplfazXzMO2nEZ0vIbetwTToHEf38AAIYyKJlkGWxIbATVku6R7lKB9KwFpMcgnGUsiQIKlJR6LA9t/v4jkDyqABFAT7HdTDKSBL3PdiD6jidRI3MB8Pycxs/epAUIWbB0NyGl3fxJ6CrT7ZyiVOAo8EuWq+Z4bOF6rEtH+3oXlC/VHybkOYAH2+6R0uKDiDRjmxvZMFqFafYjRbnfRWUjtPERDVeRrhgVsTW3JtF/cWwJyv9FQfUbyDBVSlN0RWswX7MrEvMY6JkgLDZjhoaWF3gYtCv4sS5drxeI= + - secure: A6vBxO82Q2mu2p/cRy+4LAjwxxMBf2fjjNBUl71QMfAVVQm2iJXpqfy7nmvnbFtiw+FI6aWBITuLLAMtMVqzqZgj6EjzNffbYkBS7rzAeBJwrLGl1YxnCJCUeGHrdlcQndcMYVUtX1fsxPwra9bsLYJkYltG+w4GWCkfUGRZYWwvGISEumMqu2srf8oe5+ke576dSqmrUqTPR+a3GFuY9jbGI+BOkE5ogAJOls1BpvLebTFTT21mx87TNQzyGS9OnYms2zSOPWfTHd6kwayLHdabN1f1rmxSQOA4wWH8Pi3En+QBWFG7SRSgJRI4SkWqggxvM8/QUFboA5x7QbX1H26MB14hZamuA14KGB4F6j0c1WyqCGXO+cjQo/aHJdbs6KXnkpPgtk+K9BgoyuIMEKbNTcOLALgByRmgFrpC1mF6VOtruu1RUtb62SH4jk+lIssVOBEH3x05WBAARCT6B7TI1shoY60AHScI/OSNDUFoZxJ1ep8iX/7ep2+nVH+o3R8oE5+igFx6jLGdXZzmqwfmDhbustIxn3o1LUwcVRroS/i1Y5qCzv/40CS9/Qcap/P6ECfQTJ0nuIJDrlYYLNdURq4kDz87E3fDtZfViY1os95SyQ9Ht4WPZNlnaY2Pn1ExLgnqq48OC3EUh2zJK0+JLYmMzo4X16SBjondJ+I= + - secure: aOygIO1zECTraNsXt2IoOlGHZ1ql3lILfmKNDs6kgAMP7G9CbnphQEHl6yZ8Ff0S6iacjS5hxhHO8yV9f3xModZP9RarQJEfd2jU3qY2zaJTGtTtCWPjQQ0LAnUeUxoSuaiQ/8YxSNTpjXkrMb2mJirr9Cny/JoEb+xe/RNlUznIP3/G7lCqvIt5Z+RJmN3ah3hlOCirx8A+kTgwLI33oQmxFVKlMr6JDj3q5a6d64P947t6s42Dxr9KTdX/dN4ArgjSmv+girqpFhTyBeNH9LgUF0zXia8mSGbPcc+ksY3w01q+zRZsNbTlkhyW2HXqWY/LScvyipW196vNWJM2Kft7itqU+OeLjOjNtbIZWkOYP5O35giDNmYUEhE/UyKC37OZ0fau9uHZNWCtGlHlWPEEItzi6aptXXmUBg73tPHr1JPfuJdirFe+O5D5Dc4tmCf/8kj3snKArXT8EQF6N9TqxroF+OnGsiGvoCr5RyAFke3FZSLIb1ODdFKLcRFZ37KPw+AZDkg6oPkXJIEidtQHRFYTQSseEBzxjvMKm/YWgNUgegsHiQ14LxU8EdPPGA8KKYdqNNoOel1HhOfDjbYvMvHvU825MNwHu0Hm1Yep0AM1YZD0lFlN9govRtYHiP11EGXqVYjgR7maaAwY/u0tItXqaeZckNw6tBfaYRQ= + - secure: ITB0Yfy4gjKw2xn2mbo8D/fK5w0yC+TR1pmaI9DHctks20tMZotVaeRlv3qHpbHbo7wY8Fh0FYWBqEdrmkswoqbPJDCiw1lgJBIlSLteF+gNVKWB9Hqx9roTCMXk2qI3Q1K2WIf+YjDwF9BXJ+w7GS2KAPi8Il5HMCPxmg0U9ON9B+khAW3oUFcPZBVf/AfRe5fVAsHsbbQkywnU/PSJtEf1Km8kGWfFDQAalfbmwrekukSD5mu1cmaKnES1y5i4yz36hUhFOoAZj08HXj+VfvIS6LZ+0bdySZsIdb/JZ2OyM+rGTV9hHdcH+cdNl81OXcxWKdavAR5zK0y4CWxLqQ7t8sEqXHxYB9nM6C8EBYXqfZaAaG7QG24BYBW7w9Ah7mbwb12mLYTunZ0P+g4ShXX7nCe0EBAld0NLny+P/hFRFLuAM4c4SM7LsriFlE9+eEltmAT6Zyel2f51ERG95z8wg9s2SWao9VQivudD6s0M03l4add4fcqf55Tn/IJ55ssw3OscxJveN8Rtnf/78ekQVerrBm9ka1UfZIWMGHLGSyzadkY7jyaxEWkwZfP8FXe42WIP0wSiLkPohMIAjevSgmMn/Ljxuc3b7A1ZjAUCuYJUaSheph4tNmtM8GcvfGjFnF9b5e4ajAeLKOgplfVykspf8H2H5Vk7bL3s/2w= script: - - mvn test -B + - mvn clean install -B before_deploy: - - POM_VERSION=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec) + # Set tag to be used by releases provider + - export TRAVIS_TAG=$POM_VERSION -# Releases config copied from https://docs.travis-ci.com/user/deployment/releases/ and secure key generated by following -# https://stackoverflow.com/questions/25302518/travis-ci-setup-releases-with-github-token#answer-57032190 deploy: - provider: releases - api_key: - secure: FamDJ2uxEL83Lx7zBot2pmuD32p8DtU8p8WsWzv9mLzO4U5QUMhWtAxMRuDTZQQg6/SiN7Ph7RQiIfMU8P2pdEDChhclRErcdEAwPGT2fuUuumYU4ZZNzk4hQo2NKd8Yz7sCIn1LFTgqDpjjlY70nS+7LW0Eski886GLMrgYJS9cyhkyMvBm0Hch5rAyZdhYts/EHKyMxbZBCwPY+pmgaaFxTmP6+Id4henwt1xfFPEaqEg+142BALEOVAkO+/KEObwoj0ITMy+zkK1m/V9/o3v59am1F1BUYzEH8PdBFnxG5R/Q9yE2rtsQIppHOXiaBm3Vew0RZ1IC22bexOPih1b/hB3nvUrvnXQhhFalOln1FcpnQaSOVkbzB7wNDhESg4qSVoTUzndLO5CbFYitNGVJ9gt6qvbwUIupTQo5hQCCXFIvEWMsBilftCm7KQPNxoKLdzUk+/Eps2wg94f8+by1B0L8XnKUiUIDcHy6TdjYL+pS15Owc9W6FalvY2l/FoElcVuEY9TBFiAngx/LMZxIoVFcc4zlEyEFYh6SfiKx5rQN5XnKdI0FxvFFw29h5ZN1Y9LRlV0xw0TMd3YketfZDQNYg3Kmz7qZ2eDTkEoKuZyDvY3mNp9kIQLSVWkqFA1oj00IA+mkwCGvDLukM5oJxyAxIbo9APUk5x5C26o= - file: "target/spt-development-logging-spring-${POM_VERSION}.jar" - skip_cleanup: true - on: - tags: true + # For any checkin to main branch, create a final version, tag it and push the artifacts to Sonatype + - provider: script + skip_cleanup: true + script: + mvn --settings .travis/maven-settings.xml release:prepare release:perform -DskipTests -Prelease -B + on: + branch: main + + # Releases config copied from https://docs.travis-ci.com/user/deployment/releases/ and secure key generated by following + # https://stackoverflow.com/questions/25302518/travis-ci-setup-releases-with-github-token#answer-57032190 + - provider: releases + api_key: + secure: U3DNN/NkzVD4N2rQsOCPm+LJznMTuxvZD0gPzs0v8I6ULCEYpXu6x50p+47apQnNLLFSlbB6oR8Sv06IfwijCS8QZTB3K0pkSkeO6COSFkS2f+8+zY11sS8rJPllrU8dKsU+TIx4sEujel37XXCYQQ/8FovPVfNs3GePs0P3a6Ry1dYBV4p4FdC+Ctat8q3zCwl3+CjX0/4rjVwqYiif78xJvB0PuC9lYYMMehQvVVBdpSCemkaPiS8EpZQZjS2Dv/NP6001+ODCPcGwqnGZ9X18uKrIKzmHgh4KpYUrrRyppxxM5nZsFL1gP0ob60KO2TPEssamIxYjQw4CpTCsxm0h6cJ08NOF6KyCFVX6TKrqZMT7SFEK6SZZtuvdgOZ7bhNsjUBjQkUscg46J+kcmoEw6rdHGWzTrKQ2UTfpcP4VkQEcLnJZ83oG9WM5AAoNsplLPQe0zHQyzufL6G8ye8pRjrjaZHKbKgXGXjYu7CIh1tGyaJRplA3NBB9l62CFMVj9fiVd8q56DwH8kMFSoV9pX2LxVyXzZbbdHEQOiOLa6UKhmDCQ+hnHeIFnnTtb++q4y9ZRarAepbddH2ibO+eANEJQvQgTQmy9CF63D6WrPn/2hw/QK8qhSYeqvnfoWi7ZH17m/nkXZwa4zjtg/sxzfx70XwjmtJQldmUyTdk= + file: "target/spt-development-logging-spring-${POM_VERSION}.jar" + skip_cleanup: true + on: + branch: main diff --git a/.travis/gpg.asc.enc b/.travis/gpg.asc.enc new file mode 100644 index 0000000000000000000000000000000000000000..fdbdb113dadb0bb0547070ab7a3b3b52cb806531 GIT binary patch literal 3808 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 + + + + + ossrh + ${env.OSSRH_USERNAME} + ${env.OSSRH_PASSWORD} + + + github.com + ${env.GITHUB_USERNAME} + ${env.GITHUB_TOKEN} + + + + + ossrh + + true + + + gpg + ${env.GPG_PASSPHRASE} + + + + diff --git a/pom.xml b/pom.xml index 2b3c096..b84eb7d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.spt-development spt-development-logging-spring - 2.0.2 + 2.0.3-SNAPSHOT logging-spring A very simple library for getting/setting the current correlation ID, utilising ThreadLocal. @@ -29,19 +29,18 @@ UTF-8 UTF-8 - 8 - 8 + 8 - 1.9.7 - 1.7.32 - 5.3.12 - 2.0.0 + 1.9.9.1 + 1.7.36 + 5.3.18 + 2.0.11 2.2 - 5.7.2 - 1.2.6 + 5.8.2 + 1.2.11 3.9.0 @@ -54,10 +53,10 @@ 3.0.0 1.6 3.2.0 + 3.0.0-M5 3.2.1 2.22.2 - 1.6.8 - 1.7.2 + 1.6.13 4.2.3 2.8.1 @@ -65,7 +64,6 @@ 9.2 9.0.1 1.11.3 - 0.15 @@ -346,6 +344,15 @@ ${versions-maven-plugin.version} + + maven-release-plugin + ${maven-release-plugin.version} + + deploy + [skip travis] [maven-release-plugin] + @{project.version} + +