Skip to content

Commit 901e89f

Browse files
authored
Merge pull request #15040 from jdaugherty/7.0.x
Update to Asset Pipeline 5.0.16
2 parents 4237103 + c724f15 commit 901e89f

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

dependencies.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ ext {
2525
'ant.version' : '1.10.15',
2626
'asciidoctor-gradle-jvm.version': '4.0.5',
2727
'asciidoctorj.version' : '3.0.0',
28-
'asset-pipeline-gradle.version' : '5.0.15',
28+
'asset-pipeline-gradle.version' : '5.0.16',
2929
'byte-buddy.version' : '1.17.7',
3030
'commons-text.version' : '1.13.1',
3131
'directory-watcher.version' : '0.19.1',
@@ -72,7 +72,7 @@ ext {
7272
]
7373

7474
bomDependencyVersions = [
75-
'asset-pipeline-bom.version' : '5.0.15',
75+
'asset-pipeline-bom.version' : '5.0.16',
7676
'bootstrap-icons.version' : '1.13.1',
7777
'bootstrap.version' : '5.3.7',
7878
'commons-codec.version' : '1.18.0',

grails-forge/grails-forge-cli/src/test/groovy/org/grails/forge/cli/CommandSpec.groovy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ class CommandSpec extends Specification {
7070
String[] args = builder.toString().split(' ')
7171
ProcessBuilder pb = new ProcessBuilder(args)
7272
pb.environment().put('JAVA_HOME', System.getenv('JAVA_HOME') ?: System.getProperty('java.home'))
73+
pb.environment().put('GRAILS_REPO_URL', System.getenv('GRAILS_REPO_URL') ?: null)
7374
process = pb.directory(dir).start()
7475
process.consumeProcessOutputStream(output)
7576
process

grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/grails/GrailsDefaultPlugins.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public boolean supports(ApplicationType applicationType) {
5555

5656
@Override
5757
public void apply(GeneratorContext generatorContext) {
58-
Arrays.asList("rest-transforms", "databinding", "i18n", "services", "url-mappings", "interceptors")
58+
Arrays.asList("rest-transforms", "databinding", "services", "url-mappings", "interceptors")
5959
.forEach((artifact) -> {
6060
generatorContext.addDependency(Dependency.builder()
6161
.groupId("org.apache.grails")

0 commit comments

Comments
 (0)