diff --git a/build.gradle b/build.gradle index b9ae3b60c..9dc02d333 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'io.spinnaker.project' version "$spinnakerGradleVersion" apply false + id 'io.spinnaker.project' version "$spinnakerGradleVersion" apply false } allprojects { @@ -11,22 +11,22 @@ allprojects { } subprojects { - group = "io.spinnaker.rosco" + group = "io.spinnaker.rosco" - if (name != "rosco-bom") { - apply plugin: 'java-library' - apply plugin: "groovy" + if (name != "rosco-bom") { + apply plugin: 'java-library' + apply plugin: "groovy" - dependencies { - implementation enforcedPlatform("io.spinnaker.kork:kork-bom:$korkVersion") + dependencies { + implementation enforcedPlatform("io.spinnaker.kork:kork-bom:$korkVersion") - annotationProcessor platform("io.spinnaker.kork:kork-bom:$korkVersion") - annotationProcessor "org.projectlombok:lombok" - annotationProcessor("org.springframework.boot:spring-boot-configuration-processor") - testAnnotationProcessor platform("io.spinnaker.kork:kork-bom:$korkVersion") - testAnnotationProcessor "org.projectlombok:lombok" - testImplementation "org.springframework.boot:spring-boot-starter-test" - } + annotationProcessor platform("io.spinnaker.kork:kork-bom:$korkVersion") + annotationProcessor "org.projectlombok:lombok" + annotationProcessor("org.springframework.boot:spring-boot-configuration-processor") + testAnnotationProcessor platform("io.spinnaker.kork:kork-bom:$korkVersion") + testAnnotationProcessor "org.projectlombok:lombok" + testRuntimeOnly "org.junit.vintage:junit-vintage-engine" + } test { testLogging { @@ -56,11 +56,11 @@ subprojects { } } - tasks.withType(JavaExec) { - if (System.getProperty('DEBUG', 'false') == 'true') { - jvmArgs '-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8187' - } + tasks.withType(JavaExec) { + if (System.getProperty('DEBUG', 'false') == 'true') { + jvmArgs '-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8187' } + } } defaultTasks ':rosco-web:run' diff --git a/rosco-web/rosco-web.gradle b/rosco-web/rosco-web.gradle index d95b35051..f1322aa89 100644 --- a/rosco-web/rosco-web.gradle +++ b/rosco-web/rosco-web.gradle @@ -5,7 +5,6 @@ apply plugin: "groovy" mainClassName = 'com.netflix.spinnaker.rosco.Main' configurations.all { - //exclude group: 'javax.servlet', module: 'servlet-api' exclude group: "org.slf4j", module: "slf4j-log4j12" } @@ -20,14 +19,15 @@ dependencies { implementation "org.springframework.security:spring-security-core" compileOnly "org.springframework.boot:spring-boot-starter-actuator" implementation "io.spinnaker.kork:kork-config" + + compileOnly 'org.apache.tomcat:tomcat-servlet-api:11.0.0-M4' api "org.apache.groovy:groovy:4.0.9" implementation "io.spinnaker.kork:kork-artifacts" implementation "net.logstash.logback:logstash-logback-encoder:4.11" implementation "io.spinnaker.kork:kork-config" - //implementation "org.springframework.boot:spring-boot-starter-web" - // implementation "net.logstash.logback:logstash-logback-encoder" + runtimeOnly "io.spinnaker.kork:kork-runtime"