From 338c2e3a4c9536e3098e0e7e7cb238304a1c2da1 Mon Sep 17 00:00:00 2001 From: Eric Zimanyi Date: Mon, 13 May 2019 17:00:43 -0400 Subject: [PATCH] chore(*): Bump spinnaker-dev plugin (#2914) * chore(*): Apply codestyles to non-project files The next commit pulls in the codestyles plugin, and applies it to the base project (but not to subprojects). In preparation, run the formatter and commit the changes as a single commit. * chore(*): Bump spinnaker-dev plugin We need the new plugin to set spring.config.additional-location instead of spring.config.location when running services. --- build.gradle | 8 ++++++-- orca-bakery/README.md | 2 +- .../orca/clouddriver/pipeline/providers/aws/README.md | 2 +- .../orca/clouddriver/pipeline/providers/gce/README.md | 2 +- .../orca/clouddriver/tasks/providers/aws/README.md | 2 +- .../orca/clouddriver/tasks/providers/gce/README.md | 2 +- orca-core/README.md | 2 +- .../resources/integration/v1schema/example-config.yml | 1 - .../integration/v1schema/exampleCombined-config.yml | 2 -- .../resources/integration/v1schema/protect-template.yml | 1 - .../integration/v1schema/variableWrongType-template.yml | 1 - orca-retrofit/README.md | 2 +- .../db/changelog/20180530-add-legacy-id-constraints.yml | 1 - orca-test/README.md | 2 +- orca-validation/src/main/resources/schemas/acaTask.json | 2 +- orca-validation/src/main/resources/schemas/bake.json | 2 +- orca-validation/src/main/resources/schemas/canary.json | 2 +- orca-validation/src/main/resources/schemas/chap.json | 2 +- .../src/main/resources/schemas/checkPreconditions.json | 2 +- .../src/main/resources/schemas/cloneServerGroup.json | 2 +- .../src/main/resources/schemas/createProperty.json | 2 +- orca-validation/src/main/resources/schemas/deploy.json | 2 +- .../src/main/resources/schemas/destroyServerGroup.json | 2 +- .../src/main/resources/schemas/disableCluster.json | 2 +- .../src/main/resources/schemas/disableServerGroup.json | 2 +- .../src/main/resources/schemas/enableServerGroup.json | 2 +- orca-validation/src/main/resources/schemas/findImage.json | 2 +- .../src/main/resources/schemas/findImageFromTags.json | 2 +- orca-validation/src/main/resources/schemas/jenkins.json | 2 +- .../src/main/resources/schemas/manualJudgment.json | 2 +- .../main/resources/schemas/modifyAwsScalingProcess.json | 2 +- orca-validation/src/main/resources/schemas/pipeline.json | 2 +- .../src/main/resources/schemas/quickPatch.json | 2 +- .../src/main/resources/schemas/resizeServerGroup.json | 2 +- orca-validation/src/main/resources/schemas/runJob.json | 2 +- .../src/main/resources/schemas/scaleDownCluster.json | 2 +- orca-validation/src/main/resources/schemas/script.json | 2 +- .../src/main/resources/schemas/shrinkCluster.json | 2 +- .../src/main/resources/schemas/upsertImageTags.json | 2 +- orca-validation/src/main/resources/schemas/wait.json | 2 +- 40 files changed, 40 insertions(+), 42 deletions(-) diff --git a/build.gradle b/build.gradle index fff7e3025c..2a75cd43bd 100644 --- a/build.gradle +++ b/build.gradle @@ -21,9 +21,9 @@ buildscript { maven { url "https://plugins.gradle.org/m2/" } } dependencies { - classpath "com.netflix.spinnaker.gradle:spinnaker-dev-plugin:6.0.0" + classpath "com.netflix.spinnaker.gradle:spinnaker-dev-plugin:6.3.0" if (Boolean.valueOf(enablePublishing)) { - classpath "com.netflix.spinnaker.gradle:spinnaker-gradle-project:6.0.0" + classpath "com.netflix.spinnaker.gradle:spinnaker-gradle-project:6.3.0" } classpath "com.netflix.nebula:nebula-kotlin-plugin:1.3.31" classpath "org.jetbrains.kotlin:kotlin-allopen:1.3.31" @@ -53,6 +53,10 @@ allprojects { subprojects { apply plugin: "java-library" + spinnakerCodeStyle { + enabled = false + } + if ([korkVersion, keikoVersion, fiatVersion].any { it.endsWith("-SNAPSHOT") }) { logger.info("Enabling mavenLocal") repositories { diff --git a/orca-bakery/README.md b/orca-bakery/README.md index 708d5d82bc..67feacb9b2 100644 --- a/orca-bakery/README.md +++ b/orca-bakery/README.md @@ -1,3 +1,3 @@ # orca-bakery -Contains task definitions for running Bakery tasks with Orca. \ No newline at end of file +Contains task definitions for running Bakery tasks with Orca. diff --git a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/providers/aws/README.md b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/providers/aws/README.md index 4910eecd70..ce6b4c9ea0 100644 --- a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/providers/aws/README.md +++ b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/providers/aws/README.md @@ -1 +1 @@ -Only the pipeline stages which are specific to AWS should belong to this package \ No newline at end of file +Only the pipeline stages which are specific to AWS should belong to this package diff --git a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/providers/gce/README.md b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/providers/gce/README.md index a3012df6d0..dbd15abf22 100644 --- a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/providers/gce/README.md +++ b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/providers/gce/README.md @@ -1 +1 @@ -Only the pipeline stages which are specific to GCE should belong to this package \ No newline at end of file +Only the pipeline stages which are specific to GCE should belong to this package diff --git a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/providers/aws/README.md b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/providers/aws/README.md index fa93a4b44c..405bcee576 100644 --- a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/providers/aws/README.md +++ b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/providers/aws/README.md @@ -1 +1 @@ -Only the tasks which are specific to AWS should belong to this package \ No newline at end of file +Only the tasks which are specific to AWS should belong to this package diff --git a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/providers/gce/README.md b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/providers/gce/README.md index 537b92462b..fcb49862a6 100644 --- a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/providers/gce/README.md +++ b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/providers/gce/README.md @@ -1 +1 @@ -Only the tasks which are specific to GCE should belong to this package \ No newline at end of file +Only the tasks which are specific to GCE should belong to this package diff --git a/orca-core/README.md b/orca-core/README.md index 2733a2a54d..7d68b1cb37 100644 --- a/orca-core/README.md +++ b/orca-core/README.md @@ -1,3 +1,3 @@ # orca-core -Contains the core API of Orca. \ No newline at end of file +Contains the core API of Orca. diff --git a/orca-pipelinetemplate/src/test/resources/integration/v1schema/example-config.yml b/orca-pipelinetemplate/src/test/resources/integration/v1schema/example-config.yml index 43b139efc3..f29f739061 100644 --- a/orca-pipelinetemplate/src/test/resources/integration/v1schema/example-config.yml +++ b/orca-pipelinetemplate/src/test/resources/integration/v1schema/example-config.yml @@ -24,4 +24,3 @@ stages: - waitChild2 config: waitTime: 10 - diff --git a/orca-pipelinetemplate/src/test/resources/integration/v1schema/exampleCombined-config.yml b/orca-pipelinetemplate/src/test/resources/integration/v1schema/exampleCombined-config.yml index e2c87d799a..47ca5354f7 100644 --- a/orca-pipelinetemplate/src/test/resources/integration/v1schema/exampleCombined-config.yml +++ b/orca-pipelinetemplate/src/test/resources/integration/v1schema/exampleCombined-config.yml @@ -16,5 +16,3 @@ configuration: when: - pipeline.failed triggers: [] - - diff --git a/orca-pipelinetemplate/src/test/resources/integration/v1schema/protect-template.yml b/orca-pipelinetemplate/src/test/resources/integration/v1schema/protect-template.yml index f63a7ee686..3da7328c9b 100644 --- a/orca-pipelinetemplate/src/test/resources/integration/v1schema/protect-template.yml +++ b/orca-pipelinetemplate/src/test/resources/integration/v1schema/protect-template.yml @@ -10,4 +10,3 @@ stages: type: wait config: waitTime: "{{ waitTime }}" - diff --git a/orca-pipelinetemplate/src/test/resources/integration/v1schema/variableWrongType-template.yml b/orca-pipelinetemplate/src/test/resources/integration/v1schema/variableWrongType-template.yml index 254b7c52b4..41e78beb20 100644 --- a/orca-pipelinetemplate/src/test/resources/integration/v1schema/variableWrongType-template.yml +++ b/orca-pipelinetemplate/src/test/resources/integration/v1schema/variableWrongType-template.yml @@ -13,4 +13,3 @@ stages: type: wait config: waitTime: "{{ waitTime }}" - diff --git a/orca-retrofit/README.md b/orca-retrofit/README.md index d71f0eebe5..6d8b299eb5 100644 --- a/orca-retrofit/README.md +++ b/orca-retrofit/README.md @@ -1,3 +1,3 @@ # orca-retrofit -Contains common configuration for Orca extensions that communicate with external REST services using Retrofit. \ No newline at end of file +Contains common configuration for Orca extensions that communicate with external REST services using Retrofit. diff --git a/orca-sql/src/main/resources/db/changelog/20180530-add-legacy-id-constraints.yml b/orca-sql/src/main/resources/db/changelog/20180530-add-legacy-id-constraints.yml index 0a4ecd730f..b44ab3366e 100644 --- a/orca-sql/src/main/resources/db/changelog/20180530-add-legacy-id-constraints.yml +++ b/orca-sql/src/main/resources/db/changelog/20180530-add-legacy-id-constraints.yml @@ -34,4 +34,3 @@ databaseChangeLog: - dropUniqueConstraint: tableName: pipeline_stages constraintName: pipeline_stages_legacy_id_unique - diff --git a/orca-test/README.md b/orca-test/README.md index 91844ff665..47d7b06dbf 100644 --- a/orca-test/README.md +++ b/orca-test/README.md @@ -1,3 +1,3 @@ # orca-test -Contains common test utilities used by other Orca sub-projects. \ No newline at end of file +Contains common test utilities used by other Orca sub-projects. diff --git a/orca-validation/src/main/resources/schemas/acaTask.json b/orca-validation/src/main/resources/schemas/acaTask.json index 1d8ed06363..a6598ccb87 100644 --- a/orca-validation/src/main/resources/schemas/acaTask.json +++ b/orca-validation/src/main/resources/schemas/acaTask.json @@ -72,4 +72,4 @@ } } } -} \ No newline at end of file +} diff --git a/orca-validation/src/main/resources/schemas/bake.json b/orca-validation/src/main/resources/schemas/bake.json index ab8c754cd5..eb18ded40a 100644 --- a/orca-validation/src/main/resources/schemas/bake.json +++ b/orca-validation/src/main/resources/schemas/bake.json @@ -192,4 +192,4 @@ } } } -} \ No newline at end of file +} diff --git a/orca-validation/src/main/resources/schemas/canary.json b/orca-validation/src/main/resources/schemas/canary.json index e174123670..a2bc753fdb 100644 --- a/orca-validation/src/main/resources/schemas/canary.json +++ b/orca-validation/src/main/resources/schemas/canary.json @@ -95,4 +95,4 @@ } } } -} \ No newline at end of file +} diff --git a/orca-validation/src/main/resources/schemas/chap.json b/orca-validation/src/main/resources/schemas/chap.json index a3e9d463f5..8fbd44035d 100644 --- a/orca-validation/src/main/resources/schemas/chap.json +++ b/orca-validation/src/main/resources/schemas/chap.json @@ -63,4 +63,4 @@ } } } -} \ No newline at end of file +} diff --git a/orca-validation/src/main/resources/schemas/checkPreconditions.json b/orca-validation/src/main/resources/schemas/checkPreconditions.json index be83c4226e..320d7b4ebc 100644 --- a/orca-validation/src/main/resources/schemas/checkPreconditions.json +++ b/orca-validation/src/main/resources/schemas/checkPreconditions.json @@ -66,4 +66,4 @@ } } } -} \ No newline at end of file +} diff --git a/orca-validation/src/main/resources/schemas/cloneServerGroup.json b/orca-validation/src/main/resources/schemas/cloneServerGroup.json index 7d35db14d0..da91e52a09 100644 --- a/orca-validation/src/main/resources/schemas/cloneServerGroup.json +++ b/orca-validation/src/main/resources/schemas/cloneServerGroup.json @@ -151,4 +151,4 @@ } } } -} \ No newline at end of file +} diff --git a/orca-validation/src/main/resources/schemas/createProperty.json b/orca-validation/src/main/resources/schemas/createProperty.json index 32b6604b84..455933e21b 100644 --- a/orca-validation/src/main/resources/schemas/createProperty.json +++ b/orca-validation/src/main/resources/schemas/createProperty.json @@ -98,4 +98,4 @@ } } } -} \ No newline at end of file +} diff --git a/orca-validation/src/main/resources/schemas/deploy.json b/orca-validation/src/main/resources/schemas/deploy.json index 9947d02ca6..7c6fa715f6 100644 --- a/orca-validation/src/main/resources/schemas/deploy.json +++ b/orca-validation/src/main/resources/schemas/deploy.json @@ -202,4 +202,4 @@ } } } -} \ No newline at end of file +} diff --git a/orca-validation/src/main/resources/schemas/destroyServerGroup.json b/orca-validation/src/main/resources/schemas/destroyServerGroup.json index 7d416687ae..bba2c24d46 100644 --- a/orca-validation/src/main/resources/schemas/destroyServerGroup.json +++ b/orca-validation/src/main/resources/schemas/destroyServerGroup.json @@ -111,4 +111,4 @@ } } } -} \ No newline at end of file +} diff --git a/orca-validation/src/main/resources/schemas/disableCluster.json b/orca-validation/src/main/resources/schemas/disableCluster.json index 10d8c96487..f0cfd31646 100644 --- a/orca-validation/src/main/resources/schemas/disableCluster.json +++ b/orca-validation/src/main/resources/schemas/disableCluster.json @@ -119,4 +119,4 @@ } } } -} \ No newline at end of file +} diff --git a/orca-validation/src/main/resources/schemas/disableServerGroup.json b/orca-validation/src/main/resources/schemas/disableServerGroup.json index fe70f00920..b7e863e432 100644 --- a/orca-validation/src/main/resources/schemas/disableServerGroup.json +++ b/orca-validation/src/main/resources/schemas/disableServerGroup.json @@ -127,4 +127,4 @@ } } } -} \ No newline at end of file +} diff --git a/orca-validation/src/main/resources/schemas/enableServerGroup.json b/orca-validation/src/main/resources/schemas/enableServerGroup.json index 916f6fdcb2..7542ef2a44 100644 --- a/orca-validation/src/main/resources/schemas/enableServerGroup.json +++ b/orca-validation/src/main/resources/schemas/enableServerGroup.json @@ -111,4 +111,4 @@ } } } -} \ No newline at end of file +} diff --git a/orca-validation/src/main/resources/schemas/findImage.json b/orca-validation/src/main/resources/schemas/findImage.json index 3d67dd4077..0e15f89e55 100644 --- a/orca-validation/src/main/resources/schemas/findImage.json +++ b/orca-validation/src/main/resources/schemas/findImage.json @@ -111,4 +111,4 @@ } } } -} \ No newline at end of file +} diff --git a/orca-validation/src/main/resources/schemas/findImageFromTags.json b/orca-validation/src/main/resources/schemas/findImageFromTags.json index 5aed260d28..9527b4ca26 100644 --- a/orca-validation/src/main/resources/schemas/findImageFromTags.json +++ b/orca-validation/src/main/resources/schemas/findImageFromTags.json @@ -95,4 +95,4 @@ } } } -} \ No newline at end of file +} diff --git a/orca-validation/src/main/resources/schemas/jenkins.json b/orca-validation/src/main/resources/schemas/jenkins.json index 782b74def1..aebc1ea500 100644 --- a/orca-validation/src/main/resources/schemas/jenkins.json +++ b/orca-validation/src/main/resources/schemas/jenkins.json @@ -161,4 +161,4 @@ "type" : "boolean" } } -} \ No newline at end of file +} diff --git a/orca-validation/src/main/resources/schemas/manualJudgment.json b/orca-validation/src/main/resources/schemas/manualJudgment.json index bdf918b1fe..f5eb883291 100644 --- a/orca-validation/src/main/resources/schemas/manualJudgment.json +++ b/orca-validation/src/main/resources/schemas/manualJudgment.json @@ -85,4 +85,4 @@ } } } -} \ No newline at end of file +} diff --git a/orca-validation/src/main/resources/schemas/modifyAwsScalingProcess.json b/orca-validation/src/main/resources/schemas/modifyAwsScalingProcess.json index 893463d2ee..e4f36e9af5 100644 --- a/orca-validation/src/main/resources/schemas/modifyAwsScalingProcess.json +++ b/orca-validation/src/main/resources/schemas/modifyAwsScalingProcess.json @@ -119,4 +119,4 @@ } } } -} \ No newline at end of file +} diff --git a/orca-validation/src/main/resources/schemas/pipeline.json b/orca-validation/src/main/resources/schemas/pipeline.json index b2215eb6f0..7eb496f305 100644 --- a/orca-validation/src/main/resources/schemas/pipeline.json +++ b/orca-validation/src/main/resources/schemas/pipeline.json @@ -95,4 +95,4 @@ } } } -} \ No newline at end of file +} diff --git a/orca-validation/src/main/resources/schemas/quickPatch.json b/orca-validation/src/main/resources/schemas/quickPatch.json index e4ce796a9a..4bfa2bea48 100644 --- a/orca-validation/src/main/resources/schemas/quickPatch.json +++ b/orca-validation/src/main/resources/schemas/quickPatch.json @@ -93,4 +93,4 @@ } } } -} \ No newline at end of file +} diff --git a/orca-validation/src/main/resources/schemas/resizeServerGroup.json b/orca-validation/src/main/resources/schemas/resizeServerGroup.json index f9610ccf3f..7edd777a71 100644 --- a/orca-validation/src/main/resources/schemas/resizeServerGroup.json +++ b/orca-validation/src/main/resources/schemas/resizeServerGroup.json @@ -159,4 +159,4 @@ } } } -} \ No newline at end of file +} diff --git a/orca-validation/src/main/resources/schemas/runJob.json b/orca-validation/src/main/resources/schemas/runJob.json index 35cd738a46..6161176521 100644 --- a/orca-validation/src/main/resources/schemas/runJob.json +++ b/orca-validation/src/main/resources/schemas/runJob.json @@ -151,4 +151,4 @@ } } } -} \ No newline at end of file +} diff --git a/orca-validation/src/main/resources/schemas/scaleDownCluster.json b/orca-validation/src/main/resources/schemas/scaleDownCluster.json index 65ca92c485..d1d6acb798 100644 --- a/orca-validation/src/main/resources/schemas/scaleDownCluster.json +++ b/orca-validation/src/main/resources/schemas/scaleDownCluster.json @@ -127,4 +127,4 @@ } } } -} \ No newline at end of file +} diff --git a/orca-validation/src/main/resources/schemas/script.json b/orca-validation/src/main/resources/schemas/script.json index 12417ff3ee..7713acba56 100644 --- a/orca-validation/src/main/resources/schemas/script.json +++ b/orca-validation/src/main/resources/schemas/script.json @@ -101,4 +101,4 @@ "type" : "boolean" } } -} \ No newline at end of file +} diff --git a/orca-validation/src/main/resources/schemas/shrinkCluster.json b/orca-validation/src/main/resources/schemas/shrinkCluster.json index f9eb1d708b..e94a1023d6 100644 --- a/orca-validation/src/main/resources/schemas/shrinkCluster.json +++ b/orca-validation/src/main/resources/schemas/shrinkCluster.json @@ -135,4 +135,4 @@ } } } -} \ No newline at end of file +} diff --git a/orca-validation/src/main/resources/schemas/upsertImageTags.json b/orca-validation/src/main/resources/schemas/upsertImageTags.json index db9b927c93..e0535d21a3 100644 --- a/orca-validation/src/main/resources/schemas/upsertImageTags.json +++ b/orca-validation/src/main/resources/schemas/upsertImageTags.json @@ -87,4 +87,4 @@ } } } -} \ No newline at end of file +} diff --git a/orca-validation/src/main/resources/schemas/wait.json b/orca-validation/src/main/resources/schemas/wait.json index a062f07e90..ee301acb6e 100644 --- a/orca-validation/src/main/resources/schemas/wait.json +++ b/orca-validation/src/main/resources/schemas/wait.json @@ -90,4 +90,4 @@ } } } -} \ No newline at end of file +}