-
-
Notifications
You must be signed in to change notification settings - Fork 952
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '7.0.x' into feature/7.0.0/13655-dot-notation
- Loading branch information
Showing
20 changed files
with
208 additions
and
198 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,45 +1,21 @@ | ||
| version: 2 | ||
| updates: | ||
| - package-ecosystem: gradle | ||
| directory: "/" | ||
| schedule: | ||
| interval: weekly | ||
| open-pull-requests-limit: 0 | ||
| target-branch: 3.3.x | ||
| labels: | ||
| - "type: dependency upgrade" | ||
| - "relates-to: v3" | ||
| - package-ecosystem: gradle | ||
| directory: "/" | ||
| schedule: | ||
| interval: weekly | ||
| open-pull-requests-limit: 0 | ||
| target-branch: 4.1.x | ||
| labels: | ||
| - "type: dependency upgrade" | ||
| - "relates-to: v4" | ||
| ignore: | ||
| - dependency-name: "*" | ||
| update-types: [ "version-update:semver-minor", "version-update:semver-major" ] | ||
| updates: | ||
| - package-ecosystem: gradle | ||
| directory: "/" | ||
| schedule: | ||
| interval: daily | ||
| open-pull-requests-limit: 10 | ||
| target-branch: 5.4.x | ||
| target-branch: 6.2.x | ||
| labels: | ||
| - "type: dependency upgrade" | ||
| ignore: | ||
| - dependency-name: "*" | ||
| update-types: ["version-update:semver-major"] | ||
| - dependency-name: "*" | ||
| update-types: ["version-update:semver-major", "version-update:semver-minor"] | ||
| - package-ecosystem: gradle | ||
| directory: "/" | ||
| schedule: | ||
| interval: daily | ||
| open-pull-requests-limit: 10 | ||
| target-branch: 6.0.x | ||
| target-branch: 7.0.x | ||
| labels: | ||
| - "type: dependency upgrade" | ||
| ignore: | ||
| - dependency-name: "*" | ||
| update-types: ["version-update:semver-patch", "version-update:semver-minor"] |
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
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
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
66 changes: 66 additions & 0 deletions
66
grails-core/src/main/groovy/org/grails/plugins/core/CoreAutoConfiguration.java
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 |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| /* | ||
| * Copyright 2004-2019 the original author or authors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.grails.plugins.core; | ||
|
|
||
| import grails.config.ConfigProperties; | ||
| import grails.config.Settings; | ||
| import grails.core.GrailsApplication; | ||
| import org.grails.spring.context.support.GrailsPlaceholderConfigurer; | ||
| import org.springframework.beans.factory.annotation.Value; | ||
| import org.springframework.boot.autoconfigure.AutoConfiguration; | ||
| import org.springframework.boot.autoconfigure.AutoConfigureOrder; | ||
| import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; | ||
| import org.springframework.context.annotation.Bean; | ||
| import org.springframework.context.annotation.Primary; | ||
| import org.springframework.context.support.PropertySourcesPlaceholderConfigurer; | ||
| import org.springframework.core.Ordered; | ||
|
|
||
| /** | ||
| * Core beans. | ||
| * | ||
| * @author graemerocher | ||
| * @since 4.0 | ||
| */ | ||
| @AutoConfiguration(before = { PropertyPlaceholderAutoConfiguration.class }) | ||
| @AutoConfigureOrder(Ordered.HIGHEST_PRECEDENCE) | ||
| public class CoreAutoConfiguration { | ||
|
|
||
| @Value("${" + Settings.SPRING_PLACEHOLDER_PREFIX + ":#{null}}") | ||
| private String placeholderPrefix; | ||
|
|
||
| @Bean | ||
| @Primary | ||
| public ClassLoader classLoader(GrailsApplication grailsApplication) { | ||
| return grailsApplication.getClassLoader(); | ||
| } | ||
|
|
||
| @Bean | ||
| @Primary | ||
| public ConfigProperties grailsConfigProperties(GrailsApplication grailsApplication) { | ||
| return new ConfigProperties(grailsApplication.getConfig()); | ||
| } | ||
|
|
||
| @Bean | ||
| @Primary | ||
| PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() { | ||
| GrailsPlaceholderConfigurer grailsPlaceholderConfigurer = new GrailsPlaceholderConfigurer(); | ||
| if (placeholderPrefix != null) { | ||
| grailsPlaceholderConfigurer.setPlaceholderPrefix(placeholderPrefix); | ||
| } | ||
| return grailsPlaceholderConfigurer; | ||
| } | ||
| } |
51 changes: 0 additions & 51 deletions
51
grails-core/src/main/groovy/org/grails/plugins/core/CoreConfiguration.java
This file was deleted.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
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 +1 @@ | ||
| org.grails.plugins.core.CoreConfiguration | ||
| org.grails.plugins.core.CoreAutoConfiguration |
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
Oops, something went wrong.