Skip to content

Commit 4b5bec7

Browse files
authored
Merge pull request #245 from grails-plugins/prep-6.0.0-M5
Prep for 6.0.0-M5 release
2 parents 5b1f673 + f7601d2 commit 4b5bec7

File tree

5 files changed

+33
-12
lines changed

5 files changed

+33
-12
lines changed

build.gradle

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,42 @@
11
buildscript {
22
repositories {
3-
maven { url = "https://repository.apache.org/content/groups/snapshots/" }
4-
maven { url = "https://repo.grails.org/grails/core" }
3+
maven {
4+
url = 'https://repository.apache.org/content/groups/snapshots'
5+
content {
6+
includeVersionByRegex 'org[.]apache[.]((grails)|(groovy)).*', '.*', '.*-SNAPSHOT'
7+
}
8+
}
9+
maven {
10+
url = 'https://central.sonatype.com/repository/maven-snapshots'
11+
content {
12+
includeVersionByRegex 'cloud[.]wondrify', '.*', '.*-SNAPSHOT'
13+
}
14+
}
15+
maven { url = 'https://repo.grails.org/grails/restricted' }
516
}
617
dependencies {
718
classpath platform("org.apache.grails:grails-bom:$grailsVersion")
819
classpath "org.apache.grails:grails-gradle-plugins"
9-
classpath "com.bertramlabs.plugins:asset-pipeline-gradle"
20+
classpath "cloud.wondrify:asset-pipeline-gradle"
1021
}
1122
}
1223

1324
allprojects {
1425
repositories {
1526
mavenCentral()
16-
maven { url = "https://repository.apache.org/content/groups/snapshots/" }
17-
maven { url = 'https://repo.grails.org/grails/core' }
27+
maven {
28+
url = 'https://repository.apache.org/content/groups/snapshots'
29+
content {
30+
includeVersionByRegex 'org[.]apache[.]((grails)|(groovy)).*', '.*', '.*-SNAPSHOT'
31+
}
32+
}
33+
maven {
34+
url = 'https://central.sonatype.com/repository/maven-snapshots'
35+
content {
36+
includeVersionByRegex 'cloud[.]wondrify', '.*', '.*-SNAPSHOT'
37+
}
38+
}
39+
maven { url = 'https://repo.grails.org/grails/restricted' }
1840
// mavenLocal() // for local testing, do not commit uncommented
1941
}
2042
}

examples/audit-test-allow-update-outside-transaction/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ apply plugin: 'eclipse'
66
apply plugin: 'idea'
77
apply plugin: 'org.apache.grails.gradle.grails-web'
88
apply plugin: 'org.apache.grails.gradle.grails-gsp'
9-
apply plugin: 'asset-pipeline'
9+
apply plugin: 'cloud.wondrify.asset-pipeline'
1010

1111
assets {
1212
minifyJs = true
@@ -51,7 +51,7 @@ dependencies {
5151
implementation "org.springframework.boot:spring-boot-starter-tomcat"
5252
implementation "org.springframework.boot:spring-boot-starter-validation"
5353
console "org.apache.grails:grails-console"
54-
runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails"
54+
runtimeOnly "cloud.wondrify:asset-pipeline-grails"
5555
runtimeOnly "com.h2database:h2"
5656
runtimeOnly "org.apache.tomcat:tomcat-jdbc"
5757
runtimeOnly "org.fusesource.jansi:jansi"

examples/audit-test/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ apply plugin: 'eclipse'
66
apply plugin: 'idea'
77
apply plugin: 'org.apache.grails.gradle.grails-web'
88
apply plugin: 'org.apache.grails.gradle.grails-gsp'
9-
apply plugin: 'asset-pipeline'
9+
apply plugin: 'cloud.wondrify.asset-pipeline'
1010

1111
assets {
1212
minifyJs = true
@@ -53,7 +53,7 @@ dependencies {
5353
implementation "org.springframework.boot:spring-boot-starter-tomcat"
5454
implementation "org.springframework.boot:spring-boot-starter-validation"
5555
console "org.apache.grails:grails-console"
56-
runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails"
56+
runtimeOnly "cloud.wondrify:asset-pipeline-grails"
5757
runtimeOnly "com.h2database:h2"
5858
runtimeOnly "org.apache.tomcat:tomcat-jdbc"
5959
runtimeOnly "org.fusesource.jansi:jansi"

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.14-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

plugin/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@ apply plugin: 'org.apache.grails.gradle.grails-gsp'
1515
compileJava.options.release = 17
1616

1717
dependencies {
18-
implementation platform("org.apache.grails:grails-bom:$grailsVersion")
18+
compileOnly platform("org.apache.grails:grails-bom:$grailsVersion")
1919

20-
profile "org.apache.grails.profiles:web-plugin"
2120
compileOnly 'org.springframework.boot:spring-boot-starter-logging'
2221
compileOnly "org.springframework.boot:spring-boot-starter-actuator"
2322
compileOnly "org.springframework.boot:spring-boot-autoconfigure"

0 commit comments

Comments
 (0)