=== modified file 'admin.gradle' --- old/admin.gradle 2024-02-20 17:32:21 +0000 +++ new/admin.gradle 2025-12-09 10:35:24 +0000 @@ -86,7 +86,7 @@ task buildAdmin(type: JavaExec, dependsOn: [copyWebResources, copyGWTLibs]) { classpath p2jSrc + libs + files(adminBuildDir) - main 'com.google.gwt.dev.Compiler' + mainClass = 'com.google.gwt.dev.Compiler' if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) { jvmArgs '--add-opens','java.base/java.lang=ALL-UNNAMED' } @@ -98,7 +98,7 @@ // new SslConnectionFactory(..) task serveAdmin(type: JavaExec, dependsOn: copyWebResources) { classpath p2jSrc + libs + files(adminBuildDir) - main 'com.google.gwt.dev.DevMode' + mainClass = 'com.google.gwt.dev.DevMode' if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) { jvmArgs '--add-opens','java.base/java.lang=ALL-UNNAMED' } === modified file 'build.gradle' --- old/build.gradle 2025-11-18 17:53:44 +0000 +++ new/build.gradle 2025-12-09 12:17:26 +0000 @@ -468,7 +468,7 @@ if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_11)) { // latest AspectJ version - aspectjVersion = '1.9.24' + aspectjVersion = '1.9.25' } configurations.all { @@ -482,6 +482,13 @@ exclude group: 'commons-logging', module: "commons-logging" exclude group: 'org.slf4j', module: 'slf4j-simple' exclude group: 'xerces' + // Exclude old ASM versions to prevent classloader conflicts + exclude group: 'asm', module: 'asm' + exclude group: 'org.ow2.asm', module: 'asm-all' + + resolutionStrategy { + force 'org.ow2.asm:asm:9.9', 'org.ow2.asm:asm-commons:9.9', 'org.ow2.asm:asm-util:9.9' + } // remove apis already provided by java 11+ if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_11)) { @@ -581,8 +588,9 @@ fwdServer group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.14' fwdServer group: 'org.javassist', name: 'javassist', version: '3.30.2-GA' fwdServer group: 'org.jboss.spec.javax.transaction', name: 'jboss-transaction-api_1.1_spec', version: '1.0.1.Final' - fwdServer group: 'org.ow2.asm', name: 'asm', version: '9.7.1' - fwdServer group: 'org.ow2.asm', name: 'asm-util', version: '9.7.1' + fwdServer group: 'org.ow2.asm', name: 'asm', version: '9.9' + fwdServer group: 'org.ow2.asm', name: 'asm-commons', version: '9.9' + fwdServer group: 'org.ow2.asm', name: 'asm-util', version: '9.9' fwdServer group: 'com.mchange', name: 'c3p0', version: '0.9.5.5' fwdServer group: 'cglib', name: 'cglib', version: '3.3.0' fwdServer group: 'net.sf.ehcache', name: 'ehcache-core', version: '2.6.11' @@ -700,7 +708,9 @@ // javascript Nashorn has been removed from JDK15, so we need it back if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_15)) { antCompile "org.openjdk.nashorn:nashorn-core:15.4" - antCompile "org.ow2.asm:asm-util:9.7.1" + antCompile "org.ow2.asm:asm:9.9" + antCompile "org.ow2.asm:asm-commons:9.9" + antCompile "org.ow2.asm:asm-util:9.9" } antCompile "org.apache.ant:ant-antlr:1.10.14" aspectjCompile group: 'org.aspectj', name: 'aspectjtools', version: aspectjVersion @@ -1074,7 +1084,7 @@ task test(type: JavaExec) { classpath = configurations.fwdAllTest + files('build/test-classes', 'build/classes') - main = 'org.junit.platform.console.ConsoleLauncher' + mainClass = 'org.junit.platform.console.ConsoleLauncher' args '--scan-classpath=build/test-classes' } tasks['test'].dependsOn('ant-tests-compile') === modified file 'ext/sheet/build.gradle' --- old/ext/sheet/build.gradle 2025-10-08 21:44:58 +0000 +++ new/ext/sheet/build.gradle 2025-12-09 12:52:04 +0000 @@ -115,12 +115,22 @@ } } +configurations.all { + // Exclude old ASM versions to prevent classloader conflicts + exclude group: 'asm', module: 'asm' + exclude group: 'org.ow2.asm', module: 'asm-all' + + resolutionStrategy { + force 'org.ow2.asm:asm:9.9', 'org.ow2.asm:asm-commons:9.9', 'org.ow2.asm:asm-util:9.9' + } +} + dependencies { providedCompile(files(fwdBuild)) implementation "commons-lang:commons-lang:2.4" providedCompile "com.google.guava:guava:19.0" providedCompile "javax.servlet:javax.servlet-api:3.1.0" - providedCompile ("org.eclipse.jetty.aggregate:jetty-all:9.4.22.v20191022:uber") { + providedCompile ("org.eclipse.jetty.aggregate:jetty-all:9.4.57.v20241219:uber") { // only keep jetty-all exclude group: 'org.eclipse.jetty', module: 'jetty-alpn-client' exclude group: 'org.eclipse.jetty', module: 'jetty-annotations' @@ -207,10 +217,13 @@ implementation "org.bouncycastle:bcprov-jdk14:1.72" implementation "org.bouncycastle:bctsp-jdk14:1.46" implementation "org.bouncycastle:bcmail-jdk14:1.72" + // Align ASM versions with root project to avoid classloader conflicts + implementation "org.ow2.asm:asm:9.9" + implementation "org.ow2.asm:asm-commons:9.9" + implementation "org.ow2.asm:asm-util:9.9" } task fetchDependencies(type: Copy) { into ".lib" from configurations.compileClasspath, configurations.runtimeClasspath -} - +} \ No newline at end of file === modified file 'ext/sheet/gradle/wrapper/gradle-wrapper.properties' --- old/ext/sheet/gradle/wrapper/gradle-wrapper.properties 2025-11-18 17:53:44 +0000 +++ new/ext/sheet/gradle/wrapper/gradle-wrapper.properties 2025-12-09 12:19:03 +0000 @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists === modified file 'gradle/wrapper/gradle-wrapper.properties' --- old/gradle/wrapper/gradle-wrapper.properties 2025-11-18 17:53:44 +0000 +++ new/gradle/wrapper/gradle-wrapper.properties 2025-12-09 10:30:45 +0000 @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists === modified file 'src/com/goldencode/p2j/uast/CallGraphGenerator.java' --- old/src/com/goldencode/p2j/uast/CallGraphGenerator.java 2025-06-17 14:10:02 +0000 +++ new/src/com/goldencode/p2j/uast/CallGraphGenerator.java 2025-12-09 10:37:43 +0000 @@ -101,6 +101,7 @@ import com.goldencode.p2j.convert.*; import com.goldencode.p2j.pattern.*; import com.goldencode.p2j.util.osresource.*; +import org.apache.tinkerpop.gremlin.process.traversal.IO; import org.apache.tinkerpop.gremlin.structure.*; import org.apache.tinkerpop.gremlin.process.traversal.*; === modified file 'src/com/goldencode/p2j/ui/client/gui/driver/web/UploadHandler.java' --- old/src/com/goldencode/p2j/ui/client/gui/driver/web/UploadHandler.java 2025-08-22 06:33:23 +0000 +++ new/src/com/goldencode/p2j/ui/client/gui/driver/web/UploadHandler.java 2025-12-09 10:37:12 +0000 @@ -73,6 +73,7 @@ import org.eclipse.jetty.server.*; import org.eclipse.jetty.server.handler.*; import org.eclipse.jetty.util.*; +import org.eclipse.jetty.util.IO; import javax.json.*; import javax.servlet.*;