feat: use thirdparty for class conflict
Dev Deploy / Build Jar (ubuntu-latest) (push) Has been cancelled
Dev Deploy / Build Jar (windows-latest) (push) Has been cancelled
Unit-Test / UniteTest (push) Has been cancelled
Dev Deploy / Docker Push (push) Has been cancelled
Dev Deploy / Deploy to Maven Central (push) Has been cancelled
Dev Deploy / Deploy to Northflank (push) Has been cancelled

This commit is contained in:
ReaJason
2026-03-19 00:33:14 +08:00
parent 9d2b4c7774
commit 25e1b3964a
14 changed files with 29 additions and 6 deletions
+3 -5
View File
@@ -1,6 +1,6 @@
plugins { plugins {
id("java") 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" id("io.spring.dependency-management") version "1.1.7"
} }
@@ -26,16 +26,14 @@ extra["byte-buddy.version"] = libs.versions.byte.buddy.get()
dependencies { dependencies {
implementation(project(":generator")) { implementation(project(":generator")) {
exclude(group = "commons-logging", module = "commons-logging") exclude(group = "commons-logging", module = "commons-logging")
exclude(group = "com.reajason.javaweb", module = "thirdparty-tomcat")
} }
implementation(project(":packer")) { implementation(project(":packer")) {
exclude(group = "commons-logging", module = "commons-logging") exclude(group = "commons-logging", module = "commons-logging")
} }
implementation("org.springframework.boot:spring-boot-starter-thymeleaf") implementation("org.springframework.boot:spring-boot-starter-thymeleaf")
implementation("org.springframework.boot:spring-boot-starter-web") { implementation("org.springframework.boot:spring-boot-starter-web")
exclude(group = "org.springframework.boot", module = "spring-boot-starter-tomcat")
}
implementation(libs.commons.lang3) implementation(libs.commons.lang3)
implementation("org.springframework.boot:spring-boot-starter-undertow")
compileOnly("org.projectlombok:lombok") compileOnly("org.projectlombok:lombok")
developmentOnly("org.springframework.boot:spring-boot-devtools") developmentOnly("org.springframework.boot:spring-boot-devtools")
annotationProcessor("org.springframework.boot:spring-boot-configuration-processor") annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
+4 -1
View File
@@ -1,6 +1,7 @@
plugins { plugins {
id("java") id("java")
id("idea") id("idea")
id("com.vanniktech.maven.publish") version "0.35.0" apply false
} }
idea { idea {
@@ -15,10 +16,12 @@ tasks.register("publishAllToMavenCentral") {
dependsOn(":memshell-party-common:publishToMavenCentral") dependsOn(":memshell-party-common:publishToMavenCentral")
dependsOn(":packer:publishToMavenCentral") dependsOn(":packer:publishToMavenCentral")
dependsOn(":generator:publishToMavenCentral") dependsOn(":generator:publishToMavenCentral")
dependsOn(":thirdparty:thirdparty-tomcat:publishToMavenCentral")
} }
tasks.register("publishAllToMavenLocal") { tasks.register("publishAllToMavenLocal") {
dependsOn(":memshell-party-common:publishToMavenLocal") dependsOn(":memshell-party-common:publishToMavenLocal")
dependsOn(":packer:publishToMavenLocal") dependsOn(":packer:publishToMavenLocal")
dependsOn(":generator:publishToMavenLocal") dependsOn(":generator:publishToMavenLocal")
} dependsOn(":thirdparty:thirdparty-tomcat:publishToMavenLocal")
}
+1
View File
@@ -29,6 +29,7 @@ tasks.test {
dependencies { dependencies {
implementation(project(":memshell-party-common")) implementation(project(":memshell-party-common"))
implementation(project(":packer")) implementation(project(":packer"))
implementation(project(":thirdparty:thirdparty-tomcat"))
api(libs.byte.buddy) api(libs.byte.buddy)
implementation(libs.asm.commons) implementation(libs.asm.commons)
implementation(libs.javax.websocket.api) implementation(libs.javax.websocket.api)
+1
View File
@@ -32,6 +32,7 @@ include("tools:godzilla", "tools:behinder", "tools:suo5", "tools:ant-sword")
include("packer") include("packer")
include("boot") include("boot")
include("generator") include("generator")
include("thirdparty:thirdparty-tomcat")
include("integration-test") include("integration-test")
include("vul:vul-webapp") include("vul:vul-webapp")
include("vul:vul-webapp-jakarta") include("vul:vul-webapp-jakarta")
+20
View File
@@ -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)
}