Merge pull request #5343 from bjhargrave/maven-imports

maven: Organize imports
bndtools · Aug 18, 2022 · b545b94 · b545b94
2 parents a555897 + 45eb637
commit b545b94
Show file tree

Hide file tree

Showing 30 changed files with 99 additions and 784 deletions.
diff --git a/maven/bnd-baseline-maven-plugin/.settings/org.eclipse.jdt.ui.prefs b/maven/bnd-baseline-maven-plugin/.settings/org.eclipse.jdt.ui.prefs
@@ -79,7 +79,7 @@ formatter_settings_version=16
 org.eclipse.jdt.ui.exception.name=e
 org.eclipse.jdt.ui.gettersetter.use.is=true
 org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.importorder=java;javax;
 org.eclipse.jdt.ui.javadoc=false
 org.eclipse.jdt.ui.keywordthis=false
 org.eclipse.jdt.ui.ondemandthreshold=99

diff --git a/...bnd-baseline-maven-plugin/src/main/java/aQute/bnd/maven/baseline/plugin/BaselineMojo.java b/...bnd-baseline-maven-plugin/src/main/java/aQute/bnd/maven/baseline/plugin/BaselineMojo.java
@@ -12,6 +12,18 @@
 import java.util.Locale;
 import java.util.Objects;
 
+import aQute.bnd.differ.Baseline;
+import aQute.bnd.differ.Baseline.BundleInfo;
+import aQute.bnd.differ.Baseline.Info;
+import aQute.bnd.differ.DiffPluginImpl;
+import aQute.bnd.header.Parameters;
+import aQute.bnd.osgi.Instructions;
+import aQute.bnd.osgi.Jar;
+import aQute.bnd.osgi.Processor;
+import aQute.bnd.service.diff.Diff;
+import aQute.bnd.version.MavenVersion;
+import aQute.lib.io.IO;
+import aQute.lib.strings.Strings;
 import org.apache.maven.RepositoryUtils;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -36,19 +48,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import aQute.bnd.differ.Baseline;
-import aQute.bnd.differ.Baseline.BundleInfo;
-import aQute.bnd.differ.Baseline.Info;
-import aQute.bnd.differ.DiffPluginImpl;
-import aQute.bnd.header.Parameters;
-import aQute.bnd.osgi.Instructions;
-import aQute.bnd.osgi.Jar;
-import aQute.bnd.osgi.Processor;
-import aQute.bnd.service.diff.Diff;
-import aQute.bnd.version.MavenVersion;
-import aQute.lib.io.IO;
-import aQute.lib.strings.Strings;
-
 /**
  * Exports project dependencies to OSGi R5 index format.
  */

diff --git a/maven/bnd-export-maven-plugin/.settings/org.eclipse.jdt.ui.prefs b/maven/bnd-export-maven-plugin/.settings/org.eclipse.jdt.ui.prefs
@@ -79,7 +79,7 @@ formatter_settings_version=16
 org.eclipse.jdt.ui.exception.name=e
 org.eclipse.jdt.ui.gettersetter.use.is=true
 org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.importorder=java;javax;
 org.eclipse.jdt.ui.javadoc=false
 org.eclipse.jdt.ui.keywordthis=false
 org.eclipse.jdt.ui.ondemandthreshold=99

diff --git a/maven/bnd-export-maven-plugin/src/main/java/aQute/bnd/maven/export/plugin/ExportMojo.java b/maven/bnd-export-maven-plugin/src/main/java/aQute/bnd/maven/export/plugin/ExportMojo.java
@@ -9,6 +9,19 @@
 import java.util.Map.Entry;
 import java.util.Set;
 
+import aQute.bnd.exporter.executable.ExecutableJarExporter;
+import aQute.bnd.exporter.runbundles.RunbundlesExporter;
+import aQute.bnd.maven.lib.configuration.Bndruns;
+import aQute.bnd.maven.lib.configuration.Bundles;
+import aQute.bnd.maven.lib.resolve.BndrunContainer;
+import aQute.bnd.maven.lib.resolve.Operation;
+import aQute.bnd.maven.lib.resolve.Scope;
+import aQute.bnd.osgi.Constants;
+import aQute.bnd.osgi.JarResource;
+import aQute.bnd.osgi.Resource;
+import aQute.bnd.unmodifiable.Sets;
+import aQute.lib.io.IO;
+import biz.aQute.resolve.ResolveProcess;
 import org.apache.maven.artifact.DefaultArtifact;
 import org.apache.maven.artifact.handler.DefaultArtifactHandler;
 import org.apache.maven.execution.MavenSession;
