Skip to content

Commit 682e7db

Browse files
authored
Merge branch '7.0.x' into feature/7.0.0/13655-dot-notation
2 parents b92fc87 + 0ab0d9b commit 682e7db

File tree

20 files changed

+208
-198
lines changed

20 files changed

+208
-198
lines changed

.github/dependabot.yml

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,21 @@
11
version: 2
2-
updates:
3-
- package-ecosystem: gradle
4-
directory: "/"
5-
schedule:
6-
interval: weekly
7-
open-pull-requests-limit: 0
8-
target-branch: 3.3.x
9-
labels:
10-
- "type: dependency upgrade"
11-
- "relates-to: v3"
12-
- package-ecosystem: gradle
13-
directory: "/"
14-
schedule:
15-
interval: weekly
16-
open-pull-requests-limit: 0
17-
target-branch: 4.1.x
18-
labels:
19-
- "type: dependency upgrade"
20-
- "relates-to: v4"
21-
ignore:
22-
- dependency-name: "*"
23-
update-types: [ "version-update:semver-minor", "version-update:semver-major" ]
2+
updates:
243
- package-ecosystem: gradle
254
directory: "/"
265
schedule:
276
interval: daily
287
open-pull-requests-limit: 10
29-
target-branch: 5.4.x
8+
target-branch: 6.2.x
309
labels:
3110
- "type: dependency upgrade"
3211
ignore:
33-
- dependency-name: "*"
34-
update-types: ["version-update:semver-major"]
12+
- dependency-name: "*"
13+
update-types: ["version-update:semver-major", "version-update:semver-minor"]
3514
- package-ecosystem: gradle
3615
directory: "/"
3716
schedule:
3817
interval: daily
3918
open-pull-requests-limit: 10
40-
target-branch: 6.0.x
19+
target-branch: 7.0.x
4120
labels:
4221
- "type: dependency upgrade"
43-
ignore:
44-
- dependency-name: "*"
45-
update-types: ["version-update:semver-patch", "version-update:semver-minor"]

