Skip to content

Commit 9832f61

Browse files
jamesfredleyjamesfredley
authored
Merge pull request #14829 from apache/test-and-development-only
fix: scope webjars as testAndDevelopmentOnly
2 parents ead0035 + cc98ab2 commit 9832f61

File tree

23 files changed

+54
-54
lines changed

23 files changed

+54
-54
lines changed

‎grails-data-neo4j/examples/grails3-neo4j-hibernate/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ dependencies {
3838
implementation "org.apache.grails:grails-data-hibernate5:$hibernateDatastoreVersion"
3939
implementation "org.hibernate:hibernate-ehcache:$hibernateEhcacheVersion"
4040

41-
developmentOnly platform(project(':grails-bom'))
42-
developmentOnly 'org.webjars.npm:jquery'
41+
testAndDevelopmentOnly platform(project(':grails-bom'))
42+
testAndDevelopmentOnly 'org.webjars.npm:jquery'
4343

4444
runtimeOnly "cloud.wondrify:asset-pipeline-grails:$assetPipelineVersion"
4545
runtimeOnly "org.apache.grails:grails-scaffolding:$scaffoldingVersion"

‎grails-data-neo4j/examples/grails3-neo4j/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ dependencies {
3636

3737
implementation project(":grails-plugin")
3838

39-
developmentOnly platform(project(':grails-bom'))
40-
developmentOnly 'org.webjars.npm:jquery'
39+
testAndDevelopmentOnly platform(project(':grails-bom'))
40+
testAndDevelopmentOnly 'org.webjars.npm:jquery'
4141

4242
runtimeOnly "cloud.wondrify:asset-pipeline-grails:$assetPipelineVersion"
4343
runtimeOnly "org.apache.grails:grails-scaffolding:$scaffoldingVersion"

‎grails-doc/src/en/guide/commandLine/gradleBuild/gradleDependencies.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ The default dependencies for the Grails Web application can be seen below:
2525
----
2626
dependencies {
2727
profile "org.apache.grails.profiles:web"
28-
developmentOnly "org.webjars.npm:bootstrap"
29-
developmentOnly "org.webjars.npm:bootstrap-icons"
30-
developmentOnly "org.webjars.npm:jquery"
28+
testAndDevelopmentOnly "org.webjars.npm:bootstrap"
29+
testAndDevelopmentOnly "org.webjars.npm:bootstrap-icons"
30+
testAndDevelopmentOnly "org.webjars.npm:jquery"
3131
implementation platform("org.apache.grails:grails-bom:$grailsVersion")
3232
implementation "org.apache.grails:grails-core"
3333
implementation "org.apache.grails:grails-logging"

‎grails-profiles/base/profile.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ build:
3030
dependencies:
3131
- scope: build
3232
coords: "org.apache.grails:grails-gradle-plugins"
33-
- scope: developmentOnly
33+
- scope: testAndDevelopmentOnly
3434
coords: "org.webjars.npm:bootstrap"
35-
- scope: developmentOnly
35+
- scope: testAndDevelopmentOnly
3636
coords: "org.webjars.npm:bootstrap-icons"
37-
- scope: developmentOnly
37+
- scope: testAndDevelopmentOnly
3838
coords: "org.webjars.npm:jquery"
3939
- scope: implementation
4040
coords: "org.springframework.boot:spring-boot-starter-logging"

‎grails-test-examples/app1/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ dependencies {
4343
implementation 'org.apache.grails:grails-cache'
4444
implementation 'org.apache.grails:grails-scaffolding'
4545

46-
developmentOnly platform(project(':grails-bom'))
47-
developmentOnly 'org.webjars.npm:jquery'
46+
testAndDevelopmentOnly platform(project(':grails-bom'))
47+
testAndDevelopmentOnly 'org.webjars.npm:jquery'
4848

4949
runtimeOnly 'cloud.wondrify:asset-pipeline-grails'
5050
runtimeOnly 'org.apache.grails:grails-fields'

‎grails-test-examples/app2/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ dependencies {
4242
implementation 'org.apache.grails:grails-data-hibernate5'
4343
implementation 'org.apache.grails:grails-cache'
4444

45-
developmentOnly platform(project(':grails-bom'))
46-
developmentOnly 'org.webjars.npm:jquery'
45+
testAndDevelopmentOnly platform(project(':grails-bom'))
46+
testAndDevelopmentOnly 'org.webjars.npm:jquery'
4747

4848
runtimeOnly 'cloud.wondrify:asset-pipeline-grails'
4949
runtimeOnly 'org.apache.grails:grails-scaffolding'

‎grails-test-examples/demo33/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ dependencies {
4444
implementation 'org.apache.grails:grails-data-hibernate5'
4545
implementation 'org.apache.grails:grails-views-gson'
4646

47-
developmentOnly platform(project(':grails-bom'))
48-
developmentOnly 'org.webjars.npm:bootstrap'
49-
developmentOnly 'org.webjars.npm:jquery'
47+
testAndDevelopmentOnly platform(project(':grails-bom'))
48+
testAndDevelopmentOnly 'org.webjars.npm:bootstrap'
49+
testAndDevelopmentOnly 'org.webjars.npm:jquery'
5050

5151
runtimeOnly 'cloud.wondrify:asset-pipeline-grails'
5252
runtimeOnly 'com.h2database:h2'

‎grails-test-examples/geb/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ dependencies {
4848
implementation 'org.springframework.boot:spring-boot-starter-tomcat'
4949
implementation 'org.springframework.boot:spring-boot-starter-validation'
5050

51-
developmentOnly platform(project(':grails-bom'))
52-
developmentOnly 'org.webjars.npm:bootstrap'
53-
developmentOnly 'org.webjars.npm:jquery'
51+
testAndDevelopmentOnly platform(project(':grails-bom'))
52+
testAndDevelopmentOnly 'org.webjars.npm:bootstrap'
53+
testAndDevelopmentOnly 'org.webjars.npm:jquery'
5454

5555
runtimeOnly 'cloud.wondrify:asset-pipeline-grails'
5656
runtimeOnly 'com.h2database:h2'

‎grails-test-examples/gsp-sitemesh3/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ dependencies {
3737
implementation 'org.apache.grails:grails-controllers'
3838
implementation 'org.apache.grails:grails-rest-transforms'
3939

40-
developmentOnly platform(project(':grails-bom'))
41-
developmentOnly 'org.webjars.npm:bootstrap'
42-
developmentOnly 'org.webjars.npm:jquery'
40+
testAndDevelopmentOnly platform(project(':grails-bom'))
41+
testAndDevelopmentOnly 'org.webjars.npm:bootstrap'
42+
testAndDevelopmentOnly 'org.webjars.npm:jquery'
4343

4444
runtimeOnly 'org.apache.grails:grails-gsp'
4545
runtimeOnly 'cloud.wondrify:asset-pipeline-grails'

‎grails-test-examples/hibernate5/grails-database-per-tenant/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ dependencies {
3434
implementation 'org.apache.grails:grails-rest-transforms'
3535
implementation 'org.apache.grails:grails-gsp'
3636

37-
developmentOnly platform(project(':grails-bom'))
38-
developmentOnly 'org.webjars.npm:jquery'
37+
testAndDevelopmentOnly platform(project(':grails-bom'))
38+
testAndDevelopmentOnly 'org.webjars.npm:jquery'
3939

4040
runtimeOnly 'cloud.wondrify:asset-pipeline-grails'
4141
runtimeOnly 'com.h2database:h2'

0 commit comments

Comments
 (0)