diff --git a/boot/build.gradle.kts b/boot/build.gradle.kts index f7d1f537..31138e7a 100644 --- a/boot/build.gradle.kts +++ b/boot/build.gradle.kts @@ -1,6 +1,6 @@ plugins { id("java") - id("org.springframework.boot") version "3.5.8" + id("org.springframework.boot") version "3.5.11" id("io.spring.dependency-management") version "1.1.7" } @@ -26,16 +26,14 @@ extra["byte-buddy.version"] = libs.versions.byte.buddy.get() dependencies { implementation(project(":generator")) { exclude(group = "commons-logging", module = "commons-logging") + exclude(group = "com.reajason.javaweb", module = "thirdparty-tomcat") } implementation(project(":packer")) { exclude(group = "commons-logging", module = "commons-logging") } implementation("org.springframework.boot:spring-boot-starter-thymeleaf") - implementation("org.springframework.boot:spring-boot-starter-web") { - exclude(group = "org.springframework.boot", module = "spring-boot-starter-tomcat") - } + implementation("org.springframework.boot:spring-boot-starter-web") implementation(libs.commons.lang3) - implementation("org.springframework.boot:spring-boot-starter-undertow") compileOnly("org.projectlombok:lombok") developmentOnly("org.springframework.boot:spring-boot-devtools") annotationProcessor("org.springframework.boot:spring-boot-configuration-processor") diff --git a/build.gradle.kts b/build.gradle.kts index c8704567..493a43fd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,6 +1,7 @@ plugins { id("java") id("idea") + id("com.vanniktech.maven.publish") version "0.35.0" apply false } idea { @@ -15,10 +16,12 @@ tasks.register("publishAllToMavenCentral") { dependsOn(":memshell-party-common:publishToMavenCentral") dependsOn(":packer:publishToMavenCentral") dependsOn(":generator:publishToMavenCentral") + dependsOn(":thirdparty:thirdparty-tomcat:publishToMavenCentral") } tasks.register("publishAllToMavenLocal") { dependsOn(":memshell-party-common:publishToMavenLocal") dependsOn(":packer:publishToMavenLocal") dependsOn(":generator:publishToMavenLocal") -} \ No newline at end of file + dependsOn(":thirdparty:thirdparty-tomcat:publishToMavenLocal") +} diff --git a/generator/build.gradle.kts b/generator/build.gradle.kts index cef92a1c..8ff73039 100644 --- a/generator/build.gradle.kts +++ b/generator/build.gradle.kts @@ -29,6 +29,7 @@ tasks.test { dependencies { implementation(project(":memshell-party-common")) implementation(project(":packer")) + implementation(project(":thirdparty:thirdparty-tomcat")) api(libs.byte.buddy) implementation(libs.asm.commons) implementation(libs.javax.websocket.api) diff --git a/settings.gradle.kts b/settings.gradle.kts index fc68911b..06dfe406 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -32,6 +32,7 @@ include("tools:godzilla", "tools:behinder", "tools:suo5", "tools:ant-sword") include("packer") include("boot") include("generator") +include("thirdparty:thirdparty-tomcat") include("integration-test") include("vul:vul-webapp") include("vul:vul-webapp-jakarta") diff --git a/thirdparty/thirdparty-tomcat/build.gradle.kts b/thirdparty/thirdparty-tomcat/build.gradle.kts new file mode 100644 index 00000000..17a1325d --- /dev/null +++ b/thirdparty/thirdparty-tomcat/build.gradle.kts @@ -0,0 +1,20 @@ +plugins { + id("java-library") + id("maven-publish-convention") +} + +group = "com.reajason.javaweb" +description = "thirdparty simple class" +version = rootProject.version + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(8) + } + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 +} + +dependencies { + implementation(libs.javax.servlet.api) +} \ No newline at end of file diff --git a/generator/src/main/java/org/apache/catalina/Valve.java b/thirdparty/thirdparty-tomcat/src/main/java/org/apache/catalina/Valve.java similarity index 100% rename from generator/src/main/java/org/apache/catalina/Valve.java rename to thirdparty/thirdparty-tomcat/src/main/java/org/apache/catalina/Valve.java diff --git a/generator/src/main/java/org/apache/catalina/connector/Request.java b/thirdparty/thirdparty-tomcat/src/main/java/org/apache/catalina/connector/Request.java similarity index 100% rename from generator/src/main/java/org/apache/catalina/connector/Request.java rename to thirdparty/thirdparty-tomcat/src/main/java/org/apache/catalina/connector/Request.java diff --git a/generator/src/main/java/org/apache/catalina/connector/Response.java b/thirdparty/thirdparty-tomcat/src/main/java/org/apache/catalina/connector/Response.java similarity index 100% rename from generator/src/main/java/org/apache/catalina/connector/Response.java rename to thirdparty/thirdparty-tomcat/src/main/java/org/apache/catalina/connector/Response.java diff --git a/generator/src/main/java/org/apache/coyote/Adapter.java b/thirdparty/thirdparty-tomcat/src/main/java/org/apache/coyote/Adapter.java similarity index 100% rename from generator/src/main/java/org/apache/coyote/Adapter.java rename to thirdparty/thirdparty-tomcat/src/main/java/org/apache/coyote/Adapter.java diff --git a/generator/src/main/java/org/apache/coyote/Processor.java b/thirdparty/thirdparty-tomcat/src/main/java/org/apache/coyote/Processor.java similarity index 100% rename from generator/src/main/java/org/apache/coyote/Processor.java rename to thirdparty/thirdparty-tomcat/src/main/java/org/apache/coyote/Processor.java diff --git a/generator/src/main/java/org/apache/coyote/Request.java b/thirdparty/thirdparty-tomcat/src/main/java/org/apache/coyote/Request.java similarity index 100% rename from generator/src/main/java/org/apache/coyote/Request.java rename to thirdparty/thirdparty-tomcat/src/main/java/org/apache/coyote/Request.java diff --git a/generator/src/main/java/org/apache/coyote/UpgradeProtocol.java b/thirdparty/thirdparty-tomcat/src/main/java/org/apache/coyote/UpgradeProtocol.java similarity index 100% rename from generator/src/main/java/org/apache/coyote/UpgradeProtocol.java rename to thirdparty/thirdparty-tomcat/src/main/java/org/apache/coyote/UpgradeProtocol.java diff --git a/generator/src/main/java/org/apache/coyote/http11/upgrade/InternalHttpUpgradeHandler.java b/thirdparty/thirdparty-tomcat/src/main/java/org/apache/coyote/http11/upgrade/InternalHttpUpgradeHandler.java similarity index 100% rename from generator/src/main/java/org/apache/coyote/http11/upgrade/InternalHttpUpgradeHandler.java rename to thirdparty/thirdparty-tomcat/src/main/java/org/apache/coyote/http11/upgrade/InternalHttpUpgradeHandler.java diff --git a/generator/src/main/java/org/apache/tomcat/util/net/SocketWrapperBase.java b/thirdparty/thirdparty-tomcat/src/main/java/org/apache/tomcat/util/net/SocketWrapperBase.java similarity index 100% rename from generator/src/main/java/org/apache/tomcat/util/net/SocketWrapperBase.java rename to thirdparty/thirdparty-tomcat/src/main/java/org/apache/tomcat/util/net/SocketWrapperBase.java