Skip to content

Commit fb58654

Browse files
authored
Update tasks for Java 25 (#237)
1 parent 1c847d7 commit fb58654

File tree

6 files changed

+9
-19
lines changed

6 files changed

+9
-19
lines changed

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,12 @@ on how to do that, including how to develop and test locally and the versioning
1313

1414
## Release Notes
1515

16-
### 7.X.X
16+
### TBD
1717
*Released*: TBD
1818
(Earliest compatible LabKey version: 25.10)
1919
- Remove `ContainerListener` from module template
20+
- Java 25: Remove obsolete JVM flags from tasks (`-Xdebug`, `-Xnoagent`, `-Xrunjdwp`, `-Djava.compiler`)
21+
- Java 25: Update gradle wrapper to 9.2.1
2022

2123
### 7.1.0
2224
*Released*: 17 October 2025

gradle/wrapper/gradle-wrapper.jar

1.65 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main/groovy/org/labkey/gradle/plugin/TeamCity.groovy

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,12 @@
1515
*/
1616
package org.labkey.gradle.plugin
1717

18-
import com.sun.jdi.AbsentInformationException
19-
import com.sun.jdi.Bootstrap
20-
import com.sun.jdi.IncompatibleThreadStateException
21-
import com.sun.jdi.ObjectReference
22-
import com.sun.jdi.StackFrame
23-
import com.sun.jdi.ThreadReference
24-
import com.sun.jdi.VMDisconnectedException
25-
import com.sun.jdi.VirtualMachine
18+
import com.sun.jdi.*
2619
import com.sun.jdi.connect.AttachingConnector
2720
import com.sun.jdi.connect.Connector
2821
import com.sun.jdi.connect.IllegalConnectorArgumentsException
2922
import org.apache.commons.lang3.SystemUtils
30-
import org.gradle.api.AntBuilder
31-
import org.gradle.api.GradleException
32-
import org.gradle.api.Project
33-
import org.gradle.api.Task
34-
import org.gradle.api.UnknownTaskException
23+
import org.gradle.api.*
3524
import org.gradle.api.file.DeleteSpec
3625
import org.gradle.api.logging.Logger
3726
import org.gradle.api.provider.Provider
@@ -82,7 +71,7 @@ class TeamCity extends Tomcat
8271
project.tomcat.disableRecompileJsp = true
8372
project.tomcat.ignoreModuleSource = !(Boolean) extension.getTeamCityProperty("allowResourceReloading", false)
8473
project.tomcat.debugPort = extension.getTeamCityProperty("tomcat.debug") // Tomcat intermittently hangs on shutdown if we don't specify a debug port
85-
project.tomcat.catalinaOpts = "-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=${project.tomcat.debugPort} -Dproject.root=${project.rootProject.projectDir.absolutePath} -Xnoagent -Djava.compiler=NONE"
74+
project.tomcat.catalinaOpts = "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=${project.tomcat.debugPort} -Dproject.root=${project.rootProject.projectDir.absolutePath}"
8675

8776
addTasks(project)
8877
}

src/main/groovy/org/labkey/gradle/task/RunUiTest.groovy

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ abstract class RunUiTest extends Test
5353
void setJvmArgs()
5454
{
5555
List<String> jvmArgsList = ["-Xmx512m",
56-
"-Xdebug",
57-
"-Xrunjdwp:transport=dt_socket,server=y," +
56+
"-agentlib:jdwp=transport=dt_socket,server=y," +
5857
"suspend=${testExt.getTestConfig("debugSuspendSelenium")}," +
5958
"address=${testExt.getTestConfig("selenium.debug.port")}",
6059
"-Dfile.encoding=UTF-8",

0 commit comments

Comments
 (0)