Skip to content

Commit cc23307

Browse files
committed
fix resolution for snapshot repos
1 parent 24273ee commit cc23307

File tree

3 files changed

+14
-17
lines changed

3 files changed

+14
-17
lines changed

build.gradle

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,19 @@ allprojects {
5353
content { includeModule 'org.apache.grails', 'grails-bom' }
5454
}
5555
// mavenLocal() // Keep, this will be uncommented and used by CI (groovy-joint-workflow)
56-
maven { url = 'https://repo.grails.org/grails/restricted' }
5756
maven {
5857
url = 'https://repository.apache.org/content/groups/snapshots'
5958
content {
60-
includeGroupByRegex 'org[.]apache[.]((grails)|(groovy)).*'
59+
includeVersionByRegex 'org[.]apache[.]((grails)|(groovy)).*', '.*', '.*-SNAPSHOT'
6160
}
62-
mavenContent {
63-
snapshotsOnly()
61+
}
62+
maven {
63+
url = 'https://central.sonatype.com/repository/maven-snapshots'
64+
content {
65+
includeVersionByRegex 'cloud[.]wondrify', '.*', '.*-SNAPSHOT'
6466
}
6567
}
68+
maven { url = 'https://repo.grails.org/grails/restricted' }
6669
}
6770
}
6871

buildSrc/build.gradle

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@ compileJava.options.release = gradleProperties.javaVersion.toString().toInteger(
3131

3232
repositories {
3333
// mavenLocal()
34-
mavenCentral()
35-
gradlePluginPortal()
36-
maven { url = 'https://repo.grails.org/grails/restricted' }
3734
maven {
3835
url = 'https://repository.apache.org/content/groups/snapshots'
3936
content {
@@ -43,12 +40,12 @@ repositories {
4340
maven {
4441
url = 'https://central.sonatype.com/repository/maven-snapshots'
4542
content {
46-
includeVersionByRegex 'cloud[.]wondrify.*', '.*', '.*-SNAPSHOT'
47-
}
48-
mavenContent {
49-
snapshotsOnly()
43+
includeVersionByRegex 'cloud[.]wondrify', '.*', '.*-SNAPSHOT'
5044
}
5145
}
46+
maven { url = 'https://repo.grails.org/grails/restricted' }
47+
mavenCentral()
48+
gradlePluginPortal()
5249
}
5350

5451
dependencies {

grails-gradle/build.gradle

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ file('../gradle.properties').withInputStream {
2727
allprojects {
2828
repositories {
2929
// mavenLocal() // Keep, this will be uncommented and used by CI (groovy-joint-workflow)
30-
mavenCentral()
31-
maven { url = 'https://repo.grails.org/grails/restricted' }
3230
maven {
3331
url = 'https://repository.apache.org/content/groups/snapshots'
3432
content {
@@ -38,12 +36,11 @@ allprojects {
3836
maven {
3937
url = 'https://central.sonatype.com/repository/maven-snapshots'
4038
content {
41-
includeVersionByRegex 'cloud[.]wondrify.*', '.*', '.*-SNAPSHOT'
42-
}
43-
mavenContent {
44-
snapshotsOnly()
39+
includeVersionByRegex 'cloud[.]wondrify', '.*', '.*-SNAPSHOT'
4540
}
4641
}
42+
maven { url = 'https://repo.grails.org/grails/restricted' }
43+
mavenCentral()
4744
}
4845

4946
props.forEach { k, v -> project.ext.set(k as String, v) }

0 commit comments

Comments
 (0)