Skip to content

Commit bf4cf70

Browse files
committed
Adjust repos so publish plugin's snapshot version can be found
1 parent 2a5c060 commit bf4cf70

File tree

4 files changed

+131
-61
lines changed

4 files changed

+131
-61
lines changed

buildSrc/build.gradle

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -24,37 +24,6 @@ plugins {
2424

2525
compileJava.options.release = javaVersion.toString().toInteger()
2626

27-
repositories {
28-
// mavenLocal()
29-
maven {
30-
url = 'https://repository.apache.org/content/groups/snapshots'
31-
content {
32-
includeVersionByRegex('org[.]apache[.](grails|groovy).*', '.*', '.*SNAPSHOT')
33-
}
34-
}
35-
maven { url = 'https://repo.grails.org/grails/restricted' }
36-
maven {
37-
url = 'https://central.sonatype.com/repository/maven-snapshots'
38-
content {
39-
includeVersionByRegex('cloud[.]wondrify.*', '.*', '.*-SNAPSHOT')
40-
}
41-
mavenContent {
42-
snapshotsOnly()
43-
}
44-
}
45-
mavenCentral()
46-
gradlePluginPortal()
47-
maven {
48-
url = 'https://repository.apache.org/content/groups/staging'
49-
content {
50-
includeModuleByRegex('org[.]apache[.]grails[.]gradle', 'grails-publish')
51-
}
52-
mavenContent {
53-
releasesOnly()
54-
}
55-
}
56-
}
57-
5827
dependencies {
5928
implementation platform("org.apache.grails:grails-gradle-bom:$projectVersion")
6029
implementation 'org.apache.grails.gradle:grails-publish'

buildSrc/settings.gradle

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,77 @@ pluginManagement {
2020
includeBuild('../build-logic') {
2121
name = 'build-logic-root'
2222
}
23+
repositories {
24+
// because our publish plugin uses other plugins, those dependencies have to be resolvable
25+
// mavenLocal()
26+
mavenCentral()
27+
gradlePluginPortal()
28+
maven {
29+
url = 'https://repository.apache.org/content/groups/snapshots'
30+
content {
31+
includeVersionByRegex('org[.]apache[.]grails[.]gradle.*', '.*', '.*-SNAPSHOT')
32+
}
33+
mavenContent {
34+
snapshotsOnly()
35+
}
36+
}
37+
maven {
38+
url = 'https://central.sonatype.com/repository/maven-snapshots'
39+
content {
40+
includeVersionByRegex('cloud[.]wondrify.*', '.*', '.*-SNAPSHOT')
41+
}
42+
mavenContent {
43+
snapshotsOnly()
44+
}
45+
}
46+
maven {
47+
url = 'https://repository.apache.org/content/groups/staging'
48+
content {
49+
includeModuleByRegex('org[.]apache[.]grails[.]gradle', 'grails-publish')
50+
}
51+
mavenContent {
52+
releasesOnly()
53+
}
54+
}
55+
}
2356
}
2457

2558
includeBuild('../build-logic') {
2659
name = 'build-logic-root'
2760
}
61+
62+
dependencyResolutionManagement {
63+
repositories {
64+
// mavenLocal()
65+
maven {
66+
url = 'https://repository.apache.org/content/groups/snapshots'
67+
content {
68+
includeVersionByRegex('org[.]apache[.](grails|groovy).*', '.*', '.*SNAPSHOT')
69+
}
70+
mavenContent {
71+
snapshotsOnly()
72+
}
73+
}
74+
maven { url = 'https://repo.grails.org/grails/restricted' }
75+
maven {
76+
url = 'https://central.sonatype.com/repository/maven-snapshots'
77+
content {
78+
includeVersionByRegex('cloud[.]wondrify.*', '.*', '.*-SNAPSHOT')
79+
}
80+
mavenContent {
81+
snapshotsOnly()
82+
}
83+
}
84+
mavenCentral()
85+
gradlePluginPortal()
86+
maven {
87+
url = 'https://repository.apache.org/content/groups/staging'
88+
content {
89+
includeModuleByRegex('org[.]apache[.]grails[.]gradle', 'grails-publish')
90+
}
91+
mavenContent {
92+
releasesOnly()
93+
}
94+
}
95+
}
96+
}

grails-gradle/buildSrc/build.gradle

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -26,36 +26,6 @@ apply {
2626
from file('../../dependencies.gradle')
2727
}
2828

29-
repositories {
30-
// mavenLocal()
31-
mavenCentral()
32-
gradlePluginPortal()
33-
maven {
34-
url = 'https://repository.apache.org/content/groups/snapshots'
35-
content {
36-
includeVersionByRegex('org[.]apache[.]grails[.]gradle.*', '.*', '.*-SNAPSHOT')
37-
}
38-
}
39-
maven {
40-
url = 'https://central.sonatype.com/repository/maven-snapshots'
41-
content {
42-
includeVersionByRegex('cloud[.]wondrify.*', '.*', '.*-SNAPSHOT')
43-
}
44-
mavenContent {
45-
snapshotsOnly()
46-
}
47-
}
48-
maven {
49-
url = 'https://repository.apache.org/content/groups/staging'
50-
content {
51-
includeModuleByRegex('org[.]apache[.]grails[.]gradle', 'grails-publish')
52-
}
53-
mavenContent {
54-
releasesOnly()
55-
}
56-
}
57-
}
58-
5929
dependencies {
6030
implementation "${gradleBomDependencies['grails-publish-plugin']}"
6131
}

grails-gradle/buildSrc/settings.gradle

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,70 @@ pluginManagement {
2020
includeBuild('../../build-logic') {
2121
name = 'build-logic-root'
2222
}
23+
24+
repositories {
25+
// mavenLocal()
26+
mavenCentral()
27+
gradlePluginPortal()
28+
maven {
29+
url = 'https://repository.apache.org/content/groups/snapshots'
30+
content {
31+
includeVersionByRegex('org[.]apache[.]grails[.]gradle.*', '.*', '.*-SNAPSHOT')
32+
}
33+
}
34+
maven {
35+
url = 'https://central.sonatype.com/repository/maven-snapshots'
36+
content {
37+
includeVersionByRegex('cloud[.]wondrify.*', '.*', '.*-SNAPSHOT')
38+
}
39+
mavenContent {
40+
snapshotsOnly()
41+
}
42+
}
43+
maven {
44+
url = 'https://repository.apache.org/content/groups/staging'
45+
content {
46+
includeModuleByRegex('org[.]apache[.]grails[.]gradle', 'grails-publish')
47+
}
48+
mavenContent {
49+
releasesOnly()
50+
}
51+
}
52+
}
2353
}
2454

2555
includeBuild('../../build-logic') {
2656
name = 'build-logic-root'
2757
}
58+
59+
dependencyResolutionManagement {
60+
repositories {
61+
// mavenLocal()
62+
mavenCentral()
63+
gradlePluginPortal()
64+
maven {
65+
url = 'https://repository.apache.org/content/groups/snapshots'
66+
content {
67+
includeVersionByRegex('org[.]apache[.]grails[.]gradle.*', '.*', '.*-SNAPSHOT')
68+
}
69+
}
70+
maven {
71+
url = 'https://central.sonatype.com/repository/maven-snapshots'
72+
content {
73+
includeVersionByRegex('cloud[.]wondrify.*', '.*', '.*-SNAPSHOT')
74+
}
75+
mavenContent {
76+
snapshotsOnly()
77+
}
78+
}
79+
maven {
80+
url = 'https://repository.apache.org/content/groups/staging'
81+
content {
82+
includeModuleByRegex('org[.]apache[.]grails[.]gradle', 'grails-publish')
83+
}
84+
mavenContent {
85+
releasesOnly()
86+
}
87+
}
88+
}
89+
}

0 commit comments

Comments
 (0)