From e4440a0aa1ac892e285359eedd162c2d77db82bf Mon Sep 17 00:00:00 2001 From: Slawomir Jaranowski Date: Mon, 21 Oct 2024 23:53:23 +0200 Subject: [PATCH 1/4] rebase --- src/it/projects/github322/invoker.properties | 1 + src/it/projects/github322/pom.xml | 43 ++++++++++ .../codehaus/mojo/exec/it/github322/Main.java | 16 ++++ src/it/projects/github322/verify.groovy | 20 +++++ src/it/projects/mexec-29/invoker.properties | 2 +- .../org/codehaus/mojo/exec/ExecJavaMojo.java | 22 ++++- .../mojo/exec/URLClassLoaderBuilder.java | 86 +++++++++++++------ 7 files changed, 163 insertions(+), 27 deletions(-) create mode 100644 src/it/projects/github322/invoker.properties create mode 100644 src/it/projects/github322/pom.xml create mode 100644 src/it/projects/github322/src/main/java/org/codehaus/mojo/exec/it/github322/Main.java create mode 100644 src/it/projects/github322/verify.groovy diff --git a/src/it/projects/github322/invoker.properties b/src/it/projects/github322/invoker.properties new file mode 100644 index 00000000..5f52c5a0 --- /dev/null +++ b/src/it/projects/github322/invoker.properties @@ -0,0 +1 @@ +invoker.goals = clean compile exec:java diff --git a/src/it/projects/github322/pom.xml b/src/it/projects/github322/pom.xml new file mode 100644 index 00000000..78201fbc --- /dev/null +++ b/src/it/projects/github322/pom.xml @@ -0,0 +1,43 @@ + + 4.0.0 + + + org.codehaus.mojo.exec.it + parent + 0.1 + + + org.cb.maven.plugins.exec + github322 + 0.1 + + + + xml-apis + xml-apis + 1.4.01 + + + + + + + org.codehaus.mojo + exec-maven-plugin + @pom.version@ + + + test + + java + + + + + org.codehaus.mojo.exec.it.github322.Main + + + + + + diff --git a/src/it/projects/github322/src/main/java/org/codehaus/mojo/exec/it/github322/Main.java b/src/it/projects/github322/src/main/java/org/codehaus/mojo/exec/it/github322/Main.java new file mode 100644 index 00000000..ffae7ac2 --- /dev/null +++ b/src/it/projects/github322/src/main/java/org/codehaus/mojo/exec/it/github322/Main.java @@ -0,0 +1,16 @@ +package org.codehaus.mojo.exec.it.github322; + +import javax.xml.transform.sax.SAXTransformerFactory; + +public class Main { + public static void main(final String... args) { + System.out.println( + "Main Result: <" + + ( + SAXTransformerFactory.class.getProtectionDomain().getCodeSource() != null ? + SAXTransformerFactory.class.getProtectionDomain().getCodeSource().getLocation() : + null + ) + + ">"); + } +} diff --git a/src/it/projects/github322/verify.groovy b/src/it/projects/github322/verify.groovy new file mode 100644 index 00000000..a534c78c --- /dev/null +++ b/src/it/projects/github322/verify.groovy @@ -0,0 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +new IntegrationBase().checkExistenceAndContentOfAFile(new File( basedir, "build.log" ), [ "Main Result: " ]) diff --git a/src/it/projects/mexec-29/invoker.properties b/src/it/projects/mexec-29/invoker.properties index ba31fa59..b4a42cc1 100644 --- a/src/it/projects/mexec-29/invoker.properties +++ b/src/it/projects/mexec-29/invoker.properties @@ -1,4 +1,4 @@ invoker.goals = clean verify invoker.debug = true -invoker.buildResult = failure +invoker.buildResult = success diff --git a/src/main/java/org/codehaus/mojo/exec/ExecJavaMojo.java b/src/main/java/org/codehaus/mojo/exec/ExecJavaMojo.java index 903c80c8..7dd464d7 100644 --- a/src/main/java/org/codehaus/mojo/exec/ExecJavaMojo.java +++ b/src/main/java/org/codehaus/mojo/exec/ExecJavaMojo.java @@ -194,6 +194,23 @@ public class ExecJavaMojo extends AbstractExecMojo { @Parameter private List classpathFilenameExclusions; + /** + * Additional packages to load from the jvm even if a classpath dependency matches. + * + * @since 3.1.1 + */ + @Parameter + private List forcedJvmPackages; + + /** + * Additional packages to NOT load from the jvm even if it is in a flat classpath. + * Can enable to reproduce a webapp behavior for example where library is loaded over the JVM. + * + * @since 3.1.1 + */ + @Parameter + private List excludedJvmPackages; + /** * Whether to try and prohibit the called Java program from terminating the JVM (and with it the whole Maven build) * by calling {@link System#exit(int)}. When active, loaded classes will replace this call by a custom callback. @@ -678,12 +695,13 @@ private URLClassLoader getClassLoader() throws MojoExecutionException { this.addRelevantPluginDependenciesToClasspath(classpathURLs); this.addRelevantProjectDependenciesToClasspath(classpathURLs); this.addAdditionalClasspathElements(classpathURLs); - try { final URLClassLoaderBuilder builder = URLClassLoaderBuilder.builder() .setLogger(getLog()) .setPaths(classpathURLs) - .setExclusions(classpathFilenameExclusions); + .setExclusions(classpathFilenameExclusions) + .setForcedJvmPackages(forcedJvmPackages) + .setExcludedJvmPackages(excludedJvmPackages); if (blockSystemExit) { builder.setTransformer(new BlockExitTransformer()); } diff --git a/src/main/java/org/codehaus/mojo/exec/URLClassLoaderBuilder.java b/src/main/java/org/codehaus/mojo/exec/URLClassLoaderBuilder.java index 2438695e..c7ae1bf0 100644 --- a/src/main/java/org/codehaus/mojo/exec/URLClassLoaderBuilder.java +++ b/src/main/java/org/codehaus/mojo/exec/URLClassLoaderBuilder.java @@ -48,6 +48,8 @@ */ class URLClassLoaderBuilder { private Log logger; + private List forcedJvmPackages; + private List excludedJvmPackages; private Collection paths; private Collection exclusions; private ClassFileTransformer transformer; @@ -58,6 +60,18 @@ static URLClassLoaderBuilder builder() { return new URLClassLoaderBuilder(); } + URLClassLoaderBuilder setExcludedJvmPackages(List excludedJvmPackages ) + { + this.excludedJvmPackages = excludedJvmPackages; + return this; + } + + URLClassLoaderBuilder setForcedJvmPackages(List forcedJvmPackages ) + { + this.forcedJvmPackages = forcedJvmPackages; + return this; + } + public URLClassLoaderBuilder setTransformer(final ClassFileTransformer transformer) { this.transformer = transformer; return this; @@ -96,7 +110,7 @@ URLClassLoader build() throws IOException { } } - return new ExecJavaClassLoader(urls.toArray(new URL[0]), transformer, logger); + return new ExecJavaClassLoader( urls.toArray( new URL[0] ), transformer, logger, forcedJvmPackages, excludedJvmPackages ); } // child first strategy @@ -112,12 +126,17 @@ private static class ExecJavaClassLoader extends URLClassLoader { private final String jre; private final Log logger; private final ClassFileTransformer transformer; + private final List forcedJvmPackages; + private final List excludedJvmPackages; - public ExecJavaClassLoader(final URL[] urls, final ClassFileTransformer transformer, final Log logger) { + public ExecJavaClassLoader(URL[] urls, ClassFileTransformer transformer, Log logger, List forcedJvmPackages, List excludedJvmPackages ) + { super(urls); this.jre = getJre(); this.logger = logger; this.transformer = transformer; + this.forcedJvmPackages = forcedJvmPackages; + this.excludedJvmPackages = excludedJvmPackages; } @Override @@ -307,52 +326,72 @@ private boolean postLoad(boolean resolve, Class clazz) { return false; } - // not all jvm classes, for ex "javax" can be overriden so don't list it here + // not all jvm classes, for ex "javax" can be overridden so don't list it them all here (javax.resource for ex) private boolean isDirectJvmClass(final String name) { - if (name.startsWith("java.")) { + if (excludedJvmPackages != null && excludedJvmPackages.stream().anyMatch( name::startsWith )) + { + return false; + } + if (name.startsWith( "java." ) ) + { return true; } - if (name.startsWith("sun.")) { + if ( name.startsWith( "sun." ) ) + { return true; } - if (name.startsWith("jdk.")) { + if ( name.startsWith( "jdk." ) ) + { return true; } - if (name.startsWith("oracle.")) { + if ( name.startsWith( "oracle." ) ) + { return true; } - if (name.startsWith("javafx.")) { + if ( name.startsWith( "javafx." ) ) + { return true; } - if (name.startsWith("netscape.")) { + if ( name.startsWith( "netscape." ) ) + { return true; } - if (name.startsWith("org.")) { - final String sub = name.substring("org.".length()); - if (sub.startsWith("w3c.dom.")) { + if ( name.startsWith( "org." ) ) + { + final String sub = name.substring( "org.".length() ); + if ( sub.startsWith( "w3c.dom." ) ) + { return true; } - if (sub.startsWith("omg.")) { + if ( sub.startsWith( "omg." ) ) + { return true; } - if (sub.startsWith("xml.sax.")) { + if ( sub.startsWith( "xml.sax." ) ) + { return true; } - if (sub.startsWith("ietf.jgss.")) { + if ( sub.startsWith( "ietf.jgss." ) ) + { return true; } - if (sub.startsWith("jcp.xml.dsig.internal.")) { + if ( sub.startsWith( "jcp.xml.dsig.internal." ) ) + { return true; } } - if (name.startsWith("com.")) { - final String sub = name.substring("com.".length()); - if (sub.startsWith("oracle.")) { + if ( name.startsWith( "com." ) ) + { + final String sub = name.substring( "com.".length() ); + if ( sub.startsWith( "oracle." ) ) + { return true; } - if (sub.startsWith("sun.")) { - final String subSun = sub.substring("sun.".length()); - if (subSun.startsWith("accessibility.")) { + if ( sub.startsWith( "sun." ) ) + { + final String subSun = sub.substring( "sun.".length() ); + if ( subSun.startsWith( "accessibility." ) ) + { return true; } if (subSun.startsWith("activation.")) { @@ -427,10 +466,9 @@ private boolean isDirectJvmClass(final String name) { if (subSun.startsWith("xml.internal.")) { return true; } - return false; } } - return false; + return forcedJvmPackages != null && forcedJvmPackages.stream().anyMatch( name::startsWith ); } private class FilteringUrlEnum implements Enumeration { From 254bba32cea27310b0c4411bd90227697d00fb6b Mon Sep 17 00:00:00 2001 From: Slawomir Jaranowski Date: Tue, 22 Oct 2024 09:04:02 +0200 Subject: [PATCH 2/4] Fix after rebase --- src/it/projects/github322/verify.groovy | 3 +- src/it/projects/mexec-29/invoker.properties | 2 +- .../mojo/exec/URLClassLoaderBuilder.java | 168 +++++++----------- 3 files changed, 63 insertions(+), 110 deletions(-) diff --git a/src/it/projects/github322/verify.groovy b/src/it/projects/github322/verify.groovy index a534c78c..be24c487 100644 --- a/src/it/projects/github322/verify.groovy +++ b/src/it/projects/github322/verify.groovy @@ -17,4 +17,5 @@ * under the License. */ -new IntegrationBase().checkExistenceAndContentOfAFile(new File( basedir, "build.log" ), [ "Main Result: " ]) +File log = new File(basedir, 'build.log') +assert log.text.contains( 'Main Result: ') \ No newline at end of file diff --git a/src/it/projects/mexec-29/invoker.properties b/src/it/projects/mexec-29/invoker.properties index b4a42cc1..ba31fa59 100644 --- a/src/it/projects/mexec-29/invoker.properties +++ b/src/it/projects/mexec-29/invoker.properties @@ -1,4 +1,4 @@ invoker.goals = clean verify invoker.debug = true -invoker.buildResult = success +invoker.buildResult = failure diff --git a/src/main/java/org/codehaus/mojo/exec/URLClassLoaderBuilder.java b/src/main/java/org/codehaus/mojo/exec/URLClassLoaderBuilder.java index c7ae1bf0..fd7f5ea3 100644 --- a/src/main/java/org/codehaus/mojo/exec/URLClassLoaderBuilder.java +++ b/src/main/java/org/codehaus/mojo/exec/URLClassLoaderBuilder.java @@ -42,7 +42,6 @@ import static java.util.Arrays.asList; /** - * * @author Robert Scholte * @since 3.0.0 */ @@ -60,14 +59,12 @@ static URLClassLoaderBuilder builder() { return new URLClassLoaderBuilder(); } - URLClassLoaderBuilder setExcludedJvmPackages(List excludedJvmPackages ) - { + URLClassLoaderBuilder setExcludedJvmPackages(List excludedJvmPackages) { this.excludedJvmPackages = excludedJvmPackages; return this; } - URLClassLoaderBuilder setForcedJvmPackages(List forcedJvmPackages ) - { + URLClassLoaderBuilder setForcedJvmPackages(List forcedJvmPackages) { this.forcedJvmPackages = forcedJvmPackages; return this; } @@ -110,7 +107,7 @@ URLClassLoader build() throws IOException { } } - return new ExecJavaClassLoader( urls.toArray( new URL[0] ), transformer, logger, forcedJvmPackages, excludedJvmPackages ); + return new ExecJavaClassLoader(urls.toArray(new URL[0]), transformer, forcedJvmPackages, excludedJvmPackages); } // child first strategy @@ -124,16 +121,17 @@ private static class ExecJavaClassLoader extends URLClassLoader { } private final String jre; - private final Log logger; private final ClassFileTransformer transformer; private final List forcedJvmPackages; private final List excludedJvmPackages; - public ExecJavaClassLoader(URL[] urls, ClassFileTransformer transformer, Log logger, List forcedJvmPackages, List excludedJvmPackages ) - { + public ExecJavaClassLoader( + URL[] urls, + ClassFileTransformer transformer, + List forcedJvmPackages, + List excludedJvmPackages) { super(urls); this.jre = getJre(); - this.logger = logger; this.transformer = transformer; this.forcedJvmPackages = forcedJvmPackages; this.excludedJvmPackages = excludedJvmPackages; @@ -328,151 +326,104 @@ private boolean postLoad(boolean resolve, Class clazz) { // not all jvm classes, for ex "javax" can be overridden so don't list it them all here (javax.resource for ex) private boolean isDirectJvmClass(final String name) { - if (excludedJvmPackages != null && excludedJvmPackages.stream().anyMatch( name::startsWith )) - { + if (excludedJvmPackages != null && excludedJvmPackages.stream().anyMatch(name::startsWith)) { return false; } - if (name.startsWith( "java." ) ) - { + if (name.startsWith("java.")) { return true; - } - if ( name.startsWith( "sun." ) ) - { + } else if (name.startsWith("javax.")) { + final String sub = name.substring("javax.".length()); + if (sub.startsWith("xml.")) { + return true; + } + } else if (name.startsWith("sun.")) { return true; - } - if ( name.startsWith( "jdk." ) ) - { + } else if (name.startsWith("jdk.")) { return true; - } - if ( name.startsWith( "oracle." ) ) - { + } else if (name.startsWith("oracle.")) { return true; - } - if ( name.startsWith( "javafx." ) ) - { + } else if (name.startsWith("javafx.")) { return true; - } - if ( name.startsWith( "netscape." ) ) - { + } else if (name.startsWith("netscape.")) { return true; - } - if ( name.startsWith( "org." ) ) - { - final String sub = name.substring( "org.".length() ); - if ( sub.startsWith( "w3c.dom." ) ) - { + } else if (name.startsWith("org.")) { + final String sub = name.substring("org.".length()); + if (sub.startsWith("w3c.dom.")) { return true; - } - if ( sub.startsWith( "omg." ) ) - { + } else if (sub.startsWith("omg.")) { return true; - } - if ( sub.startsWith( "xml.sax." ) ) - { + } else if (sub.startsWith("xml.sax.")) { return true; - } - if ( sub.startsWith( "ietf.jgss." ) ) - { + } else if (sub.startsWith("ietf.jgss.")) { return true; - } - if ( sub.startsWith( "jcp.xml.dsig.internal." ) ) - { + } else if (sub.startsWith("jcp.xml.dsig.internal.")) { return true; } - } - if ( name.startsWith( "com." ) ) - { - final String sub = name.substring( "com.".length() ); - if ( sub.startsWith( "oracle." ) ) - { + } else if (name.startsWith("com.")) { + final String sub = name.substring("com.".length()); + if (sub.startsWith("oracle.")) { return true; - } - if ( sub.startsWith( "sun." ) ) - { - final String subSun = sub.substring( "sun.".length() ); - if ( subSun.startsWith( "accessibility." ) ) - { + } else if (sub.startsWith("sun.")) { + final String subSun = sub.substring("sun.".length()); + if (subSun.startsWith("accessibility.")) { return true; - } - if (subSun.startsWith("activation.")) { + } else if (subSun.startsWith("activation.")) { return true; - } - if (subSun.startsWith("awt.")) { + } else if (subSun.startsWith("awt.")) { return true; - } - if (subSun.startsWith("beans.")) { + } else if (subSun.startsWith("beans.")) { return true; - } - if (subSun.startsWith("corba.se.")) { + } else if (subSun.startsWith("corba.se.")) { return true; - } - if (subSun.startsWith("demo.jvmti.")) { + } else if (subSun.startsWith("demo.jvmti.")) { return true; - } - if (subSun.startsWith("image.codec.jpeg.")) { + } else if (subSun.startsWith("image.codec.jpeg.")) { return true; - } - if (subSun.startsWith("imageio.")) { + } else if (subSun.startsWith("imageio.")) { return true; - } - if (subSun.startsWith("istack.internal.")) { + } else if (subSun.startsWith("istack.internal.")) { return true; - } - if (subSun.startsWith("java.")) { + } else if (subSun.startsWith("java.")) { return true; - } - if (subSun.startsWith("java_cup.")) { + } else if (subSun.startsWith("java_cup.")) { return true; - } - if (subSun.startsWith("jmx.")) { + } else if (subSun.startsWith("jmx.")) { return true; - } - if (subSun.startsWith("jndi.")) { + } else if (subSun.startsWith("jndi.")) { return true; - } - if (subSun.startsWith("management.")) { + } else if (subSun.startsWith("management.")) { return true; - } - if (subSun.startsWith("media.sound.")) { + } else if (subSun.startsWith("media.sound.")) { return true; - } - if (subSun.startsWith("naming.internal.")) { + } else if (subSun.startsWith("naming.internal.")) { return true; - } - if (subSun.startsWith("net.")) { + } else if (subSun.startsWith("net.")) { return true; - } - if (subSun.startsWith("nio.")) { + } else if (subSun.startsWith("nio.")) { return true; - } - if (subSun.startsWith("org.")) { + } else if (subSun.startsWith("org.")) { return true; - } - if (subSun.startsWith("rmi.rmid.")) { + } else if (subSun.startsWith("rmi.rmid.")) { return true; - } - if (subSun.startsWith("rowset.")) { + } else if (subSun.startsWith("rowset.")) { return true; - } - if (subSun.startsWith("security.")) { + } else if (subSun.startsWith("security.")) { return true; - } - if (subSun.startsWith("swing.")) { + } else if (subSun.startsWith("swing.")) { return true; - } - if (subSun.startsWith("tracing.")) { + } else if (subSun.startsWith("tracing.")) { return true; - } - if (subSun.startsWith("xml.internal.")) { + } else if (subSun.startsWith("xml.internal.")) { return true; } } } - return forcedJvmPackages != null && forcedJvmPackages.stream().anyMatch( name::startsWith ); + return forcedJvmPackages != null && forcedJvmPackages.stream().anyMatch(name::startsWith); } private class FilteringUrlEnum implements Enumeration { private final Enumeration delegate; + private URL next; private FilteringUrlEnum(Enumeration delegate) { @@ -498,6 +449,7 @@ public URL nextElement() { private static class ChainedEnumerations implements Enumeration { private final Iterator> enumerations; + private Enumeration current; private ChainedEnumerations(Iterator> enumerations) { From 980b784088d6e113cf60114e1abe320b57bc0df3 Mon Sep 17 00:00:00 2001 From: Slawomir Jaranowski Date: Tue, 22 Oct 2024 09:10:22 +0200 Subject: [PATCH 3/4] Fix since version --- src/main/java/org/codehaus/mojo/exec/ExecJavaMojo.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/codehaus/mojo/exec/ExecJavaMojo.java b/src/main/java/org/codehaus/mojo/exec/ExecJavaMojo.java index 7dd464d7..1b9e6013 100644 --- a/src/main/java/org/codehaus/mojo/exec/ExecJavaMojo.java +++ b/src/main/java/org/codehaus/mojo/exec/ExecJavaMojo.java @@ -197,7 +197,7 @@ public class ExecJavaMojo extends AbstractExecMojo { /** * Additional packages to load from the jvm even if a classpath dependency matches. * - * @since 3.1.1 + * @since 3.5.0 */ @Parameter private List forcedJvmPackages; @@ -206,7 +206,7 @@ public class ExecJavaMojo extends AbstractExecMojo { * Additional packages to NOT load from the jvm even if it is in a flat classpath. * Can enable to reproduce a webapp behavior for example where library is loaded over the JVM. * - * @since 3.1.1 + * @since 3.5.0 */ @Parameter private List excludedJvmPackages; From d86b406132d32beba38483cdc790df8bb28bbaf7 Mon Sep 17 00:00:00 2001 From: Slawomir Jaranowski Date: Tue, 22 Oct 2024 09:13:15 +0200 Subject: [PATCH 4/4] Fix empty lines --- src/it/projects/github322/verify.groovy | 2 +- src/main/java/org/codehaus/mojo/exec/URLClassLoaderBuilder.java | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/it/projects/github322/verify.groovy b/src/it/projects/github322/verify.groovy index be24c487..5a2e621b 100644 --- a/src/it/projects/github322/verify.groovy +++ b/src/it/projects/github322/verify.groovy @@ -18,4 +18,4 @@ */ File log = new File(basedir, 'build.log') -assert log.text.contains( 'Main Result: ') \ No newline at end of file +assert log.text.contains( 'Main Result: ') diff --git a/src/main/java/org/codehaus/mojo/exec/URLClassLoaderBuilder.java b/src/main/java/org/codehaus/mojo/exec/URLClassLoaderBuilder.java index fd7f5ea3..92cc55c2 100644 --- a/src/main/java/org/codehaus/mojo/exec/URLClassLoaderBuilder.java +++ b/src/main/java/org/codehaus/mojo/exec/URLClassLoaderBuilder.java @@ -423,7 +423,6 @@ private boolean isDirectJvmClass(final String name) { private class FilteringUrlEnum implements Enumeration { private final Enumeration delegate; - private URL next; private FilteringUrlEnum(Enumeration delegate) { @@ -449,7 +448,6 @@ public URL nextElement() { private static class ChainedEnumerations implements Enumeration { private final Iterator> enumerations; - private Enumeration current; private ChainedEnumerations(Iterator> enumerations) {