Fix classloader isolation for Gretty runners

gretty-gradle-plugin · Nov 18, 2019 · 291fd59 · 291fd59
1 parent f35a189
commit 291fd59
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/libs/gretty-runner-jetty7/src/main/groovy/org/akhikhl/gretty/JettyConfigurerImpl.groovy b/libs/gretty-runner-jetty7/src/main/groovy/org/akhikhl/gretty/JettyConfigurerImpl.groovy
@@ -208,6 +208,7 @@ class JettyConfigurerImpl implements JettyConfigurer {
     if (webappParams.webXml != null) context.setDescriptor(webappParams.webXml);
     FilteringClassLoader classLoader = new FilteringClassLoader(context)
     classLoader.addServerClass('ch.qos.logback.')
+    classLoader.addServerClass('org.apache.groovy.')
     classLoader.addServerClass('org.slf4j.')
     classLoader.addServerClass('org.codehaus.groovy.')
     classLoader.addServerClass('groovy.')

diff --git a/libs/gretty-runner-jetty8/src/main/groovy/org/akhikhl/gretty/JettyConfigurerImpl.groovy b/libs/gretty-runner-jetty8/src/main/groovy/org/akhikhl/gretty/JettyConfigurerImpl.groovy
@@ -208,6 +208,7 @@ class JettyConfigurerImpl implements JettyConfigurer {
     if (webappParams.webXml != null) context.setDescriptor(webappParams.webXml);
     FilteringClassLoader classLoader = new FilteringClassLoader(context)
     classLoader.addServerClass('ch.qos.logback.')
+    classLoader.addServerClass('org.apache.groovy.')
     classLoader.addServerClass('org.slf4j.')
     classLoader.addServerClass('org.codehaus.groovy.')
     classLoader.addServerClass('groovy.')

diff --git a/libs/gretty-runner-tomcat/src/main/groovy/org/akhikhl/gretty/TomcatServerConfigurer.groovy b/libs/gretty-runner-tomcat/src/main/groovy/org/akhikhl/gretty/TomcatServerConfigurer.groovy
@@ -224,6 +224,7 @@ class TomcatServerConfigurer {
     // context.setLogEffectiveWebXml(true) // enable for debugging webxml merge
     FilteringClassLoader parentClassLoader = new FilteringClassLoader(params.parentClassLoader ?: this.getClass().getClassLoader())
     parentClassLoader.addServerClass('ch.qos.logback.')
+    parentClassLoader.addServerClass('org.apache.groovy.')
     parentClassLoader.addServerClass('org.slf4j.')
     parentClassLoader.addServerClass('org.codehaus.groovy.')
     parentClassLoader.addServerClass('groovy.')