diff --git a/its/core-it-suite/src/test/resources/mng-2135/plugin/src/main/java/coreit/ItMojo.java b/its/core-it-suite/src/test/resources/mng-2135/plugin/src/main/java/coreit/ItMojo.java
index 07093cd0b05a..d240531aa15f 100644
--- a/its/core-it-suite/src/test/resources/mng-2135/plugin/src/main/java/coreit/ItMojo.java
+++ b/its/core-it-suite/src/test/resources/mng-2135/plugin/src/main/java/coreit/ItMojo.java
@@ -37,9 +37,11 @@
  * under the License.
  */
 
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
 
-import org.apache.maven.plugin.*;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
 
 /**
  * @goal it
diff --git a/its/core-it-suite/src/test/resources/mng-3038/test-project/A/src/test/java/org/apache/maven/its/it0121/A/AppTest.java b/its/core-it-suite/src/test/resources/mng-3038/test-project/A/src/test/java/org/apache/maven/its/it0121/A/AppTest.java
index f9ac2e1f26a5..daa8c8adde72 100644
--- a/its/core-it-suite/src/test/resources/mng-3038/test-project/A/src/test/java/org/apache/maven/its/it0121/A/AppTest.java
+++ b/its/core-it-suite/src/test/resources/mng-3038/test-project/A/src/test/java/org/apache/maven/its/it0121/A/AppTest.java
@@ -18,9 +18,10 @@
  */
 package org.apache.maven.its.it0121.A;
 
-import java.io.*;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 
-import junit.framework.*;
+import junit.framework.TestCase;
 
 public class AppTest extends TestCase {
     public void testOutput() {
diff --git a/its/core-it-suite/src/test/resources/mng-7587-jsr330/plugin/src/test/MyMojoTest.java b/its/core-it-suite/src/test/resources/mng-7587-jsr330/plugin/src/test/MyMojoTest.java
index 07172cab3e7f..524623199971 100644
--- a/its/core-it-suite/src/test/resources/mng-7587-jsr330/plugin/src/test/MyMojoTest.java
+++ b/its/core-it-suite/src/test/resources/mng-7587-jsr330/plugin/src/test/MyMojoTest.java
@@ -5,7 +5,10 @@
 import org.apache.maven.plugin.testing.WithoutMojo;
 
 import org.junit.Rule;
-import static org.junit.Assert.*;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import org.junit.Test;
 import java.io.File;
 
diff --git a/src/mdo/java/InputLocation.java b/src/mdo/java/InputLocation.java
index 6e93ddae993e..8e696fba8111 100644
--- a/src/mdo/java/InputLocation.java
+++ b/src/mdo/java/InputLocation.java
@@ -22,11 +22,8 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedHashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * Represents the location of an element within a model source file.
diff --git a/src/mdo/java/WrapperProperties.java b/src/mdo/java/WrapperProperties.java
index f285ec0666f2..8c787507af1f 100644
--- a/src/mdo/java/WrapperProperties.java
+++ b/src/mdo/java/WrapperProperties.java
@@ -27,16 +27,13 @@
 import java.io.Reader;
 import java.io.Writer;
 import java.util.AbstractSet;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.InvalidPropertiesFormatException;
 import java.util.Iterator;
-import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Properties;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;