Skip to content

Commit

Permalink
chore(*): Bump spinnaker-dev plugin (spinnaker#2914)
Browse files Browse the repository at this point in the history
* 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.
  • Loading branch information
ezimanyi authored May 13, 2019
1 parent 4e256ea commit 338c2e3
Show file tree
Hide file tree
Showing 40 changed files with 40 additions and 42 deletions.
8 changes: 6 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion orca-bakery/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# orca-bakery

Contains task definitions for running Bakery tasks with Orca.
Contains task definitions for running Bakery tasks with Orca.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Only the pipeline stages which are specific to AWS should belong to this package
Only the pipeline stages which are specific to AWS should belong to this package
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Only the pipeline stages which are specific to GCE should belong to this package
Only the pipeline stages which are specific to GCE should belong to this package
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Only the tasks which are specific to AWS should belong to this package
Only the tasks which are specific to AWS should belong to this package
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Only the tasks which are specific to GCE should belong to this package
Only the tasks which are specific to GCE should belong to this package
2 changes: 1 addition & 1 deletion orca-core/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# orca-core

Contains the core API of Orca.
Contains the core API of Orca.
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,3 @@ stages:
- waitChild2
config:
waitTime: 10

Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,3 @@ configuration:
when:
- pipeline.failed
triggers: []


Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,3 @@ stages:
type: wait
config:
waitTime: "{{ waitTime }}"

Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,3 @@ stages:
type: wait
config:
waitTime: "{{ waitTime }}"

2 changes: 1 addition & 1 deletion orca-retrofit/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# orca-retrofit

Contains common configuration for Orca extensions that communicate with external REST services using Retrofit.
Contains common configuration for Orca extensions that communicate with external REST services using Retrofit.
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,3 @@ databaseChangeLog:
- dropUniqueConstraint:
tableName: pipeline_stages
constraintName: pipeline_stages_legacy_id_unique

2 changes: 1 addition & 1 deletion orca-test/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# orca-test

Contains common test utilities used by other Orca sub-projects.
Contains common test utilities used by other Orca sub-projects.
2 changes: 1 addition & 1 deletion orca-validation/src/main/resources/schemas/acaTask.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion orca-validation/src/main/resources/schemas/bake.json
Original file line number Diff line number Diff line change
Expand Up @@ -192,4 +192,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion orca-validation/src/main/resources/schemas/canary.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,4 +95,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion orca-validation/src/main/resources/schemas/chap.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,4 @@
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,4 @@
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -151,4 +151,4 @@
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -98,4 +98,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion orca-validation/src/main/resources/schemas/deploy.json
Original file line number Diff line number Diff line change
Expand Up @@ -202,4 +202,4 @@
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -111,4 +111,4 @@
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -119,4 +119,4 @@
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -127,4 +127,4 @@
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -111,4 +111,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion orca-validation/src/main/resources/schemas/findImage.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,4 +111,4 @@
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -95,4 +95,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion orca-validation/src/main/resources/schemas/jenkins.json
Original file line number Diff line number Diff line change
Expand Up @@ -161,4 +161,4 @@
"type" : "boolean"
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,4 @@
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -119,4 +119,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion orca-validation/src/main/resources/schemas/pipeline.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,4 +95,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion orca-validation/src/main/resources/schemas/quickPatch.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,4 +93,4 @@
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -159,4 +159,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion orca-validation/src/main/resources/schemas/runJob.json
Original file line number Diff line number Diff line change
Expand Up @@ -151,4 +151,4 @@
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -127,4 +127,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion orca-validation/src/main/resources/schemas/script.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,4 +101,4 @@
"type" : "boolean"
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -135,4 +135,4 @@
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -87,4 +87,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion orca-validation/src/main/resources/schemas/wait.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,4 @@
}
}
}
}
}

0 comments on commit 338c2e3

Please sign in to comment.