Merge branch 'main' into feat/add-thumbnail-router

application/build.gradle

@@ -198,11 +198,12 @@ tasks.named('generateOpenApiDocs') {
 }
 
 def name = 'halo'
+def branchName = grgit.branch.current().name.replaceAll("/", "-")
 def tagName = "${project.version}-cnb"
 def isRelease = Objects.equals(project.findProperty('release'), 'true')
 if (!isRelease) {
     name = 'halo-dev'
-    tagName = "cnb-sha-${grgit.head().abbreviatedId}"
+    tagName = "sha-${grgit.head().abbreviatedId}-cnb"
 }
 
 tasks.register('publishToGhcr', BootBuildImage) {
@@ -211,7 +212,7 @@ tasks.register('publishToGhcr', BootBuildImage) {
     imageName = "ghcr.io/halo-dev/${name}:${tagName}"
     publish = StringUtils.hasText(System.getenv('GHCR_TOKEN'))
     if (!isRelease) {
-        tags = ["ghcr.io/halo-dev/${name}:cnb-main".toString()]
+        tags = ["ghcr.io/halo-dev/${name}:${branchName}-cnb".toString()]
     }
     docker {
         publishRegistry {
@@ -228,7 +229,7 @@ tasks.register('publishToDockerHub', BootBuildImage) {
     imageName = "halohub/${name}:${tagName}"
     publish = StringUtils.hasText(System.getenv('DOCKER_TOKEN'))
     if (!isRelease) {
-        tags = ["halohub/${name}:cnb-main".toString()]
+        tags = ["halohub/${name}:${branchName}-cnb".toString()]
     }
     docker {
         publishRegistry {

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
         -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 

gradlew.bat

@@ -70,11 +70,10 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell