Merge pull request #6 from spt-development/feature/upgrade-spring-boot-2.7.2

Updated dependencies to align with Spring Boot 2.7.2

Author: SimonTaylor

.travis/maven-settings.xml renamed to .github/maven-settings.xml

@@ -11,8 +11,8 @@
         </server>
         <server>
             <id>github.com</id>
-            <username>${env.GITHUB_USERNAME}</username>
-            <password>${env.GITHUB_TOKEN}</password>
+            <username>${env.GIT_HUB_USERNAME}</username>
+            <password>${env.GIT_HUB_TOKEN}</password>
         </server>
     </servers>
     <profiles>

.github/workflows/build.yml

@@ -0,0 +1,79 @@
+name: spt-development-logging-spring
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set up JDK 18
+        uses: actions/setup-java@v3
+        with:
+          java-version: '18'
+          distribution: 'adopt'
+
+      - name: Build with Maven
+        run: mvn clean install -B
+
+  release:
+    runs-on: ubuntu-latest
+    needs: build
+    if: github.ref == 'refs/heads/main'
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set up JDK 18
+        uses: actions/setup-java@v3
+        with:
+          java-version: '18'
+          distribution: 'adopt'
+          
+      - name: Determine version
+        run: echo "POM_VERSION=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec | sed -e 's/-SNAPSHOT//')" >> $GITHUB_ENV
+
+      - name: Import GPG key
+        id: import_gpg
+        uses: crazy-max/ghaction-import-gpg@v5
+        with:
+          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+          passphrase: ${{ secrets.GPG_PASSPHRASE }}
+
+      - name: Configure Git User for updating version
+        run: |
+          git config user.email "actions@github.com"
+          git config user.name "GitHub Actions"
+
+      - name: Create release
+        run: mvn --settings .github/maven-settings.xml release:prepare release:perform -DskipTests -Prelease -B
+        env:
+          OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
+          GIT_HUB_USERNAME: ${{ secrets.GIT_HUB_USERNAME }}
+          GIT_HUB_TOKEN: ${{ secrets.GIT_HUB_TOKEN }}
+          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+
+      - name: Create GitHub release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ env.POM_VERSION }}
+          release_name: ${{ env.POM_VERSION }}
+          draft: false
+          prerelease: false
+
+      - name: Upload GitHub release asset
+        id: upload-release-asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
+          asset_path: target/spt-development-logging-spring-${{ env.POM_VERSION }}.jar
+          asset_name: spt-development-logging-spring-${{ env.POM_VERSION }}.jar
+          asset_content_type: application/java-archive

.travis.yml

@@ -8,7 +8,7 @@
  logging-spring -----------------------------------------------------------------
 ````
 
-[![build_status](https://travis-ci.com/spt-development/spt-development-logging-spring.svg?branch=main)](https://travis-ci.com/spt-development/spt-development-logging-spring)
+[![build_status](https://github.com/spt-development/spt-development-logging-spring/actions/workflows/build.yml/badge.svg)](https://github.com/spt-development/spt-development-logging-spring/actions)
 
 A library for adding logging (at the start, end and on exception) to public methods of classes annotated with 
 `@RestController`, `@Service` or `@Repository` or methods annotated with `@JmsListener`.
@@ -50,9 +50,4 @@ To build the library, run the following maven command:
 Release
 =======
 
-To build a release and upload to Maven Central run the following maven command:
-
-    $ export GPG_TTY=$(tty) # Required on Mac OS X
-    $ mvn deploy -DskipTests -Prelease
-
-NOTE. This is currently a manual step as not currently integrated into the build.
+To build a release and upload to Maven Central push to `main`.

.travis/gpg.asc.enc

@@ -12,6 +12,13 @@
     </ignoreVersions>
 
     <rules>
+        <!-- Dependencies aligned with Spring Boot -->
+        <rule groupId="org.aspectj" artifactId="aspectjweaver" comparisonMethod="maven">
+            <ignoreVersions>
+                <ignoreVersion type="regex">.*</ignoreVersion>
+            </ignoreVersions>
+        </rule>
+
         <!-- Test dependencies aligned with Spring Boot -->
         <rule groupId="org.mockito" artifactId="mockito-core" comparisonMethod="maven">
             <ignoreVersions>

README.md

@@ -34,7 +34,7 @@
         <!-- Dependency versions -->
         <aspectj.version>1.9.7</aspectj.version>
         <slf4j.version>1.7.36</slf4j.version>
-        <spring.version>5.3.20</spring.version>
+        <spring.version>5.3.22</spring.version>
         <spt-cid.version>2.0.11</spt-cid.version>
 
         <!-- Test dependency versions -->
@@ -347,7 +347,7 @@
                 <version>${maven-release-plugin.version}</version>
                 <configuration>
                     <goals>deploy</goals>
-                    <scmCommentPrefix>[skip travis] [maven-release-plugin] </scmCommentPrefix>
+                    <scmCommentPrefix>[skip ci] [maven-release-plugin] </scmCommentPrefix>
                     <tagNameFormat>@{project.version}</tagNameFormat>
                 </configuration>
             </plugin>