-
Notifications
You must be signed in to change notification settings - Fork 2.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into tpu_queued_resources_time_bound
- Loading branch information
Showing
102 changed files
with
4,496 additions
and
2,192 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,142 +1,136 @@ | ||
| // find legacy configuration at https://github.com/GoogleCloudPlatform/java-docs-samples/blob/91792d4da53a12f96032f4556815f7d91f27257b/renovate.json | ||
| { | ||
| "extends": [ | ||
| "config:recommended", | ||
| ":approveMajorUpdates", | ||
| "schedule:earlyMondays", | ||
| ":ignoreUnstable", | ||
| extends: [ | ||
| 'config:recommended', | ||
| ':approveMajorUpdates', | ||
| 'schedule:earlyMondays', | ||
| ':ignoreUnstable', | ||
| ], | ||
| "labels": [ | ||
| "dependencies", | ||
| "automerge" | ||
| labels: [ | ||
| 'dependencies', | ||
| 'automerge', | ||
| ], | ||
| "minimumReleaseAge": "7 days", | ||
| "dependencyDashboardLabels": [ | ||
| "type: process", | ||
| minimumReleaseAge: '7 days', | ||
| dependencyDashboardLabels: [ | ||
| 'type: process', | ||
| ], | ||
| // discontinue upgrades for java8 code samples | ||
| "ignorePaths": ["**/*java8*/**", "**/*java-8*/**"], | ||
| "packageRules": [ | ||
| ignorePaths: [ | ||
| '**/*java8*/**', | ||
| '**/*java-8*/**', | ||
| ], | ||
| packageRules: [ | ||
| { | ||
| "matchCategories": [ | ||
| "java" | ||
| matchCategories: [ | ||
| 'java', | ||
| ], | ||
| addLabels: [ | ||
| 'lang: java', | ||
| ], | ||
| "addLabels": [ | ||
| "lang: java" | ||
| ] | ||
| }, | ||
| // TODO: check if auto-merge rules will work at all | ||
| { | ||
| "matchUpdateTypes": [ | ||
| "minor", | ||
| "patch", | ||
| "digest", | ||
| "lockFileMaintenance" | ||
| matchUpdateTypes: [ | ||
| 'minor', | ||
| 'patch', | ||
| 'digest', | ||
| 'lockFileMaintenance', | ||
| ], | ||
| "automerge": true | ||
| automerge: true, | ||
| }, | ||
| { | ||
| "matchDepTypes": [ | ||
| "devDependencies" | ||
| matchDepTypes: [ | ||
| 'devDependencies', | ||
| ], | ||
| "automerge": true | ||
| automerge: true, | ||
| }, | ||
| // group all Dockerfile dependencies | ||
| { | ||
| "matchCategories": [ | ||
| "docker" | ||
| ], | ||
| "matchUpdateTypes": [ | ||
| "minor", | ||
| "patch", | ||
| "digest", | ||
| "lockFileMaintenance" | ||
| ], | ||
| "groupName": "docker", | ||
| "pinDigests": true, | ||
| "automerge": true | ||
| matchCategories: [ | ||
| 'docker', | ||
| ], | ||
| matchUpdateTypes: [ | ||
| 'minor', | ||
| 'patch', | ||
| 'digest', | ||
| 'lockFileMaintenance', | ||
| ], | ||
| groupName: 'docker', | ||
| pinDigests: true, | ||
| automerge: true, | ||
| }, | ||
| // group all terraform dependencies for google providers | ||
| { | ||
| "matchCategories": [ | ||
| "terraform" | ||
| matchCategories: [ | ||
| 'terraform', | ||
| ], | ||
| matchDepTypes: [ | ||
| 'provider', | ||
| 'required_provider', | ||
| ], | ||
| "matchDepTypes": [ | ||
| "provider", | ||
| "required_provider" | ||
| groupName: 'Terraform Google providers', | ||
| matchPackageNames: [ | ||
| '/^google/', | ||
| ], | ||
| "matchPackagePatterns": "^google", | ||
| "groupName": "Terraform Google providers", | ||
| }, | ||
| // *** Java dependency rules: | ||
| // group *ALL* Java dependencies | ||
| { | ||
| "matchCategories": [ | ||
| "java" | ||
| matchCategories: [ | ||
| 'java', | ||
| ], | ||
| "matchUpdateTypes": [ | ||
| "minor", | ||
| "patch", | ||
| "digest", | ||
| "lockFileMaintenance" | ||
| matchUpdateTypes: [ | ||
| 'minor', | ||
| 'patch', | ||
| 'digest', | ||
| 'lockFileMaintenance', | ||
| ], | ||
| "groupName": "java", | ||
| "automerge": true | ||
| groupName: 'java', | ||
| automerge: true, | ||
| }, | ||
| // do not allow Spring Boot 3 upgrades yet | ||
| { | ||
| "matchCategories": [ | ||
| "java" | ||
| matchCategories: [ | ||
| 'java', | ||
| ], | ||
| "matchPackagePatterns": [ | ||
| "org.springframework.boot" | ||
| matchCurrentVersion: '>=2.0.0, <3.0.0', | ||
| allowedVersions: '<3', | ||
| groupName: 'Spring Boot upgrades for v2', | ||
| description: '@akitsch: Spring Boot V3 requires Java 17', | ||
| matchPackageNames: [ | ||
| '/org.springframework.boot/', | ||
| ], | ||
| "matchCurrentVersion": ">=2.0.0, <3.0.0", | ||
| "allowedVersions": "<3", | ||
| "groupName": "Spring Boot upgrades for v2", | ||
| "description": "@akitsch: Spring Boot V3 requires Java 17" | ||
| }, | ||
| // limit micronaut upgrades for versions <= 4 | ||
| { | ||
| "matchPackagePatterns": [ | ||
| "^io.micronaut" | ||
| groupName: 'Micronaut packages', | ||
| allowedVersions: '<4', | ||
| matchFileNames: [ | ||
| 'appengine-java11/**', | ||
| 'flexible/java-11/**', | ||
| ], | ||
| "groupName": "Micronaut packages", | ||
| "allowedVersions": "<4", | ||
| "matchPaths": [ | ||
| "appengine-java11/**", | ||
| "flexible/java-11/**" | ||
| description: '@akitsch: Micronaut V4 requires Java 17', | ||
| matchPackageNames: [ | ||
| '/^io.micronaut/', | ||
| ], | ||
| "description": "@akitsch: Micronaut V4 requires Java 17" | ||
| }, | ||
| // disable Scala dependency upgrades | ||
| { | ||
| "matchPackagePatterns": [ | ||
| "scala" | ||
| enabled: false, | ||
| matchPackageNames: [ | ||
| '/scala/', | ||
| ], | ||
| "enabled": false | ||
| }, | ||
| { | ||
| "matchPackagePatterns": [ | ||
| "^jackson-module-scala" | ||
| enabled: false, | ||
| matchPackageNames: [ | ||
| '/^jackson-module-scala/', | ||
| ], | ||
| "enabled": false | ||
| }, | ||
| // disable SQL Spark dependency upgrades | ||
| { | ||
| "matchPackagePatterns": [ | ||
| "^spark-sql" | ||
| enabled: false, | ||
| matchPackageNames: [ | ||
| '/^spark-sql/', | ||
| ], | ||
| "enabled": false | ||
| }, | ||
| {}, | ||
| ], | ||
| "rebaseWhen": "behind-base-branch", | ||
| "semanticCommits": "enabled", | ||
| "vulnerabilityAlerts": { | ||
| "labels": [ | ||
| "type:security" | ||
| rebaseWhen: 'behind-base-branch', | ||
| semanticCommits: 'enabled', | ||
| vulnerabilityAlerts: { | ||
| labels: [ | ||
| 'type:security', | ||
| ], | ||
| "minimumReleaseAge": null | ||
| minimumReleaseAge: null, | ||
| }, | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
60 changes: 0 additions & 60 deletions
60
automl/src/main/java/com/google/cloud/vision/samples/automl/ClassificationDeployModel.java
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.