Bug Fixes (#248)

* fixed lock name

* #256 fix: do not override the message converter set in the factory

* change env name for maven central

* remove copyright

* add copyright to files

* rename Size to Number of Messages

* test fix

* publish setup

---------

Co-authored-by: Admin <admin@MacPro.local>

Author: sonus21

.circleci/config.yml

@@ -124,8 +124,8 @@ executors:
       # Customize the JVM maximum heap limit
       JVM_OPTS: -Xmx6400m
       TERM: dumb
-      ORG_GRADLE_PROJECT_sonatypeUsername: xxx
-      ORG_GRADLE_PROJECT_sonatypePassword: xxx
+      ORG_GRADLE_PROJECT_mavenCentralUsername: xxx
+      ORG_GRADLE_PROJECT_mavenCentralPassword: xxx
       USER_NAME: rqueue
       REDIS_RUNNING: "true"
 

build.gradle

@@ -1,18 +1,14 @@
 plugins {
     id "jacoco"
-    id "com.github.kt3k.coveralls" version "2.12.0"
-    id "nebula.optional-base" version "7.0.0"
+    id 'com.github.kt3k.coveralls' version '2.12.2'
     id "com.adarshr.test-logger" version "3.2.0"
     id "org.gradle.test-retry" version "1.5.0"
 }
 
 allprojects {
     apply plugin: "idea"
     apply plugin: "java-library"
-    apply plugin: "maven-publish"
-    apply plugin: "signing"
     apply plugin: "jacoco"
-    apply plugin: "nebula.optional-base"
     apply plugin: "com.adarshr.test-logger"
     apply plugin: "org.gradle.test-retry"
 
@@ -21,6 +17,7 @@ allprojects {
 
     repositories {
         mavenCentral()
+        mavenLocal()
     }
 }
 
@@ -31,7 +28,7 @@ ext {
     microMeterVersion = "1.10.2"
 
     // logging dependencies
-    lombokVersion = "1.18.24"
+    lombokVersion = "1.18.30"
     logbackVersion = "1.4.5"
     sl4jVersion = "2.0.6"
 
@@ -72,7 +69,7 @@ ext {
 
 subprojects {
     group = "com.github.sonus21"
-    version = "3.2.0-RELEASE"
+    version = "3.3.0-RELEASE"
 
     dependencies {
         // https://mvnrepository.com/artifact/org.springframework/spring-messaging
@@ -126,10 +123,10 @@ task codeCoverageReport(type: JacocoReport, group: "verification", description:
     }
 
     reports {
-        csv.enabled = false
-        html.enabled = System.getenv("CIRCLECI") != "true"
-        xml.enabled = System.getenv("CIRCLECI") == "true"
-        xml.destination = file("${buildDir}/reports/jacoco/test/jacocoTestReport.xml")
+        xml.required = System.getenv("CIRCLECI") == "true"
+        csv.required = false
+        html.required = System.getenv("CIRCLECI") != "true"
+        xml.outputLocation = file("${buildDir}/reports/jacoco/test/jacocoTestReport.xml")
     }
 
     afterEvaluate {

gradle/code-publish.gradle

@@ -0,0 +1,18 @@
+afterEvaluate {
+    publishing {
+        publications.withType(MavenPublication).configureEach {
+            pom.withXml {
+                def optionalDeps = [
+                        'org.springframework.boot:spring-boot-starter-actuator',
+                        'io.micrometer:micrometer-core'
+                ]
+                asNode().dependencies.dependency.findAll {
+                    var dep = it.artifactId.text() + ":" + it.groupId.text()
+                    optionalDeps.contains(dep)
+                }.each {
+                    it.appendNode('optional', 'true')
+                }
+            }
+        }
+    }
+}

gradle/code-signing.gradle

@@ -1,19 +1,3 @@
-/*
- * Copyright (c) 2021-2023 Sonu Kumar
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 tasks.named('jar') {
     manifest {
         attributes(

gradle/packaging.gradle

@@ -35,10 +35,10 @@ test {
     }
 
     reports {
-        junitXml.enabled = true
-        junitXml.destination = file("$buildDir/reports/junit/xml")
-        html.enabled = System.getenv("CIRCLECI") != "true"
-        html.destination = file("$buildDir/reports/junit/html")
+        junitXml.required = true
+        junitXml.outputLocation = file("$buildDir/reports/junit/xml")
+        html.required = System.getenv("CIRCLECI") != "true"
+        html.outputLocation = file("$buildDir/reports/junit/html")
     }
 
     retry {

gradle/test-runner.gradle

@@ -1,20 +1,6 @@
-#
-# Copyright (c) 2023 Sonu Kumar
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# You may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and limitations under the License.
-#
-#
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.jar

@@ -1,19 +1,19 @@
 #!/bin/sh
 
 #
-# Copyright (c) 2023 Sonu Kumar
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
-# You may not use this file except in compliance with the License.
+# you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     https://www.apache.org/licenses/LICENSE-2.0
+#      https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and limitations under the License.
-#
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 
 ##############################################################################
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -205,6 +209,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.