Merge pull request #62 from spinnaker/fix-swagger-annotations

Use the correct annotation packages so the annotations are picked up …
spinnaker · Jan 12, 2016 · ef30f0b · ef30f0b
2 parents ec5af3a + e54f7da
commit ef30f0b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/rosco-core/src/main/groovy/com/netflix/spinnaker/rosco/api/BakeRequest.groovy b/rosco-core/src/main/groovy/com/netflix/spinnaker/rosco/api/BakeRequest.groovy
@@ -18,10 +18,9 @@ package com.netflix.spinnaker.rosco.api
 
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.google.gson.annotations.SerializedName
-import com.wordnik.swagger.annotations.ApiModelProperty
 import groovy.transform.CompileStatic
 import groovy.transform.Immutable
-import org.springframework.beans.factory.annotation.Value
+import io.swagger.annotations.ApiModelProperty
 
 /**
  * A request to bake a new machine image.

diff --git a/rosco-web/src/main/groovy/com/netflix/spinnaker/rosco/controllers/BakeryController.groovy b/rosco-web/src/main/groovy/com/netflix/spinnaker/rosco/controllers/BakeryController.groovy
@@ -26,14 +26,13 @@ import com.netflix.spinnaker.rosco.providers.registry.CloudProviderBakeHandlerRe
 import com.netflix.spinnaker.rosco.rush.api.RushService
 import com.netflix.spinnaker.rosco.rush.api.ScriptExecution
 import com.netflix.spinnaker.rosco.rush.api.ScriptRequest
-import com.wordnik.swagger.annotations.ApiOperation
-import com.wordnik.swagger.annotations.ApiParam
 import groovy.util.logging.Slf4j
+import io.swagger.annotations.ApiOperation
+import io.swagger.annotations.ApiParam
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.http.HttpStatus
 import org.springframework.web.bind.annotation.*
-import retrofit.http.Path
 
 @RestController
 @Slf4j