9686a.patch
| new/admin.gradle 2025-12-09 10:35:24 +0000 | ||
|---|---|---|
| 86 | 86 | |
| 87 | 87 |
task buildAdmin(type: JavaExec, dependsOn: [copyWebResources, copyGWTLibs]) {
|
| 88 | 88 |
classpath p2jSrc + libs + files(adminBuildDir) |
| 89 |
main 'com.google.gwt.dev.Compiler' |
|
| 89 |
mainClass = 'com.google.gwt.dev.Compiler'
|
|
| 90 | 90 |
if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {
|
| 91 | 91 |
jvmArgs '--add-opens','java.base/java.lang=ALL-UNNAMED' |
| 92 | 92 |
} |
| ... | ... | |
| 98 | 98 |
// new SslConnectionFactory(..) |
| 99 | 99 |
task serveAdmin(type: JavaExec, dependsOn: copyWebResources) {
|
| 100 | 100 |
classpath p2jSrc + libs + files(adminBuildDir) |
| 101 |
main 'com.google.gwt.dev.DevMode' |
|
| 101 |
mainClass = 'com.google.gwt.dev.DevMode'
|
|
| 102 | 102 |
if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {
|
| 103 | 103 |
jvmArgs '--add-opens','java.base/java.lang=ALL-UNNAMED' |
| 104 | 104 |
} |
| new/build.gradle 2025-12-09 12:17:26 +0000 | ||
|---|---|---|
| 468 | 468 | |
| 469 | 469 |
if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_11)) {
|
| 470 | 470 |
// latest AspectJ version |
| 471 |
aspectjVersion = '1.9.24'
|
|
| 471 |
aspectjVersion = '1.9.25'
|
|
| 472 | 472 |
} |
| 473 | 473 | |
| 474 | 474 |
configurations.all {
|
| ... | ... | |
| 482 | 482 |
exclude group: 'commons-logging', module: "commons-logging" |
| 483 | 483 |
exclude group: 'org.slf4j', module: 'slf4j-simple' |
| 484 | 484 |
exclude group: 'xerces' |
| 485 |
// Exclude old ASM versions to prevent classloader conflicts |
|
| 486 |
exclude group: 'asm', module: 'asm' |
|
| 487 |
exclude group: 'org.ow2.asm', module: 'asm-all' |
|
| 488 | ||
| 489 |
resolutionStrategy {
|
|
| 490 |
force 'org.ow2.asm:asm:9.9', 'org.ow2.asm:asm-commons:9.9', 'org.ow2.asm:asm-util:9.9' |
|
| 491 |
} |
|
| 485 | 492 |
|
| 486 | 493 |
// remove apis already provided by java 11+ |
| 487 | 494 |
if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_11)) {
|
| ... | ... | |
| 581 | 588 |
fwdServer group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.14' |
| 582 | 589 |
fwdServer group: 'org.javassist', name: 'javassist', version: '3.30.2-GA' |
| 583 | 590 |
fwdServer group: 'org.jboss.spec.javax.transaction', name: 'jboss-transaction-api_1.1_spec', version: '1.0.1.Final' |
| 584 |
fwdServer group: 'org.ow2.asm', name: 'asm', version: '9.7.1' |
|
| 585 |
fwdServer group: 'org.ow2.asm', name: 'asm-util', version: '9.7.1' |
|
| 591 |
fwdServer group: 'org.ow2.asm', name: 'asm', version: '9.9' |
|
| 592 |
fwdServer group: 'org.ow2.asm', name: 'asm-commons', version: '9.9' |
|
| 593 |
fwdServer group: 'org.ow2.asm', name: 'asm-util', version: '9.9' |
|
| 586 | 594 |
fwdServer group: 'com.mchange', name: 'c3p0', version: '0.9.5.5' |
| 587 | 595 |
fwdServer group: 'cglib', name: 'cglib', version: '3.3.0' |
| 588 | 596 |
fwdServer group: 'net.sf.ehcache', name: 'ehcache-core', version: '2.6.11' |
| ... | ... | |
| 700 | 708 |
// javascript Nashorn has been removed from JDK15, so we need it back |
| 701 | 709 |
if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_15)) {
|
| 702 | 710 |
antCompile "org.openjdk.nashorn:nashorn-core:15.4" |
| 703 |
antCompile "org.ow2.asm:asm-util:9.7.1" |
|
| 711 |
antCompile "org.ow2.asm:asm:9.9" |
|
| 712 |
antCompile "org.ow2.asm:asm-commons:9.9" |
|
| 713 |
antCompile "org.ow2.asm:asm-util:9.9" |
|
| 704 | 714 |
} |
| 705 | 715 |
antCompile "org.apache.ant:ant-antlr:1.10.14" |
| 706 | 716 |
aspectjCompile group: 'org.aspectj', name: 'aspectjtools', version: aspectjVersion |
| ... | ... | |
| 1074 | 1084 | |
| 1075 | 1085 |
task test(type: JavaExec) {
|
| 1076 | 1086 |
classpath = configurations.fwdAllTest + files('build/test-classes', 'build/classes')
|
| 1077 |
main = 'org.junit.platform.console.ConsoleLauncher' |
|
| 1087 |
mainClass = 'org.junit.platform.console.ConsoleLauncher'
|
|
| 1078 | 1088 |
args '--scan-classpath=build/test-classes' |
| 1079 | 1089 |
} |
| 1080 | 1090 |
tasks['test'].dependsOn('ant-tests-compile')
|
| new/ext/sheet/build.gradle 2025-12-09 12:52:04 +0000 | ||
|---|---|---|
| 115 | 115 |
} |
| 116 | 116 |
} |
| 117 | 117 | |
| 118 |
configurations.all {
|
|
| 119 |
// Exclude old ASM versions to prevent classloader conflicts |
|
| 120 |
exclude group: 'asm', module: 'asm' |
|
| 121 |
exclude group: 'org.ow2.asm', module: 'asm-all' |
|
| 122 | ||
| 123 |
resolutionStrategy {
|
|
| 124 |
force 'org.ow2.asm:asm:9.9', 'org.ow2.asm:asm-commons:9.9', 'org.ow2.asm:asm-util:9.9' |
|
| 125 |
} |
|
| 126 |
} |
|
| 127 | ||
| 118 | 128 |
dependencies {
|
| 119 | 129 |
providedCompile(files(fwdBuild)) |
| 120 | 130 |
implementation "commons-lang:commons-lang:2.4" |
| 121 | 131 |
providedCompile "com.google.guava:guava:19.0" |
| 122 | 132 |
providedCompile "javax.servlet:javax.servlet-api:3.1.0" |
| 123 |
providedCompile ("org.eclipse.jetty.aggregate:jetty-all:9.4.22.v20191022:uber") {
|
|
| 133 |
providedCompile ("org.eclipse.jetty.aggregate:jetty-all:9.4.57.v20241219:uber") {
|
|
| 124 | 134 |
// only keep jetty-all |
| 125 | 135 |
exclude group: 'org.eclipse.jetty', module: 'jetty-alpn-client' |
| 126 | 136 |
exclude group: 'org.eclipse.jetty', module: 'jetty-annotations' |
| ... | ... | |
| 207 | 217 |
implementation "org.bouncycastle:bcprov-jdk14:1.72" |
| 208 | 218 |
implementation "org.bouncycastle:bctsp-jdk14:1.46" |
| 209 | 219 |
implementation "org.bouncycastle:bcmail-jdk14:1.72" |
| 220 |
// Align ASM versions with root project to avoid classloader conflicts |
|
| 221 |
implementation "org.ow2.asm:asm:9.9" |
|
| 222 |
implementation "org.ow2.asm:asm-commons:9.9" |
|
| 223 |
implementation "org.ow2.asm:asm-util:9.9" |
|
| 210 | 224 |
} |
| 211 | 225 | |
| 212 | 226 |
task fetchDependencies(type: Copy) {
|
| 213 | 227 |
into ".lib" |
| 214 | 228 |
from configurations.compileClasspath, configurations.runtimeClasspath |
| 215 |
} |
|
| 216 | ||
| 229 |
} |
|
| new/ext/sheet/gradle/wrapper/gradle-wrapper.properties 2025-12-09 12:19:03 +0000 | ||
|---|---|---|
| 1 | 1 |
distributionBase=GRADLE_USER_HOME |
| 2 | 2 |
distributionPath=wrapper/dists |
| 3 |
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
|
|
| 3 |
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
|
|
| 4 | 4 |
networkTimeout=10000 |
| 5 | 5 |
zipStoreBase=GRADLE_USER_HOME |
| 6 | 6 |
zipStorePath=wrapper/dists |
| new/gradle/wrapper/gradle-wrapper.properties 2025-12-09 10:30:45 +0000 | ||
|---|---|---|
| 1 | 1 |
distributionBase=GRADLE_USER_HOME |
| 2 | 2 |
distributionPath=wrapper/dists |
| 3 |
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
|
|
| 3 |
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
|
|
| 4 | 4 |
networkTimeout=10000 |
| 5 | 5 |
zipStoreBase=GRADLE_USER_HOME |
| 6 | 6 |
zipStorePath=wrapper/dists |
| new/src/com/goldencode/p2j/uast/CallGraphGenerator.java 2025-12-09 10:37:43 +0000 | ||
|---|---|---|
| 101 | 101 |
import com.goldencode.p2j.convert.*; |
| 102 | 102 |
import com.goldencode.p2j.pattern.*; |
| 103 | 103 |
import com.goldencode.p2j.util.osresource.*; |
| 104 |
import org.apache.tinkerpop.gremlin.process.traversal.IO; |
|
| 104 | 105 |
import org.apache.tinkerpop.gremlin.structure.*; |
| 105 | 106 |
import org.apache.tinkerpop.gremlin.process.traversal.*; |
| 106 | 107 | |
| new/src/com/goldencode/p2j/ui/client/gui/driver/web/UploadHandler.java 2025-12-09 10:37:12 +0000 | ||
|---|---|---|
| 73 | 73 |
import org.eclipse.jetty.server.*; |
| 74 | 74 |
import org.eclipse.jetty.server.handler.*; |
| 75 | 75 |
import org.eclipse.jetty.util.*; |
| 76 |
import org.eclipse.jetty.util.IO; |
|
| 76 | 77 | |
| 77 | 78 |
import javax.json.*; |
| 78 | 79 |
import javax.servlet.*; |