dependabot/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated on Mon Oct 21 14:36:55 PDT 2024 by: ./gradlew :grails-bom:dependabotBuild
1+
// Generated on Fri Nov 22 09:58:56 CET 2024 by: ./gradlew :grails-bom:dependabotBuild
22
plugins {
33
id 'java-library'
44
}
@@ -7,6 +7,7 @@ dependencies {
77
api "org.apache.ant:ant:${project['ant.version']}"
88
api "org.apache.ant:ant-junit:${project['ant.version']}"
99
api "org.asciidoctor:asciidoctorj:${project['asciidoctorj.version']}"
10+
api "com.bertramlabs.plugins:asset-pipeline-gradle:${project['asset-pipeline-gradle.version']}"
1011
api "com.bertramlabs.plugins:asset-pipeline-grails:${project['asset-pipeline-grails.version']}"
1112
api "net.bytebuddy:byte-buddy:${project['byte-buddy.version']}"
1213
api "commons-codec:commons-codec:${project['commons-codec.version']}"
@@ -24,6 +25,7 @@ dependencies {
2425
api "org.grails:grails-events-rxjava:${project['grails-async.version']}"
2526
api "org.grails:grails-events-rxjava2:${project['grails-async.version']}"
2627
api "org.grails:grails-datastore-gorm-hibernate5:${project['grails-datastore-gorm-hibernate5.version']}"
28+
api "org.grails:grails-datastore-gorm-mongodb:${project['grails-datastore-gorm-mongodb.version']}"
2729
api "org.grails:grails-datastore-async:${project['grails-datastore.version']}"
2830
api "org.grails:grails-datastore-core:${project['grails-datastore.version']}"
2931
api "org.grails:grails-datastore-gorm:${project['grails-datastore.version']}"

gradle.properties

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ gradleNexusPluginVersion=2.3.1
88
gradleNexusPublishPluginVersion=2.0.0
99
gradleExtraConfigurationsPluginVersion=10.0.1
1010
gradleLicensePluginVersion=0.16.1
11-
gradleToolingApiVersion=8.10.2
11+
gradleToolingApiVersion=8.11.1
1212
groovyVersion=4.0.24
1313
joptSimpleVersion=5.0.4
1414
plexusComponentApiVersion=1.0-alpha-33
@@ -21,10 +21,11 @@ org.gradle.parallel=true
2121
org.gradle.daemon=true
2222
org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1536M -XX:MaxMetaspaceSize=1024M
2323

24-
# Generated on Tue Oct 22 16:16:30 EDT 2024 by: ./gradlew :grails-bom:syncProps
24+
# Generated on Fri Nov 22 09:58:56 CET 2024 by: ./gradlew :grails-bom:syncProps
2525
# Only version value modifications allowed after this point. Do not insert or change version names.
2626
ant.version=1.10.15
2727
asciidoctorj.version=3.0.0
28+
asset-pipeline-gradle.version=5.0.1
2829
asset-pipeline-grails.version=5.0.1
2930
byte-buddy.version=1.15.5
3031
commons-codec.version=1.17.1
@@ -36,18 +37,19 @@ geb-spock.version=7.0
3637
grails-async.version=6.0.0-SNAPSHOT
3738
grails-datastore.version=9.0.0-SNAPSHOT
3839
grails-datastore-gorm-hibernate5.version=9.0.0-SNAPSHOT
40+
grails-datastore-gorm-mongodb.version=9.0.0-SNAPSHOT
3941
grails-gdoc-engine.version=1.0.1
4042
grails-gradle-plugin.version=7.0.0-SNAPSHOT
4143
grails-testing-support.version=4.0.0-SNAPSHOT
4244
groovy.version=4.0.24
4345
gsp.version=7.0.0-SNAPSHOT
4446
h2.version=2.3.232
45-
jackson.version=2.18.0
47+
jackson.version=2.18.2
4648
jansi.version=1.18
4749
javaparser-core.version=3.26.2
4850
jline.version=2.14.6
4951
jna.version=5.15.0
50-
jsoup.version=1.18.1
52+
jsoup.version=1.18.2
5153
mongodb.version=5.1.4
5254
objenesis.version=3.4
5355
plugins-cache.version=8.0.0-SNAPSHOT
@@ -75,6 +77,6 @@ profiles-web.version=7.0.1-SNAPSHOT
7577
profiles-web-plugin.version=7.0.1-SNAPSHOT
7678
spock.version=2.3-groovy-4.0
7779
spotbugs-annotations.version=4.8.6
78-
spring-boot.version=3.4.0-RC1
80+
spring-boot.version=3.4.0
7981
springloaded.version=1.2.8.RELEASE
8082
views-json-testing-support.version=4.0.0-SNAPSHOT

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

grails-bom/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ ext {
2525
// version name = versionNameOverride ?: artifactId-prefixes[0]
2626
dependenciesOverview = """\
2727
com.bertramlabs.plugins:asset-pipeline-grails::
28+
com.bertramlabs.plugins:asset-pipeline-gradle::
2829
com.fasterxml.jackson:jackson-bom:::jackson
2930
com.github.javaparser:javaparser-core::
3031
com.h2database:h2::
@@ -45,6 +46,7 @@ ext {
4546
org.grails.plugins:gsp::
4647
org.grails:grails-async,grails-events:gpars,rxjava,rxjava2::grails-async
4748
org.grails:grails-datastore-gorm-hibernate5::
49+
org.grails:grails-datastore-gorm-mongodb::
4850
org.grails:grails-datastore:async,core,gorm,gorm-async,gorm-support,gorm-rx,gorm-test,gorm-validation,web:
4951
org.grails:grails-gdoc-engine::
5052
org.grails:grails-gradle-plugin::

grails-bom/plugins.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ neo4j=8.1.0
88
rxjava=1.1.1
99
rxjava2=2.0.0
1010
scaffolding=6.0.0-SNAPSHOT
11+
views-gradle=4.0.0-SNAPSHOT
1112
views-json=4.0.0-SNAPSHOT
1213
views-json-templates=4.0.0-SNAPSHOT
1314
views-markup=4.0.0-SNAPSHOT

grails-core/build.gradle

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
configurations.all {
2-
resolutionStrategy {
3-
force "org.hamcrest:hamcrest-core:1.3"
4-
}
5-
}
6-
71
dependencies {
82
compileOnly "org.aspectj:aspectjrt", "org.aspectj:aspectjweaver"
93
api "jakarta.inject:jakarta.inject-api"
@@ -16,6 +10,7 @@ dependencies {
1610
api "org.springframework:spring-tx"
1711
api "org.springframework:spring-beans"
1812
api "org.springframework:spring-context"
13+
api "org.springframework.boot:spring-boot-autoconfigure"
1914

2015
compileOnly "org.springframework:spring-test"
2116
compileOnly "org.apache.groovy:groovy-templates"
@@ -27,7 +22,7 @@ dependencies {
2722

2823
testImplementation "org.springframework:spring-jdbc"
2924

30-
testImplementation "org.hamcrest:hamcrest-core:1.3"
25+
testImplementation "org.hamcrest:hamcrest"
3126

3227
testRuntimeOnly "com.h2database:h2"
3328
testRuntimeOnly "com.fasterxml.jackson.core:jackson-databind"

grails-core/src/main/groovy/org/grails/plugins/CoreGrailsPlugin.groovy

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import org.grails.spring.DefaultRuntimeSpringConfiguration
2525
import org.grails.spring.RuntimeSpringConfiguration
2626
import org.grails.spring.aop.autoproxy.GroovyAwareAspectJAwareAdvisorAutoProxyCreator
2727
import org.grails.spring.aop.autoproxy.GroovyAwareInfrastructureAdvisorAutoProxyCreator
28-
import org.grails.spring.context.support.GrailsPlaceholderConfigurer
2928
import org.grails.spring.context.support.MapBasedSmartPropertyOverrideConfigurer
3029
import org.grails.spring.RuntimeSpringConfigUtilities
3130
import org.grails.core.io.DefaultResourceLocator
@@ -66,17 +65,12 @@ class CoreGrailsPlugin extends Plugin {
6665

6766
// Grails config as properties
6867
def config = application.config
69-
def placeHolderPrefix = config.getProperty(Settings.SPRING_PLACEHOLDER_PREFIX, '${')
70-
7168

7269
// enable post-processing of @Configuration beans defined by plugins
7370
grailsConfigurationClassPostProcessor ConfigurationClassPostProcessor
7471
grailsBeanOverrideConfigurer(MapBasedSmartPropertyOverrideConfigurer) {
7572
delegate.grailsApplication = application
7673
}
77-
propertySourcesPlaceholderConfigurer(GrailsPlaceholderConfigurer) {
78-
placeholderPrefix = placeHolderPrefix
79-
}
8074

8175
Class proxyCreatorClazz = null
8276
// replace AutoProxy advisor with Groovy aware one

grails-core/src/main/groovy/org/grails/plugins/DefaultGrailsPlugin.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -541,12 +541,9 @@ public void doWithRuntimeConfiguration(RuntimeSpringConfiguration springConfig)
541541
BeanBuilder bb = new BeanBuilder(getParentCtx(),springConfig, grailsApplication.getClassLoader());
542542
bb.setBinding(b);
543543
c.setDelegate(bb);
544-
c.setResolveStrategy(Closure.OWNER_FIRST);
545544
bb.invokeMethod("beans", new Object[]{c});
546545
}
547-
}
548-
else {
549-
546+
} else {
550547
if (!pluginBean.isReadableProperty(DO_WITH_SPRING)) {
551548
return;
552549
}
@@ -559,7 +556,6 @@ public void doWithRuntimeConfiguration(RuntimeSpringConfiguration springConfig)
559556
BeanBuilder bb = new BeanBuilder(getParentCtx(),springConfig, grailsApplication.getClassLoader());
560557
bb.setBinding(b);
561558
c.setDelegate(bb);
562-
c.setResolveStrategy(Closure.DELEGATE_FIRST);
563559
bb.invokeMethod("beans", new Object[]{c});
564560
}
565561

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
/*
2+
* Copyright 2004-2019 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package org.grails.plugins.core;
18+
19+
import grails.config.ConfigProperties;
20+
import grails.config.Settings;
21+
import grails.core.GrailsApplication;
22+
import org.grails.spring.context.support.GrailsPlaceholderConfigurer;
23+
import org.springframework.beans.factory.annotation.Value;
24+
import org.springframework.boot.autoconfigure.AutoConfiguration;
25+
import org.springframework.boot.autoconfigure.AutoConfigureOrder;
26+
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
27+
import org.springframework.context.annotation.Bean;
28+
import org.springframework.context.annotation.Primary;
29+
import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
30+
import org.springframework.core.Ordered;
31+
32+
/**
33+
* Core beans.
34+
*
35+
* @author graemerocher
36+
* @since 4.0
37+
*/
38+
@AutoConfiguration(before = { PropertyPlaceholderAutoConfiguration.class })
39+
@AutoConfigureOrder(Ordered.HIGHEST_PRECEDENCE)
40+
public class CoreAutoConfiguration {
41+
42+
@Value("${" + Settings.SPRING_PLACEHOLDER_PREFIX + ":#{null}}")
43+
private String placeholderPrefix;
44+
45+
@Bean
46+
@Primary
47+
public ClassLoader classLoader(GrailsApplication grailsApplication) {
48+
return grailsApplication.getClassLoader();
49+
}
50+
51+
@Bean
52+
@Primary
53+
public ConfigProperties grailsConfigProperties(GrailsApplication grailsApplication) {
54+
return new ConfigProperties(grailsApplication.getConfig());
55+
}
56+
57+
@Bean
58+
@Primary
59+
PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() {
60+
GrailsPlaceholderConfigurer grailsPlaceholderConfigurer = new GrailsPlaceholderConfigurer();
61+
if (placeholderPrefix != null) {
62+
grailsPlaceholderConfigurer.setPlaceholderPrefix(placeholderPrefix);
63+
}
64+
return grailsPlaceholderConfigurer;
65+
}
66+
}

0 commit comments

Comments
 (0)