Skip to content

Commit 25e1b39

Browse files
committed
feat: use thirdparty for class conflict
1 parent 9d2b4c7 commit 25e1b39

14 files changed

Lines changed: 29 additions & 6 deletions

File tree

boot/build.gradle.kts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id("java")
3-
id("org.springframework.boot") version "3.5.8"
3+
id("org.springframework.boot") version "3.5.11"
44
id("io.spring.dependency-management") version "1.1.7"
55
}
66

@@ -26,16 +26,14 @@ extra["byte-buddy.version"] = libs.versions.byte.buddy.get()
2626
dependencies {
2727
implementation(project(":generator")) {
2828
exclude(group = "commons-logging", module = "commons-logging")
29+
exclude(group = "com.reajason.javaweb", module = "thirdparty-tomcat")
2930
}
3031
implementation(project(":packer")) {
3132
exclude(group = "commons-logging", module = "commons-logging")
3233
}
3334
implementation("org.springframework.boot:spring-boot-starter-thymeleaf")
34-
implementation("org.springframework.boot:spring-boot-starter-web") {
35-
exclude(group = "org.springframework.boot", module = "spring-boot-starter-tomcat")
36-
}
35+
implementation("org.springframework.boot:spring-boot-starter-web")
3736
implementation(libs.commons.lang3)
38-
implementation("org.springframework.boot:spring-boot-starter-undertow")
3937
compileOnly("org.projectlombok:lombok")
4038
developmentOnly("org.springframework.boot:spring-boot-devtools")
4139
annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")

build.gradle.kts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
plugins {
22
id("java")
33
id("idea")
4+
id("com.vanniktech.maven.publish") version "0.35.0" apply false
45
}
56

67
idea {
@@ -15,10 +16,12 @@ tasks.register("publishAllToMavenCentral") {
1516
dependsOn(":memshell-party-common:publishToMavenCentral")
1617
dependsOn(":packer:publishToMavenCentral")
1718
dependsOn(":generator:publishToMavenCentral")
19+
dependsOn(":thirdparty:thirdparty-tomcat:publishToMavenCentral")
1820
}
1921

2022
tasks.register("publishAllToMavenLocal") {
2123
dependsOn(":memshell-party-common:publishToMavenLocal")
2224
dependsOn(":packer:publishToMavenLocal")
2325
dependsOn(":generator:publishToMavenLocal")
24-
}
26+
dependsOn(":thirdparty:thirdparty-tomcat:publishToMavenLocal")
27+
}

generator/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ tasks.test {
2929
dependencies {
3030
implementation(project(":memshell-party-common"))
3131
implementation(project(":packer"))
32+
implementation(project(":thirdparty:thirdparty-tomcat"))
3233
api(libs.byte.buddy)
3334
implementation(libs.asm.commons)
3435
implementation(libs.javax.websocket.api)

settings.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ include("tools:godzilla", "tools:behinder", "tools:suo5", "tools:ant-sword")
3232
include("packer")
3333
include("boot")
3434
include("generator")
35+
include("thirdparty:thirdparty-tomcat")
3536
include("integration-test")
3637
include("vul:vul-webapp")
3738
include("vul:vul-webapp-jakarta")
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
plugins {
2+
id("java-library")
3+
id("maven-publish-convention")
4+
}
5+
6+
group = "com.reajason.javaweb"
7+
description = "thirdparty simple class"
8+
version = rootProject.version
9+
10+
java {
11+
toolchain {
12+
languageVersion = JavaLanguageVersion.of(8)
13+
}
14+
sourceCompatibility = JavaVersion.VERSION_1_8
15+
targetCompatibility = JavaVersion.VERSION_1_8
16+
}
17+
18+
dependencies {
19+
implementation(libs.javax.servlet.api)
20+
}

generator/src/main/java/org/apache/catalina/Valve.java renamed to thirdparty/thirdparty-tomcat/src/main/java/org/apache/catalina/Valve.java

File renamed without changes.

generator/src/main/java/org/apache/catalina/connector/Request.java renamed to thirdparty/thirdparty-tomcat/src/main/java/org/apache/catalina/connector/Request.java

File renamed without changes.

generator/src/main/java/org/apache/catalina/connector/Response.java renamed to thirdparty/thirdparty-tomcat/src/main/java/org/apache/catalina/connector/Response.java

File renamed without changes.

generator/src/main/java/org/apache/coyote/Adapter.java renamed to thirdparty/thirdparty-tomcat/src/main/java/org/apache/coyote/Adapter.java

File renamed without changes.

generator/src/main/java/org/apache/coyote/Processor.java renamed to thirdparty/thirdparty-tomcat/src/main/java/org/apache/coyote/Processor.java

File renamed without changes.

0 commit comments

Comments
 (0)