diff --git a/orca-core/orca-core.gradle b/orca-core/orca-core.gradle index 2e6e28624a..00aa5fa88f 100644 --- a/orca-core/orca-core.gradle +++ b/orca-core/orca-core.gradle @@ -32,7 +32,6 @@ dependencies { api("com.netflix.spinnaker.kork:kork-plugins") api("io.reactivex:rxjava") - implementation(project(":orca-extensionpoint")) implementation(project(":orca-api")) implementation("com.github.ben-manes.caffeine:guava") implementation("org.slf4j:slf4j-api") diff --git a/orca-extensionpoint/src/main/java/com/netflix/spinnaker/orca/extensionpoint/pipeline/ExecutionPreprocessor.java b/orca-core/src/main/java/com/netflix/spinnaker/orca/extensionpoint/pipeline/ExecutionPreprocessor.java similarity index 95% rename from orca-extensionpoint/src/main/java/com/netflix/spinnaker/orca/extensionpoint/pipeline/ExecutionPreprocessor.java rename to orca-core/src/main/java/com/netflix/spinnaker/orca/extensionpoint/pipeline/ExecutionPreprocessor.java index 543eb9f121..280ff5b5b2 100644 --- a/orca-extensionpoint/src/main/java/com/netflix/spinnaker/orca/extensionpoint/pipeline/ExecutionPreprocessor.java +++ b/orca-core/src/main/java/com/netflix/spinnaker/orca/extensionpoint/pipeline/ExecutionPreprocessor.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/orca-extensionpoint/README.md b/orca-extensionpoint/README.md deleted file mode 100644 index 49a5129cad..0000000000 --- a/orca-extensionpoint/README.md +++ /dev/null @@ -1,4 +0,0 @@ -Extension interfaces for orca. - -This is (and should remain) a low/no dependency module that defines extension interfaces for extending -orca with custom functionality. diff --git a/orca-extensionpoint/orca-extensionpoint.gradle b/orca-extensionpoint/orca-extensionpoint.gradle deleted file mode 100644 index 0a92512e78..0000000000 --- a/orca-extensionpoint/orca-extensionpoint.gradle +++ /dev/null @@ -1,5 +0,0 @@ -apply from: "$rootDir/gradle/spock.gradle" - -dependencies { - implementation("com.google.code.findbugs:jsr305") -} diff --git a/orca-front50/orca-front50.gradle b/orca-front50/orca-front50.gradle index e624440524..4b93a12f87 100644 --- a/orca-front50/orca-front50.gradle +++ b/orca-front50/orca-front50.gradle @@ -19,7 +19,6 @@ apply from: "$rootDir/gradle/groovy.gradle" dependencies { implementation(project(":orca-core")) implementation(project(":orca-retrofit")) - implementation(project(":orca-extensionpoint")) implementation("com.netflix.spinnaker.fiat:fiat-api:$fiatVersion") implementation("com.netflix.spinnaker.fiat:fiat-core:$fiatVersion") implementation("com.netflix.spectator:spectator-api") diff --git a/orca-pipelinetemplate/orca-pipelinetemplate.gradle b/orca-pipelinetemplate/orca-pipelinetemplate.gradle index 0b8df12276..34db2b9a58 100644 --- a/orca-pipelinetemplate/orca-pipelinetemplate.gradle +++ b/orca-pipelinetemplate/orca-pipelinetemplate.gradle @@ -2,7 +2,6 @@ apply from: "$rootDir/gradle/spock.gradle" apply from: "$rootDir/gradle/kotlin.gradle" dependencies { - implementation(project(":orca-extensionpoint")) implementation(project(":orca-core")) implementation(project(":orca-retrofit")) implementation(project(":orca-front50")) diff --git a/orca-web/orca-web.gradle b/orca-web/orca-web.gradle index 39db53fb38..bcc2923966 100644 --- a/orca-web/orca-web.gradle +++ b/orca-web/orca-web.gradle @@ -41,7 +41,6 @@ dependencies { implementation(project(":orca-dry-run")) implementation(project(":orca-echo")) implementation(project(":orca-eureka")) - implementation(project(":orca-extensionpoint")) implementation(project(":orca-flex")) implementation(project(":orca-front50")) implementation(project(":orca-igor")) diff --git a/settings.gradle b/settings.gradle index 1d1166ebbd..d3cad1d491 100644 --- a/settings.gradle +++ b/settings.gradle @@ -25,7 +25,6 @@ include "orca-api", "orca-dry-run", "orca-echo", "orca-eureka", - "orca-extensionpoint", "orca-flex", "orca-front50", "orca-igor",