refactor(*): Merge orca-extensionpoint module into orca-core (#3240)

spinnaker · Oct 23, 2019 · ea0d7b4 · ea0d7b4
1 parent 5e585b1
commit ea0d7b4
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 15 deletions.
diff --git 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/...point/pipeline/ExecutionPreprocessor.java → ...point/pipeline/ExecutionPreprocessor.java b/...point/pipeline/ExecutionPreprocessor.java → ...point/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
diff --git a/orca-extensionpoint/orca-extensionpoint.gradle b/orca-extensionpoint/orca-extensionpoint.gradle
diff --git 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
@@ -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
@@ -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
@@ -25,7 +25,6 @@ include "orca-api",
   "orca-dry-run",
   "orca-echo",
   "orca-eureka",
-  "orca-extensionpoint",
   "orca-flex",
   "orca-front50",
   "orca-igor",