Merge pull request #71 from boxheed/develop

Updated dependencies and moved to conventional commits

.circleci/config.yml

@@ -45,8 +45,9 @@ jobs:
           name: setup
           command: source <(curl -s https://raw.githubusercontent.com/boxheed/shippable-scripts/master/java-build-ci-setup)
       - checkout
-      - run: ./gradlew createRelease
-      - run: git push --tags
+      - run: ./gradlew tagSemver
+      - run: git checkout develop && git merge $CIRCLE_BRANCH 
+      - run: git push --atomic origin $CIRCLE_BRANCH develop --tags
 
   publish:
     docker:
@@ -86,4 +87,4 @@ workflows:
             branches:
               ignore: /.*/
             tags:
-              only: /^release-\d+\.\d+\.\d+$/       
+              only: /^v\d+\.\d+\.\d+$/       

.gitignore

@@ -52,3 +52,7 @@ gradle-app.setting
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 replay_pid*
+
+.LCKbuild.gradle~
+.osv-scanner
+.git-semver

build.gradle

@@ -9,7 +9,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath ('com.fizzpod:gradle-plugin-opinion:17.0.10') {
+        classpath ('com.fizzpod:gradle-plugin-opinion:18.0.1') {
             exclude group: 'com.fizzpod', module: 'gradle-gitignore-plugin'
         }
     }

buildSrc/build.gradle

@@ -4,5 +4,5 @@ repositories {
 
 dependencies {
 	testImplementation 'junit:junit:4.13.2'
-	testImplementation(group: 'org.hamcrest', name: 'hamcrest-library', version: '2.2')
+	testImplementation(group: 'org.hamcrest', name: 'hamcrest-library', version: '3.0')
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

settings.gradle

@@ -5,7 +5,7 @@ include 'api'
 include 'services:webservice'
 */
 plugins {
-  id "com.gradle.enterprise" version "3.17.4"
+  id "com.gradle.develocity" version "3.18"
   id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
 }