Skip to content

Commit 69ad11f

Browse files
committed
build: rm memshell-party-bom module
1 parent 0aabbfa commit 69ad11f

File tree

13 files changed

+122
-139
lines changed

13 files changed

+122
-139
lines changed

build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,11 @@ version = "2.0.0-SNAPSHOT"
66
tasks.register("publishAllToMavenCentral") {
77
val isSnapshot = rootProject.version.toString().endsWith("-SNAPSHOT")
88
if (isSnapshot) {
9-
dependsOn(":memshell-party-bom:publishAllPublicationsToMavenCentralRepository")
109
dependsOn(":memshell-party-common:publishAllPublicationsToMavenCentralRepository")
1110
dependsOn(":deserialize:publishAllPublicationsToMavenCentralRepository")
1211
dependsOn(":memshell:publishAllPublicationsToMavenCentralRepository")
1312
dependsOn(":generator:publishAllPublicationsToMavenCentralRepository")
1413
} else {
15-
dependsOn(":memshell-party-bom:publishAndReleaseToMavenCentral")
1614
dependsOn(":memshell-party-common:publishAndReleaseToMavenCentral")
1715
dependsOn(":deserialize:publishAndReleaseToMavenCentral")
1816
dependsOn(":memshell:publishAndReleaseToMavenCentral")

deserialize/build.gradle.kts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,13 @@ description = "Java deserialize payload for MemShellParty"
99
version = rootProject.version
1010

1111
dependencies {
12-
implementation(platform(project(":memshell-party-bom")))
1312
implementation(project(":memshell-party-common"))
14-
implementation("net.bytebuddy:byte-buddy")
1513
implementation("com.caucho:hessian:4.0.66")
1614
implementation("commons-beanutils:commons-beanutils:1.9.2")
1715
implementation("commons-collections:commons-collections:3.2.1")
1816
implementation("org.apache.commons:commons-collections4:4.0")
19-
testImplementation(platform("org.junit:junit-bom"))
20-
testImplementation("org.junit.jupiter:junit-jupiter")
17+
testImplementation(libs.junit.jupiter)
18+
testRuntimeOnly(libs.junit.platform.launcher)
2119
}
2220

2321
java {

generator/build.gradle.kts

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -27,29 +27,21 @@ tasks.test {
2727
}
2828

2929
dependencies {
30-
implementation(platform(project(":memshell-party-bom")))
3130
implementation(project(":memshell-party-common"))
3231
implementation(project(":deserialize"))
3332

3433
implementation(project(":memshell"))
35-
implementation("net.bytebuddy:byte-buddy")
36-
implementation("org.ow2.asm:asm-commons")
37-
implementation("net.java.dev.jna:jna")
38-
implementation("net.java.dev.jna:jna-platform")
39-
implementation("javax.servlet:javax.servlet-api")
40-
implementation("javax.websocket:javax.websocket-api")
41-
implementation("org.apache.bcel:bcel")
42-
implementation("commons-io:commons-io")
43-
implementation("org.apache.commons:commons-lang3")
44-
implementation("com.squareup.okhttp3:okhttp")
45-
implementation("ch.qos.logback:logback-classic")
46-
implementation("com.fasterxml.jackson.core:jackson-databind")
47-
implementation("org.springframework:spring-webmvc")
48-
implementation("org.springframework:spring-webflux")
49-
implementation("io.projectreactor.netty:reactor-netty-core")
50-
testImplementation(platform("org.junit:junit-bom"))
51-
testImplementation("org.junit.jupiter:junit-jupiter")
52-
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
53-
testImplementation("org.mockito:mockito-core")
54-
testImplementation("org.mockito:mockito-junit-jupiter")
34+
implementation(libs.bundles.jna)
35+
implementation(libs.javax.servlet.api)
36+
implementation(libs.javax.websocket.api)
37+
implementation(libs.bcel)
38+
implementation(libs.okhttp3)
39+
implementation(libs.logback.classic)
40+
implementation(libs.jackson.databind)
41+
implementation(libs.spring.webmvc)
42+
implementation(libs.spring.webflux)
43+
implementation(libs.reactor.netty.core)
44+
testImplementation(libs.junit.jupiter)
45+
testRuntimeOnly(libs.junit.platform.launcher)
46+
testImplementation(libs.bundles.mockito)
5547
}

gradle/libs.versions.toml

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,63 @@
1+
[versions]
2+
byte-buddy = "1.17.6"
3+
asm = "9.8"
4+
jna = "5.13.0"
5+
javax-servlet-api = "3.0.1"
6+
javax-websocket-api = "1.1"
7+
spring-webmvc = "5.3.24"
8+
spring-webflux = "5.3.24"
9+
reactor-netty = "1.1.25"
10+
commons-io = "2.19.0"
11+
commons-lang3 = "3.17.0"
12+
commons-codec = "1.18.0"
13+
logback = "1.5.18"
14+
slf4j-simple = "2.0.17"
15+
bcel = "5.2"
16+
java-websocket = "1.6.0"
17+
okhttp3 = "4.12.0"
18+
fastjson2 = "2.0.57"
19+
jackson = "2.19.0"
20+
jetbrains-annotations = "26.0.2"
21+
mockito = "5.18.0"
22+
hamcrest = "3.0"
23+
junit-jupiter = "5.13.2"
24+
junit-platform = "1.13.1"
25+
testcontainers = "1.21.2"
26+
27+
[libraries]
28+
byte-buddy = { module = "net.bytebuddy:byte-buddy", version.ref = "byte-buddy" }
29+
asm-commons = { module = "org.ow2.asm:asm-commons", version.ref = "asm" }
30+
jna = { module = "net.java.dev.jna:jna", version.ref = "jna" }
31+
jna-platform = { module = "net.java.dev.jna:jna-platform", version.ref = "jna" }
32+
javax-servlet-api = { module = "javax.servlet:javax.servlet-api", version.ref = "javax-servlet-api" }
33+
javax-websocket-api = { module = "javax.websocket:javax.websocket-api", version.ref = "javax-websocket-api" }
34+
spring-webmvc = { module = "org.springframework:spring-webmvc", version.ref = "spring-webmvc" }
35+
spring-webflux = { module = "org.springframework:spring-webflux", version.ref = "spring-webflux" }
36+
reactor-netty-core = { module = "io.projectreactor.netty:reactor-netty-core", version.ref = "reactor-netty" }
37+
commons-io = { module = "commons-io:commons-io", version.ref = "commons-io" }
38+
commons-lang3 = { module = "org.apache.commons:commons-lang3", version.ref = "commons-lang3" }
39+
commons-codec = { module = "commons-codec:commons-codec", version.ref = "commons-codec" }
40+
logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }
41+
slf4j-simple = { module = "org.slf4j:slf4j-simple", version.ref = "slf4j-simple" }
42+
bcel = { module = "org.apache.bcel:bcel", version.ref = "bcel" }
43+
java-websocket = { module = "org.java-websocket:Java-WebSocket", version.ref = "java-websocket" }
44+
okhttp3 = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp3" }
45+
fastjson2 = { module = "com.alibaba.fastjson2:fastjson2", version.ref = "fastjson2" }
46+
jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" }
47+
jetbrains-annotations = { module = "org.jetbrains:annotations", version.ref = "jetbrains-annotations" }
48+
mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" }
49+
mockito-junit-jupiter = { module = "org.mockito:mockito-junit-jupiter", version.ref = "mockito" }
50+
hamcrest = { module = "org.hamcrest:hamcrest", version.ref = "hamcrest" }
51+
junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit-jupiter" }
52+
junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher", version.ref = "junit-platform" }
53+
junit-platform-reporting = { module = "org.junit.platform:junit-platform-reporting", version.ref = "junit-platform" }
54+
testcontainers = { module = "org.testcontainers:testcontainers", version.ref = "testcontainers" }
55+
testcontainers-junit-jupiter = { module = "org.testcontainers:junit-jupiter", version.ref = "testcontainers" }
56+
57+
[bundles]
58+
jna = ["jna", "jna-platform"]
59+
mockito = ["mockito-core", "mockito-junit-jupiter"]
60+
testcontainers = ["testcontainers", "testcontainers-junit-jupiter"]
61+
162
[plugins]
263
lombok = { id = "io.freefair.lombok", version = "8.13.1" }

integration-test/build.gradle.kts

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,22 @@ group = "io.github.reajason"
77
version = rootProject.version
88

99
dependencies {
10-
implementation(platform(project(":memshell-party-bom")))
11-
testImplementation(project(":vul:vul-webapp"))
1210
testImplementation(project(":memshell-party-common"))
1311
testImplementation(project(":tools:behinder"))
1412
testImplementation(project(":tools:godzilla"))
1513
testImplementation(project(":tools:suo5"))
1614
testImplementation(project(":tools:ant-sword"))
1715
testImplementation(project(":generator"))
18-
testImplementation("net.bytebuddy:byte-buddy")
19-
testImplementation("javax.servlet:javax.servlet-api")
20-
testImplementation("javax.websocket:javax.websocket-api")
21-
testImplementation("org.java-websocket:Java-WebSocket")
22-
testImplementation("com.squareup.okhttp3:okhttp")
23-
testImplementation("org.slf4j:slf4j-simple:2.0.16")
24-
testImplementation(platform("org.junit:junit-bom"))
25-
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
26-
testImplementation("org.junit.jupiter:junit-jupiter")
27-
testImplementation("org.junit.platform:junit-platform-reporting")
28-
testImplementation("org.hamcrest:hamcrest")
29-
testImplementation("org.testcontainers:testcontainers")
30-
testImplementation("org.testcontainers:junit-jupiter")
16+
testImplementation(libs.javax.servlet.api)
17+
testImplementation(libs.javax.websocket.api)
18+
testImplementation(libs.java.websocket)
19+
testImplementation(libs.okhttp3)
20+
testImplementation(libs.slf4j.simple)
21+
testImplementation(libs.junit.platform.reporting)
22+
testImplementation(libs.junit.jupiter)
23+
testRuntimeOnly(libs.junit.platform.launcher)
24+
testImplementation(libs.hamcrest)
25+
testImplementation(libs.bundles.testcontainers)
3126
}
3227

3328
tasks.test {

memshell-party-bom/build.gradle.kts

Lines changed: 0 additions & 40 deletions
This file was deleted.

memshell-party-common/build.gradle.kts

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id("java")
2+
id("java-library")
33
alias(libs.plugins.lombok)
44
id("maven-publish-convention")
55
}
@@ -14,17 +14,15 @@ java {
1414
}
1515

1616
dependencies {
17-
implementation(platform(project(":memshell-party-bom")))
18-
implementation("net.bytebuddy:byte-buddy")
19-
implementation("org.ow2.asm:asm-commons")
20-
implementation("commons-io:commons-io")
21-
implementation("org.apache.commons:commons-lang3")
22-
implementation("commons-codec:commons-codec")
23-
implementation("org.jetbrains:annotations")
24-
testImplementation(platform("org.junit:junit-bom"))
25-
testImplementation("org.junit.jupiter:junit-jupiter")
26-
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
27-
testImplementation("org.mockito:mockito-core")
17+
api(libs.byte.buddy)
18+
api(libs.asm.commons)
19+
api(libs.commons.io)
20+
api(libs.commons.lang3)
21+
api(libs.commons.codec)
22+
api(libs.jetbrains.annotations)
23+
testImplementation(libs.junit.jupiter)
24+
testRuntimeOnly(libs.junit.platform.launcher)
25+
testImplementation(libs.bundles.mockito)
2826
}
2927

3028
tasks.test {

memshell/build.gradle.kts

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,11 @@ java {
1818
}
1919

2020
dependencies {
21-
implementation(platform(project(":memshell-party-bom")))
22-
implementation("net.bytebuddy:byte-buddy")
23-
implementation("org.ow2.asm:asm-commons")
24-
implementation("javax.servlet:javax.servlet-api")
25-
implementation("javax.websocket:javax.websocket-api")
26-
implementation("org.springframework:spring-webmvc")
27-
implementation("org.springframework:spring-webflux")
28-
implementation("io.projectreactor.netty:reactor-netty-core")
21+
implementation(libs.byte.buddy)
22+
implementation(libs.asm.commons)
23+
implementation(libs.javax.servlet.api)
24+
implementation(libs.javax.websocket.api)
25+
implementation(libs.spring.webmvc)
26+
implementation(libs.spring.webflux)
27+
implementation(libs.reactor.netty.core)
2928
}

settings.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ dependencyResolutionManagement {
1818

1919
rootProject.name = "memshell-party"
2020

21-
include("memshell-party-bom")
2221
include("memshell-party-common")
2322
include("tools:godzilla", "tools:behinder", "tools:suo5", "tools:ant-sword")
2423
include("memshell")

tools/ant-sword/build.gradle.kts

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,12 @@ java {
1515
}
1616

1717
dependencies {
18-
implementation(platform(project(":memshell-party-bom")))
1918
implementation(project(":memshell-party-common"))
20-
implementation("net.bytebuddy:byte-buddy")
21-
implementation("javax.servlet:javax.servlet-api")
22-
implementation("commons-io:commons-io")
23-
implementation("org.apache.commons:commons-lang3")
24-
implementation("commons-codec:commons-codec")
25-
implementation("com.squareup.okhttp3:okhttp")
26-
implementation("com.alibaba.fastjson2:fastjson2")
27-
testImplementation(platform("org.junit:junit-bom"))
28-
testImplementation("org.junit.jupiter:junit-jupiter")
19+
implementation(libs.javax.servlet.api)
20+
implementation(libs.okhttp3)
21+
implementation(libs.fastjson2)
22+
testImplementation(libs.junit.jupiter)
23+
testRuntimeOnly(libs.junit.platform.launcher)
2924
}
3025

3126
tasks.test {

0 commit comments

Comments
 (0)