Skip to content

Commit 8f4381a

Browse files
committed
removed 3rd party library
With the plugin bundler, Orca could not find the class definitions used in canal.
1 parent d27fa56 commit 8f4381a

File tree

3 files changed

+0
-31
lines changed

3 files changed

+0
-31
lines changed

spring-example-orca/spring-example-orca.gradle

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ repositories {
2020
mavenCentral()
2121
jcenter()
2222
maven { url "http://dl.bintray.com/spinnaker/spinnaker/" }
23-
maven{
24-
url "https://jitpack.io"
25-
}
2623
}
2724

2825
spinnakerPlugin {
@@ -38,10 +35,6 @@ dependencies {
3835
compileOnly (group: 'com.netflix.spinnaker.orca', name: 'orca-core', version: '7.83.0') {
3936
exclude group: "org.slf4j"
4037
}
41-
implementation("com.github.canal-pipelines:canal:v0.1.1") {
42-
exclude group: "org.slf4j"
43-
exclude group: "com.netflix.spinnaker.orca"
44-
}
4538
implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.28'
4639

4740
testImplementation "org.junit.jupiter:junit-jupiter-api:5.3.2"

spring-example-orca/src/main/kotlin/io/armory/plugin/example/spring/NewController.kt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package io.armory.plugin.example.spring
22

3-
import io.pivotal.canal.model.Pipelines
43
import org.springframework.web.bind.annotation.GetMapping
54
import org.springframework.web.bind.annotation.RequestMapping
65
import org.springframework.web.bind.annotation.RestController
@@ -24,9 +23,4 @@ class NewController(private val newService: NewService) {
2423
return newService.properties()
2524
}
2625

27-
@GetMapping("/pipelines")
28-
fun pipelines(): Pipelines {
29-
return newService.pipelines()
30-
}
31-
3226
}

spring-example-orca/src/main/kotlin/io/armory/plugin/example/spring/NewService.kt

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@ package io.armory.plugin.example.spring
22

33
import com.netflix.spinnaker.orca.capabilities.CapabilitiesService
44

5-
import io.pivotal.canal.extensions.nestedstages.stages
6-
import io.pivotal.canal.extensions.pipelines
7-
import io.pivotal.canal.model.Pipelines
8-
import io.pivotal.canal.model.Wait
9-
105
class NewService(val capabilitiesService: CapabilitiesService,
116
val newProperties: NewProperties
127
) {
@@ -23,17 +18,4 @@ class NewService(val capabilitiesService: CapabilitiesService,
2318
return newProperties
2419
}
2520

26-
// uses 3rd party library that is not in Spinnaker
27-
fun pipelines(): Pipelines {
28-
return pipelines {
29-
app("app1") {
30-
pipeline("just waiting") {
31-
stages = stages {
32-
stage(Wait(420))
33-
}
34-
}
35-
}
36-
}
37-
}
38-
3921
}

0 commit comments

Comments
 (0)