Skip to content

Commit

Permalink
Update all the things
Browse files Browse the repository at this point in the history
  • Loading branch information
ultraq committed Jan 28, 2025
1 parent 5376c63 commit 1d761f2
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 22 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ allprojects {
version = '3.4.0-SNAPSHOT'

ext {
groovyVersion = '4.0.18'
thymeleafVersion = '3.1.2.RELEASE'
groovyVersion = '4.0.25'
thymeleafVersion = '3.1.3.RELEASE'
}
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
19 changes: 12 additions & 7 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,8 @@ done
# 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"'
# 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

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down Expand Up @@ -133,26 +131,29 @@ location of your Java installation."
fi
else
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi

# Increase the maximum file descriptors if we can.
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
# 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
# shellcheck disable=SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -197,6 +198,10 @@ if "$cygwin" || "$msys" ; then
done
fi


# 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"'

# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
Expand Down
6 changes: 3 additions & 3 deletions thymeleaf-layout-dialect-benchmark/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ import java.time.LocalDateTime

plugins {
id 'groovy'
id 'org.springframework.boot' version '3.1.3'
id 'org.springframework.boot' version '3.4.2'
id 'com.github.psxpaul.execfork' version '0.2.2'
}
apply plugin: 'io.spring.dependency-management'
apply from: 'https://raw.githubusercontent.com/ultraq/gradle-support/4.3.1/gradle-support.gradle'
apply from: 'https://raw.githubusercontent.com/ultraq/gradle-support/4.3.2/gradle-support.gradle'

description = 'A basic web application to test the performance of the Thymeleaf Layout Dialect'

Expand All @@ -43,7 +43,7 @@ dependencies {

java {
toolchain {
languageVersion = JavaLanguageVersion.of(17)
languageVersion = JavaLanguageVersion.of(21)
}
}

Expand Down
2 changes: 1 addition & 1 deletion thymeleaf-layout-dialect-benchmark/test/simulate-load.jmx
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<stringProp name="HTTPSampler.port"></stringProp>
<stringProp name="HTTPSampler.protocol"></stringProp>
<stringProp name="HTTPSampler.contentEncoding"></stringProp>
<stringProp name="HTTPSampler.path">/test/</stringProp>
<stringProp name="HTTPSampler.path">/test</stringProp>
<stringProp name="HTTPSampler.method">GET</stringProp>
<boolProp name="HTTPSampler.follow_redirects">true</boolProp>
<boolProp name="HTTPSampler.auto_redirects">false</boolProp>
Expand Down
16 changes: 8 additions & 8 deletions thymeleaf-layout-dialect/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ plugins {
id 'maven-publish'
id 'idea'
}
apply from: 'https://raw.githubusercontent.com/ultraq/gradle-support/4.3.1/gradle-support.gradle'
apply from: 'https://raw.githubusercontent.com/ultraq/gradle-support/4.3.1/maven-publish-support.gradle'
apply from: 'https://raw.githubusercontent.com/ultraq/gradle-support/4.3.2/gradle-support.gradle'
apply from: 'https://raw.githubusercontent.com/ultraq/gradle-support/4.3.2/maven-publish-support.gradle'

description = 'A dialect for Thymeleaf that allows you to use layout/decorator templates to style your content.'
group = 'nz.net.ultraq.thymeleaf'
Expand All @@ -38,20 +38,20 @@ configurations.all {

dependencies {
api "org.apache.groovy:groovy:${groovyVersion}"
implementation 'nz.net.ultraq.groovy:groovy-extensions:2.2.0'
implementation 'nz.net.ultraq.groovy:groovy-extensions:2.3.3'
implementation 'nz.net.ultraq.thymeleaf:thymeleaf-expression-processor:3.2.0'
implementation "org.thymeleaf:thymeleaf:${thymeleafVersion}"
implementation 'org.slf4j:slf4j-api:2.0.11'
implementation 'org.slf4j:slf4j-api:2.0.16'

codenarc 'org.codenarc:CodeNarc:3.4.0-groovy-4.0'
testImplementation 'net.bytebuddy:byte-buddy:1.14.11'
codenarc 'org.codenarc:CodeNarc:3.5.0-groovy-4.0'
testImplementation 'net.bytebuddy:byte-buddy:1.16.1'
testImplementation 'nz.net.ultraq.thymeleaf:thymeleaf-testing-junit:5.2.0'
testImplementation 'org.objenesis:objenesis:3.3'
testImplementation 'org.objenesis:objenesis:3.4'
testImplementation 'org.reflections:reflections:0.10.2'
testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
testImplementation "org.thymeleaf.testing:thymeleaf-testing:${thymeleafVersion}"
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
testRuntimeOnly 'org.slf4j:slf4j-simple:2.0.11'
testRuntimeOnly 'org.slf4j:slf4j-simple:2.0.16'
}

java {
Expand Down

0 comments on commit 1d761f2

Please sign in to comment.