@@ -28,20 +41,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import aQute.bnd.exporter.executable.ExecutableJarExporter;
-import aQute.bnd.exporter.runbundles.RunbundlesExporter;
-import aQute.bnd.maven.lib.configuration.Bndruns;
-import aQute.bnd.maven.lib.configuration.Bundles;
-import aQute.bnd.maven.lib.resolve.BndrunContainer;
-import aQute.bnd.maven.lib.resolve.Operation;
-import aQute.bnd.maven.lib.resolve.Scope;
-import aQute.bnd.osgi.Constants;
-import aQute.bnd.osgi.JarResource;
-import aQute.bnd.osgi.Resource;
-import aQute.bnd.unmodifiable.Sets;
-import aQute.lib.io.IO;
-import biz.aQute.resolve.ResolveProcess;
-
 @Mojo(name = "export", defaultPhase = PACKAGE, requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME, threadSafe = true)
 public class ExportMojo extends AbstractMojo {
 	private static final Logger									logger	= LoggerFactory.getLogger(ExportMojo.class);

diff --git a/maven/bnd-indexer-maven-plugin/.settings/org.eclipse.jdt.ui.prefs b/maven/bnd-indexer-maven-plugin/.settings/org.eclipse.jdt.ui.prefs
@@ -79,7 +79,7 @@ formatter_settings_version=16
 org.eclipse.jdt.ui.exception.name=e
 org.eclipse.jdt.ui.gettersetter.use.is=true
 org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.importorder=java;javax;
 org.eclipse.jdt.ui.javadoc=false
 org.eclipse.jdt.ui.keywordthis=false
 org.eclipse.jdt.ui.ondemandthreshold=99

diff --git a/maven/bnd-indexer-maven-plugin/src/main/java/aQute/bnd/maven/indexer/plugin/IndexerMojo.java b/maven/bnd-indexer-maven-plugin/src/main/java/aQute/bnd/maven/indexer/plugin/IndexerMojo.java
@@ -13,6 +13,16 @@
 import java.util.Map.Entry;
 import java.util.Set;
 
+import aQute.bnd.maven.lib.resolve.DependencyResolver;
+import aQute.bnd.maven.lib.resolve.LocalURLs;
+import aQute.bnd.maven.lib.resolve.RemotePostProcessor;
+import aQute.bnd.maven.lib.resolve.Scope;
+import aQute.bnd.osgi.repository.ResourcesRepository;
+import aQute.bnd.osgi.repository.XMLResourceGenerator;
+import aQute.bnd.osgi.resource.CapabilityBuilder;
+import aQute.bnd.osgi.resource.ResourceBuilder;
+import aQute.lib.io.IO;
+import aQute.libg.cryptography.SHA256;
 import org.apache.maven.RepositoryUtils;
 import org.apache.maven.artifact.DefaultArtifact;
 import org.apache.maven.artifact.handler.DefaultArtifactHandler;
@@ -39,17 +49,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import aQute.bnd.maven.lib.resolve.DependencyResolver;
-import aQute.bnd.maven.lib.resolve.LocalURLs;
-import aQute.bnd.maven.lib.resolve.RemotePostProcessor;
-import aQute.bnd.maven.lib.resolve.Scope;
-import aQute.bnd.osgi.repository.ResourcesRepository;
-import aQute.bnd.osgi.repository.XMLResourceGenerator;
-import aQute.bnd.osgi.resource.CapabilityBuilder;
-import aQute.bnd.osgi.resource.ResourceBuilder;
-import aQute.lib.io.IO;
-import aQute.libg.cryptography.SHA256;
-
 /**
  * Exports project dependencies to OSGi R5 index format.
  */

diff --git a/...d-indexer-maven-plugin/src/main/java/aQute/bnd/maven/indexer/plugin/LocalIndexerMojo.java b/...d-indexer-maven-plugin/src/main/java/aQute/bnd/maven/indexer/plugin/LocalIndexerMojo.java
@@ -8,6 +8,11 @@
 import java.util.stream.Collectors;
 import java.util.zip.GZIPOutputStream;
 
+import aQute.bnd.maven.lib.configuration.FileTree;
+import aQute.bnd.osgi.Processor;
+import aQute.bnd.osgi.repository.SimpleIndexer;
+import aQute.lib.io.IO;
+import aQute.service.reporter.Report.Location;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
@@ -16,12 +21,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import aQute.bnd.maven.lib.configuration.FileTree;
-import aQute.bnd.osgi.Processor;
-import aQute.bnd.osgi.repository.SimpleIndexer;
-import aQute.lib.io.IO;
-import aQute.service.reporter.Report.Location;
-
 /**
  * Exports project dependencies to OSGi R5 index format.
  */

diff --git a/maven/bnd-maven-plugin/.settings/org.eclipse.jdt.ui.prefs b/maven/bnd-maven-plugin/.settings/org.eclipse.jdt.ui.prefs
@@ -79,7 +79,7 @@ formatter_settings_version=16
 org.eclipse.jdt.ui.exception.name=e
 org.eclipse.jdt.ui.gettersetter.use.is=true
 org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.importorder=java;javax;
 org.eclipse.jdt.ui.javadoc=false
 org.eclipse.jdt.ui.keywordthis=false
 org.eclipse.jdt.ui.ondemandthreshold=99

diff --git a/maven/bnd-maven-plugin/src/main/java/aQute/bnd/maven/plugin/BndMavenTestsPlugin.java b/maven/bnd-maven-plugin/src/main/java/aQute/bnd/maven/plugin/BndMavenTestsPlugin.java
@@ -19,16 +19,15 @@
 import java.io.File;
 import java.util.List;
 
+import aQute.bnd.osgi.Builder;
+import aQute.bnd.osgi.Constants;
 import org.apache.maven.model.Resource;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.plugins.annotations.ResolutionScope;
 
-import aQute.bnd.osgi.Builder;
-import aQute.bnd.osgi.Constants;
-
 /**
  * Processes the test target classes to generate OSGi metadata.
  * <p>

diff --git a/...d-maven-plugin/src/main/java/aQute/bnd/maven/plugin/BndPackagingLifecycleParticipant.java b/...d-maven-plugin/src/main/java/aQute/bnd/maven/plugin/BndPackagingLifecycleParticipant.java
@@ -7,6 +7,7 @@
 import java.util.Objects;
 import java.util.Optional;
 
+import aQute.bnd.maven.lib.executions.PluginExecutions;
 import org.apache.maven.AbstractMavenLifecycleParticipant;
 import org.apache.maven.MavenExecutionException;
 import org.apache.maven.execution.MavenSession;
@@ -20,8 +21,6 @@
 import org.codehaus.plexus.logging.LogEnabled;
 import org.codehaus.plexus.logging.Logger;
 
-import aQute.bnd.maven.lib.executions.PluginExecutions;
-
 /**
  * This lifecycle participant is meant to simplify the changes required to the
  * configuration of the maven packaging plugins when the