diff --git a/boot/build.gradle b/boot/build.gradle index ca03362f..8f7c5267 100644 --- a/boot/build.gradle +++ b/boot/build.gradle @@ -5,7 +5,7 @@ plugins { } group = 'com.reajason.javaweb' -version = '' +version = rootProject.version java { toolchain { @@ -19,6 +19,8 @@ def runtimeJvmArgs = [ '--add-opens=java.xml/com.sun.org.apache.xalan.internal.xsltc.runtime=ALL-UNNAMED' ] +tasks.processResources { filesMatching("**/application.yaml") { expand(project.properties) } } + tasks.withType(JavaCompile).configureEach { options.compilerArgs += [ '--add-exports=java.xml/com.sun.org.apache.xalan.internal.xsltc.trax=ALL-UNNAMED', @@ -52,7 +54,7 @@ dependencies { implementation 'org.apache.bcel:bcel' 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' + exclude group: 'org.springframework.boot', module: 'spring-boot-starter-tomcat' } implementation 'org.springframework.boot:spring-boot-starter-undertow' implementation 'com.google.code.gson:gson:2.11.0' diff --git a/boot/src/main/resources/application.yaml b/boot/src/main/resources/application.yaml index e445f56e..13f8adee 100644 --- a/boot/src/main/resources/application.yaml +++ b/boot/src/main/resources/application.yaml @@ -1,3 +1,4 @@ spring: application: - name: boot \ No newline at end of file + name: boot + version: ${version} \ No newline at end of file diff --git a/boot/src/main/resources/banner.txt b/boot/src/main/resources/banner.txt new file mode 100644 index 00000000..cd1505ca --- /dev/null +++ b/boot/src/main/resources/banner.txt @@ -0,0 +1,10 @@ + __ __ ____ _ _ _ ____ _ +| \/ | ___ _ __ ___ / ___|| |__ ___| | | _ \ __ _ _ __| |_ _ _ +| |\/| |/ _ \ '_ ` _ \\___ \| '_ \ / _ \ | | |_) / _` | '__| __| | | | +| | | | __/ | | | | |___) | | | | __/ | | __/ (_| | | | |_| |_| | +|_| |_|\___|_| |_| |_|____/|_| |_|\___|_|_|_| \__,_|_| \__|\__, | + |___/ + Author: ReaJason + Repo: https://github.com/ReaJason/MemShellParty + =================================================================== + ::${AnsiColor.BRIGHT_GREEN} MemShell Party ${AnsiColor.DEFAULT}:: (v${application.version}) \ No newline at end of file diff --git a/build.gradle b/build.gradle index cd163701..5ece9263 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,5 @@ +version = project.hasProperty('version') ? version : '1.0.0' + allprojects { if (it.name != 'bom') { apply(plugin: 'java') diff --git a/common/build.gradle b/common/build.gradle index ccf70751..39571346 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -3,7 +3,7 @@ plugins { } group = 'com.reajason.javaweb' -version = '' +version = rootProject.version java { sourceCompatibility = JavaVersion.VERSION_1_8 diff --git a/deserialize/build.gradle b/deserialize/build.gradle index 498ce91d..0b685969 100644 --- a/deserialize/build.gradle +++ b/deserialize/build.gradle @@ -3,6 +3,7 @@ plugins { } group = 'com.reajason.javaweb' +version = rootProject.version dependencies { implementation 'net.bytebuddy:byte-buddy' diff --git a/generator/build.gradle b/generator/build.gradle index 5fe44b66..db73315e 100644 --- a/generator/build.gradle +++ b/generator/build.gradle @@ -9,7 +9,7 @@ java { } group = 'com.reajason.javaweb.memsell' -version = '1.0-SNAPSHOT' +version = rootProject.version test { useJUnitPlatform() diff --git a/integration-test/build.gradle b/integration-test/build.gradle index 1036df33..c3c513d8 100644 --- a/integration-test/build.gradle +++ b/integration-test/build.gradle @@ -3,7 +3,7 @@ plugins { } group = 'com.reajason.javaweb' -version = '' +version = rootProject.version dependencies { testImplementation project(":vul:vul-webapp") diff --git a/memshell-java8/build.gradle b/memshell-java8/build.gradle index 4a0174e4..a699b8d9 100644 --- a/memshell-java8/build.gradle +++ b/memshell-java8/build.gradle @@ -1,5 +1,5 @@ group = 'com.reajason.javaweb' -version = '' +version = rootProject.version java { sourceCompatibility = JavaVersion.VERSION_1_8 diff --git a/memshell/build.gradle b/memshell/build.gradle index 353fd7ba..96e7a9eb 100644 --- a/memshell/build.gradle +++ b/memshell/build.gradle @@ -1,5 +1,5 @@ group = 'com.reajason.javaweb' -version = '' +version = rootProject.version java { diff --git a/tools/behinder/build.gradle b/tools/behinder/build.gradle index 02f0a0c4..b66df4ac 100644 --- a/tools/behinder/build.gradle +++ b/tools/behinder/build.gradle @@ -2,8 +2,8 @@ plugins { id "io.freefair.lombok" version "8.11" } -group = 'com.reajason.javaweb' -version = '' +group = 'com.reajason.javaweb.tools' +version = rootProject.version java { toolchain { diff --git a/tools/godzilla/build.gradle b/tools/godzilla/build.gradle index 42800f10..5bbd8ec1 100644 --- a/tools/godzilla/build.gradle +++ b/tools/godzilla/build.gradle @@ -3,8 +3,8 @@ plugins { } -group = 'com.reajason.javaweb' -version = '' +group = 'com.reajason.javaweb.tools' +version = rootProject.version java { sourceCompatibility = JavaVersion.VERSION_1_8