new gradle build files: cleanup

Author: svene

build.gradle

@@ -1,31 +1,8 @@
 project.ext {
 	VERSION_JAVACC = '7.0.13'
 	DEP_SPOCK_BOM = 'org.spockframework:spock-bom:2.3-groovy-4.0'
+	DEP_SPRING_FW_BOM = 'org.springframework:spring-framework-bom:6.2.11'
 }
-/*
-project.ext {
-	VERSION_JAVACC = '7.0.13'
-	DEP_SERVLET_API = 'jakarta.servlet:jakarta.servlet-api:6.1.0'
-	DEP_JANINO = 'org.codehaus.janino:janino:3.1.12'
-	DEP_JAVASSIST = 'org.javassist:javassist:3.30.2-GA'
-	DEP_JAVACC = "net.java.dev.javacc:javacc:${VERSION_JAVACC}"
-
-	DEP_GROOVY = 'org.apache.groovy:groovy:4.0.27'
-	DEP_LOMBOK_VERSION = '1.18.40'
-	DEP_SPOCK_BOM = 'org.spockframework:spock-bom:2.3-groovy-4.0'
-	DEP_SPOCK_CORE = 'org.spockframework:spock-core'
-	DEP_JOOL = 'org.jooq:jool:0.9.15'
-	DEP_VAVR = 'io.vavr:vavr:0.10.6'
-	DEP_VERSION_SPRING_FW = '6.2.11'
-	DEP_VERSION_MOCKITO = '5.18.0'
-	DEP_VERSION_SLF4J = '2.0.17'
-	DEP_VERSION_JUNIT = '5.11.4'
-	DEP_VERSION_ASSERTJ = '3.27.4'
-	DEP_VERSION_JIMFS = '1.3.1'
-	DEP_RECORD_BUILDER = '48'
-	DEP_OPEN_REWRITE_BOM = '3.9.0'
-}
-*/
 subprojects {
 	tasks.withType(Test) {
 		testLogging {

collage/build.gradle

@@ -52,44 +52,3 @@ sourceSets {
 		}
 	}
 }
-
-
-/*
-dependencies {
-	implementation project(':xc-core')
-	implementation DEP_JAVASSIST
-	implementation DEP_JAVACC
-	testImplementation DEP_GROOVY
-	testImplementation platform(DEP_SPOCK_BOM)
-	testImplementation DEP_SPOCK_CORE
-	implementation DEP_JOOL
-	implementation DEP_VAVR
-	annotationProcessor "org.projectlombok:lombok:${DEP_LOMBOK_VERSION}"
-	compileOnly "org.projectlombok:lombok:${DEP_LOMBOK_VERSION}"
-	testAnnotationProcessor "org.projectlombok:lombok:${DEP_LOMBOK_VERSION}"
-	testCompileOnly "org.projectlombok:lombok:${DEP_LOMBOK_VERSION}"
-}
-
-sourceSets {
-	main {
-		java {
-			srcDir 'build/src/java'
-		}
-	}
-}
-
-task jcc (dependsOn: 'renameJCC', type: JavaCCTask) {
-	inputFile file('src/main/javacc/templateparser.jj')
-	genDir file('build/src/java/org/collage/jcc')
-}
-
-compileJava.dependsOn(jcc)
-
-task listJars {
-	doLast {
-		configurations.compile.each { File file ->
-			println file.name
-		}
-	}
-}
-*/

gradle/libs.versions.toml

@@ -3,6 +3,8 @@
 
 [versions]
 recordbuilder = "48"
+javacc = "7.0.13"
+#spock-bom = 'org.spockframework:spock-bom:2.3-groovy-4.0'
 
 [libraries]
 jool = { group = "org.jooq", name = "jool", version = "0.9.15" }

jst/build.gradle

@@ -54,46 +54,7 @@ dependencies {
 	testImplementation libs.assertj.core
 }
 
-/*
-dependencies {
-	implementation project(':xc-core')
-
-	implementation DEP_SERVLET_API
-	implementation DEP_JAVACC
-	implementation DEP_JANINO
-
-	annotationProcessor "org.projectlombok:lombok:${DEP_LOMBOK_VERSION}"
-	compileOnly "org.projectlombok:lombok:${DEP_LOMBOK_VERSION}"
-	testAnnotationProcessor "org.projectlombok:lombok:${DEP_LOMBOK_VERSION}"
-	testCompileOnly "org.projectlombok:lombok:${DEP_LOMBOK_VERSION}"
-	implementation DEP_JOOL
-	implementation DEP_VAVR
-}
-
-sourceSets {
-	main {
-		java {
-			srcDir 'build/src/java'
-		}
-	}
-}
-
-task jcc (dependsOn: 'renameJCC', type: JavaCCTask) {
-	inputFile 'src/main/javacc/jst.jj'
-	genDir 'build/src/java/org/xcommand/template/jst/parser'
-}
-
-compileJava.dependsOn(jcc)
-
 test {
 	systemProperty 'eu.javaspecialists.books.dynamicproxies.util.MethodTurboBooster.disabled', 'true'
 }
 
-task listJars {
-	doLast {
-		configurations.compile.each { File file ->
-			println file.name
-		}
-	}
-}
-*/

xc-core/build.gradle

@@ -11,36 +11,10 @@ dependencies {
 	implementation libs.janino.janino
 	implementation libs.servlet.api
 
-	implementation(platform("org.springframework:spring-framework-bom:6.2.11"))
+	implementation(platform(DEP_SPRING_FW_BOM))
 	implementation libs.spring.core
 	implementation libs.spring.web
 
 	testImplementation libs.spring.test
 	testImplementation libs.assertj.core
-
 }
-/*
-dependencies {
-	implementation DEP_SERVLET_API
-	implementation(platform("org.springframework:spring-framework-bom:${DEP_VERSION_SPRING_FW}"))
-	implementation 'org.springframework:spring-core'
-	implementation 'org.springframework:spring-websocket'
-	implementation DEP_JANINO
-	implementation 'eu.javaspecialists.books.dynamicproxies:core:2.0.0'
-	implementation DEP_VAVR
-	implementation DEP_JOOL
-
-	testImplementation 'org.springframework:spring-test'
-	testImplementation DEP_GROOVY
-	testImplementation platform(DEP_SPOCK_BOM)
-	testImplementation DEP_SPOCK_CORE
-	testImplementation 'cglib:cglib:3.3.0'
-
-	compileOnly "org.projectlombok:lombok:${DEP_LOMBOK_VERSION}"
-	annotationProcessor "org.projectlombok:lombok:${DEP_LOMBOK_VERSION}"
-	testCompileOnly "org.projectlombok:lombok:${DEP_LOMBOK_VERSION}"
-	testAnnotationProcessor "org.projectlombok:lombok:${DEP_LOMBOK_VERSION}"
-}
-*/
-
-