Skip to content

Commit 0ec1e0e

Browse files
committed
Revert "Update tests to be consistent with Gradle m7 repo structure"
This reverts commit 629fc5e.
1 parent 70b0380 commit 0ec1e0e

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/pages/ext/jsp/GroovyPageWithJSPTagsTests.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ class GroovyPageWithJSPTagsTests extends AbstractGrailsTagTests {
2020
GroovySystem.metaClassRegistry.removeMetaClass MockHttpServletRequest
2121
TagLibraryResolver.metaClass.resolveRootLoader = {->
2222
def rootLoader = new RootLoader([] as URL[], Thread.currentThread().getContextClassLoader())
23-
def res = new FileSystemResource("../lib/taglibs/standard/1.1.2/jar/standard-1.1.2.jar")
23+
def res = new FileSystemResource("../lib/taglibs/standard/jars/standard-1.1.2.jar")
2424
rootLoader.addURL res.getURL()
25-
resolver.getResources("file:../lib/org.springframework/spring-web*/*/jar/*.jar").each {
25+
resolver.getResources("file:../lib/org.springframework/spring-web*/jars/*.jar").each {
2626
rootLoader.addURL it.getURL()
2727
}
2828
return rootLoader

grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/pages/ext/jsp/IterativeJspTagTests.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class IterativeJspTagTests extends GroovyTestCase {
3232

3333
TagLibraryResolver.metaClass.resolveRootLoader = {->
3434
def rootLoader = new RootLoader([] as URL[], Thread.currentThread().getContextClassLoader())
35-
def res = new FileSystemResource("../lib/taglibs/standard/1.1.2/jar/standard-1.1.2.jar")
35+
def res = new FileSystemResource("../lib/taglibs/standard/jars/standard-1.1.2.jar")
3636
rootLoader.addURL res.getURL()
3737
return rootLoader
3838
}

grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/pages/ext/jsp/MockRootLoaderTagLibraryResolver.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class MockRootLoaderTagLibraryResolver extends TagLibraryResolver {
1313

1414
protected RootLoader resolveRootLoader() {
1515
def rootLoader = new RootLoader([] as URL[], Thread.currentThread().getContextClassLoader())
16-
def res = new FileSystemResource("../lib/taglibs/standard/1.1.2/jar/standard-1.1.2.jar")
16+
def res = new FileSystemResource("../lib/taglibs/standard/jars/standard-1.1.2.jar")
1717
rootLoader.addURL res.getURL()
1818
return rootLoader
1919
}

0 commit comments

Comments
 (0)