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 index b67dd052ad..a21ff13162 100644 --- 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/maven/bnd-baseline-maven-plugin/src/main/java/aQute/bnd/maven/baseline/plugin/BaselineMojo.java b/maven/bnd-baseline-maven-plugin/src/main/java/aQute/bnd/maven/baseline/plugin/BaselineMojo.java index 6505b09018..f73ea095ef 100644 --- a/maven/bnd-baseline-maven-plugin/src/main/java/aQute/bnd/maven/baseline/plugin/BaselineMojo.java +++ b/maven/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 index b67dd052ad..a21ff13162 100644 --- 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 index d74c72bc4b..21b46acca0 100644 --- 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 index b67dd052ad..a21ff13162 100644 --- 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 index 36d81b2b59..1e2d1c8c2e 100644 --- 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/maven/bnd-indexer-maven-plugin/src/main/java/aQute/bnd/maven/indexer/plugin/LocalIndexerMojo.java b/maven/bnd-indexer-maven-plugin/src/main/java/aQute/bnd/maven/indexer/plugin/LocalIndexerMojo.java index 215cceb245..faa18b3309 100644 --- a/maven/bnd-indexer-maven-plugin/src/main/java/aQute/bnd/maven/indexer/plugin/LocalIndexerMojo.java +++ b/maven/bnd-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 index b67dd052ad..a21ff13162 100644 --- 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 index f8f6b47f7b..4816747cd8 100644 --- 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,6 +19,8 @@ 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; @@ -26,9 +28,6 @@ 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. *

diff --git a/maven/bnd-maven-plugin/src/main/java/aQute/bnd/maven/plugin/BndPackagingLifecycleParticipant.java b/maven/bnd-maven-plugin/src/main/java/aQute/bnd/maven/plugin/BndPackagingLifecycleParticipant.java index 36d1eeb153..187feff46c 100644 --- a/maven/bnd-maven-plugin/src/main/java/aQute/bnd/maven/plugin/BndPackagingLifecycleParticipant.java +++ b/maven/bnd-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 diff --git a/maven/bnd-plugin-parent/.settings/org.eclipse.jdt.core.prefs b/maven/bnd-plugin-parent/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 88a52ef81d..0000000000 --- a/maven/bnd-plugin-parent/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,517 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.builder.cleanOutputFolder=clean -org.eclipse.jdt.core.builder.duplicateResourceTask=warning -org.eclipse.jdt.core.builder.invalidClasspath=abort -org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore -org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch -org.eclipse.jdt.core.circularClasspath=error -org.eclipse.jdt.core.classpath.exclusionPatterns=enabled -org.eclipse.jdt.core.classpath.mainOnlyProjectHasTestOnlyDependency=error -org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled -org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error -org.eclipse.jdt.core.codeComplete.argumentPrefixes= -org.eclipse.jdt.core.codeComplete.argumentSuffixes= -org.eclipse.jdt.core.codeComplete.fieldPrefixes= -org.eclipse.jdt.core.codeComplete.fieldSuffixes= -org.eclipse.jdt.core.codeComplete.localPrefixes= -org.eclipse.jdt.core.codeComplete.localSuffixes= -org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= -org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled -org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore -org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull -org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= -org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable -org.eclipse.jdt.core.compiler.annotation.nullable.secondary= -org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.doc.comment.support=enabled -org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 -org.eclipse.jdt.core.compiler.problem.APILeak=warning -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning -org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public -org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag -org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning -org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning -org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error -org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning -org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning -org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning -org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled -org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignore -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.processAnnotations=disabled -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=1.8 -org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled -org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,NORMAL -org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME -org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false -org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=true -org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false -org.eclipse.jdt.core.formatter.align_with_spaces=false -org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_loops=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=17 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0 -org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_module_statements=16 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0 -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=81 -org.eclipse.jdt.core.formatter.alignment_for_shift_operator=0 -org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0 -org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0 -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=false -org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=true -org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.comment.indent_tag_description=false -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert -org.eclipse.jdt.core.formatter.comment.line_length=80 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=1 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true -org.eclipse.jdt.core.formatter.indentation.size=4 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert -org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_lines_in_comments=true -org.eclipse.jdt.core.formatter.join_wrapped_lines=true -org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_if_empty -org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_if_empty -org.eclipse.jdt.core.formatter.keep_code_block_on_one_line=one_line_if_empty -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line=one_line_if_empty -org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line=one_line_if_empty -org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line=one_line_if_empty -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line=one_line_if_empty -org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line=one_line_if_empty -org.eclipse.jdt.core.formatter.keep_method_body_on_one_line=one_line_if_empty -org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false -org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false -org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false -org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_if_empty -org.eclipse.jdt.core.formatter.lineSplit=120 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.use_on_off_tags=true -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true -org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true -org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true -org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true -org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true -org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true -org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true -org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -org.eclipse.jdt.core.incompatibleJDKLevel=ignore -org.eclipse.jdt.core.incompleteClasspath=error -org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter diff --git a/maven/bnd-plugin-parent/.settings/org.eclipse.jdt.ui.prefs b/maven/bnd-plugin-parent/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index b67dd052ad..0000000000 --- a/maven/bnd-plugin-parent/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,148 +0,0 @@ -cleanup.add_default_serial_version_id=true -cleanup.add_generated_serial_version_id=false -cleanup.add_missing_annotations=true -cleanup.add_missing_deprecated_annotations=true -cleanup.add_missing_methods=false -cleanup.add_missing_nls_tags=false -cleanup.add_missing_override_annotations=true -cleanup.add_missing_override_annotations_interface_methods=true -cleanup.add_serial_version_id=true -cleanup.always_use_blocks=true -cleanup.always_use_parentheses_in_expressions=false -cleanup.always_use_this_for_non_static_field_access=false -cleanup.always_use_this_for_non_static_method_access=false -cleanup.convert_functional_interfaces=true -cleanup.convert_to_enhanced_for_loop=true -cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false -cleanup.correct_indentation=false -cleanup.format_source_code=false -cleanup.format_source_code_changes_only=false -cleanup.insert_inferred_type_arguments=false -cleanup.lazy_logical_operator=false -cleanup.make_local_variable_final=true -cleanup.make_parameters_final=false -cleanup.make_private_fields_final=true -cleanup.make_type_abstract_if_missing_method=false -cleanup.make_variable_declarations_final=false -cleanup.merge_conditional_blocks=false -cleanup.never_use_blocks=false -cleanup.never_use_parentheses_in_expressions=true -cleanup.number_suffix=true -cleanup.objects_equals=true -cleanup.organize_imports=false -cleanup.precompile_regex=true -cleanup.push_down_negation=false -cleanup.qualify_static_field_accesses_with_declaring_class=false -cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -cleanup.qualify_static_member_accesses_with_declaring_class=true -cleanup.qualify_static_method_accesses_with_declaring_class=false -cleanup.remove_private_constructors=true -cleanup.remove_redundant_modifiers=true -cleanup.remove_redundant_semicolons=true -cleanup.remove_redundant_type_arguments=true -cleanup.remove_trailing_whitespaces=true -cleanup.remove_trailing_whitespaces_all=true -cleanup.remove_trailing_whitespaces_ignore_empty=false -cleanup.remove_unnecessary_array_creation=true -cleanup.remove_unnecessary_casts=true -cleanup.remove_unnecessary_nls_tags=true -cleanup.remove_unused_imports=true -cleanup.remove_unused_local_variables=false -cleanup.remove_unused_private_fields=true -cleanup.remove_unused_private_members=true -cleanup.remove_unused_private_methods=true -cleanup.remove_unused_private_types=true -cleanup.simplify_lambda_expression_and_method_ref=true -cleanup.sort_members=false -cleanup.sort_members_all=false -cleanup.use_anonymous_class_creation=false -cleanup.use_autoboxing=false -cleanup.use_blocks=false -cleanup.use_blocks_only_for_return_and_throw=false -cleanup.use_directly_map_method=true -cleanup.use_lambda=true -cleanup.use_parentheses_in_expressions=false -cleanup.use_this_for_non_static_field_access=false -cleanup.use_this_for_non_static_field_access_only_if_necessary=true -cleanup.use_this_for_non_static_method_access=false -cleanup.use_this_for_non_static_method_access_only_if_necessary=true -cleanup.use_type_arguments=false -cleanup.use_unboxing=false -cleanup.use_var=false -cleanup_profile=_bnd -cleanup_settings_version=2 -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_bnd -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.javadoc=false -org.eclipse.jdt.ui.keywordthis=false -org.eclipse.jdt.ui.ondemandthreshold=99 -org.eclipse.jdt.ui.overrideannotation=true -org.eclipse.jdt.ui.staticondemandthreshold=99 -org.eclipse.jdt.ui.text.custom_code_templates= -sp_cleanup.add_default_serial_version_id=true -sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=true -sp_cleanup.add_missing_deprecated_annotations=true -sp_cleanup.add_missing_methods=false -sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true -sp_cleanup.add_missing_override_annotations_interface_methods=true -sp_cleanup.add_serial_version_id=false -sp_cleanup.always_use_blocks=true -sp_cleanup.always_use_parentheses_in_expressions=false -sp_cleanup.always_use_this_for_non_static_field_access=false -sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.convert_functional_interfaces=false -sp_cleanup.convert_to_enhanced_for_loop=false -sp_cleanup.correct_indentation=false -sp_cleanup.format_source_code=true -sp_cleanup.format_source_code_changes_only=true -sp_cleanup.insert_inferred_type_arguments=false -sp_cleanup.make_local_variable_final=false -sp_cleanup.make_parameters_final=false -sp_cleanup.make_private_fields_final=true -sp_cleanup.make_type_abstract_if_missing_method=false -sp_cleanup.make_variable_declarations_final=false -sp_cleanup.never_use_blocks=false -sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.on_save_use_additional_actions=true -sp_cleanup.organize_imports=true -sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_with_declaring_class=true -sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_redundant_modifiers=true -sp_cleanup.remove_redundant_semicolons=true -sp_cleanup.remove_redundant_type_arguments=false -sp_cleanup.remove_trailing_whitespaces=true -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=true -sp_cleanup.remove_unused_imports=true -sp_cleanup.remove_unused_local_variables=false -sp_cleanup.remove_unused_private_fields=true -sp_cleanup.remove_unused_private_members=false -sp_cleanup.remove_unused_private_methods=true -sp_cleanup.remove_unused_private_types=true -sp_cleanup.sort_members=false -sp_cleanup.sort_members_all=false -sp_cleanup.use_anonymous_class_creation=false -sp_cleanup.use_blocks=false -sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_lambda=true -sp_cleanup.use_parentheses_in_expressions=false -sp_cleanup.use_this_for_non_static_field_access=false -sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true -sp_cleanup.use_this_for_non_static_method_access=false -sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true -sp_cleanup.use_type_arguments=false diff --git a/maven/bnd-reporter-maven-plugin/.settings/org.eclipse.jdt.ui.prefs b/maven/bnd-reporter-maven-plugin/.settings/org.eclipse.jdt.ui.prefs index b67dd052ad..a21ff13162 100644 --- a/maven/bnd-reporter-maven-plugin/.settings/org.eclipse.jdt.ui.prefs +++ b/maven/bnd-reporter-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-reporter-maven-plugin/src/main/java/aQute/bnd/maven/reporter/plugin/ExportMojo.java b/maven/bnd-reporter-maven-plugin/src/main/java/aQute/bnd/maven/reporter/plugin/ExportMojo.java index 6ad79b03d5..91d7b2a331 100644 --- a/maven/bnd-reporter-maven-plugin/src/main/java/aQute/bnd/maven/reporter/plugin/ExportMojo.java +++ b/maven/bnd-reporter-maven-plugin/src/main/java/aQute/bnd/maven/reporter/plugin/ExportMojo.java @@ -7,6 +7,11 @@ import java.util.Map; import java.util.Map.Entry; +import aQute.bnd.osgi.Processor; +import aQute.bnd.osgi.Resource; +import aQute.bnd.service.reporter.ReportExporterService; +import aQute.bnd.service.reporter.ReportGeneratorService; +import biz.aQute.bnd.reporter.exporter.ReportExporterBuilder; import org.apache.maven.execution.MavenSession; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; @@ -17,12 +22,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import aQute.bnd.osgi.Processor; -import aQute.bnd.osgi.Resource; -import aQute.bnd.service.reporter.ReportExporterService; -import aQute.bnd.service.reporter.ReportGeneratorService; -import biz.aQute.bnd.reporter.exporter.ReportExporterBuilder; - /** * Exports a set of user defined reports. */ diff --git a/maven/bnd-reporter-maven-plugin/src/main/java/aQute/bnd/maven/reporter/plugin/ReadmeMojo.java b/maven/bnd-reporter-maven-plugin/src/main/java/aQute/bnd/maven/reporter/plugin/ReadmeMojo.java index 0cd2ee4008..c196e16bcc 100644 --- a/maven/bnd-reporter-maven-plugin/src/main/java/aQute/bnd/maven/reporter/plugin/ReadmeMojo.java +++ b/maven/bnd-reporter-maven-plugin/src/main/java/aQute/bnd/maven/reporter/plugin/ReadmeMojo.java @@ -5,6 +5,11 @@ import java.util.Map; import java.util.Map.Entry; +import aQute.bnd.osgi.Processor; +import aQute.bnd.osgi.Resource; +import aQute.bnd.service.reporter.ReportExporterService; +import aQute.bnd.service.reporter.ReportGeneratorService; +import biz.aQute.bnd.reporter.exporter.ReportExporterBuilder; import org.apache.maven.execution.MavenSession; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; @@ -15,12 +20,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import aQute.bnd.osgi.Processor; -import aQute.bnd.osgi.Resource; -import aQute.bnd.service.reporter.ReportExporterService; -import aQute.bnd.service.reporter.ReportGeneratorService; -import biz.aQute.bnd.reporter.exporter.ReportExporterBuilder; - /** * Exports a set of readme files (template can be parametrized with system * properties starting with 'bnd.reporter.*'). diff --git a/maven/bnd-reporter-maven-plugin/src/main/java/aQute/bnd/maven/reporter/plugin/Report.java b/maven/bnd-reporter-maven-plugin/src/main/java/aQute/bnd/maven/reporter/plugin/Report.java index 11d3ab0073..2c10ea5de2 100644 --- a/maven/bnd-reporter-maven-plugin/src/main/java/aQute/bnd/maven/reporter/plugin/Report.java +++ b/maven/bnd-reporter-maven-plugin/src/main/java/aQute/bnd/maven/reporter/plugin/Report.java @@ -3,11 +3,10 @@ import java.util.HashMap; import java.util.Map; +import aQute.bnd.header.OSGiHeader; import org.apache.maven.plugin.MojoExecutionException; import org.codehaus.plexus.util.StringUtils; -import aQute.bnd.header.OSGiHeader; - /** * Report Mojo configuration. */ diff --git a/maven/bnd-reporter-maven-plugin/src/main/java/aQute/bnd/maven/reporter/plugin/ReportConfig.java b/maven/bnd-reporter-maven-plugin/src/main/java/aQute/bnd/maven/reporter/plugin/ReportConfig.java index 402bcd7ef2..f58b2e2245 100644 --- a/maven/bnd-reporter-maven-plugin/src/main/java/aQute/bnd/maven/reporter/plugin/ReportConfig.java +++ b/maven/bnd-reporter-maven-plugin/src/main/java/aQute/bnd/maven/reporter/plugin/ReportConfig.java @@ -5,11 +5,10 @@ import java.util.List; import java.util.Map; -import org.apache.maven.plugin.MojoExecutionException; -import org.codehaus.plexus.util.StringUtils; - import aQute.bnd.header.OSGiHeader; import biz.aQute.bnd.reporter.generator.EntryNamesReference; +import org.apache.maven.plugin.MojoExecutionException; +import org.codehaus.plexus.util.StringUtils; /** * ReportConfig Mojo configuration. diff --git a/maven/bnd-reporter-maven-plugin/src/main/java/aQute/bnd/maven/reporter/plugin/entries/mavenproject/CommonInfoPlugin.java b/maven/bnd-reporter-maven-plugin/src/main/java/aQute/bnd/maven/reporter/plugin/entries/mavenproject/CommonInfoPlugin.java index 7ecebd16ef..e993e65778 100644 --- a/maven/bnd-reporter-maven-plugin/src/main/java/aQute/bnd/maven/reporter/plugin/entries/mavenproject/CommonInfoPlugin.java +++ b/maven/bnd-reporter-maven-plugin/src/main/java/aQute/bnd/maven/reporter/plugin/entries/mavenproject/CommonInfoPlugin.java @@ -10,8 +10,6 @@ import java.util.TimeZone; import java.util.concurrent.TimeUnit; -import org.apache.maven.project.MavenProject; - import aQute.bnd.annotation.plugin.BndPlugin; import aQute.bnd.maven.reporter.plugin.MavenProjectWrapper; import aQute.bnd.service.Plugin; @@ -25,6 +23,7 @@ import biz.aQute.bnd.reporter.manifest.dto.LicenseDTO; import biz.aQute.bnd.reporter.manifest.dto.ScmDTO; import biz.aQute.bnd.reporter.manifest.dto.VersionDTO; +import org.apache.maven.project.MavenProject; /** * This plugins extract common info from a maven project pom. diff --git a/maven/bnd-reporter-maven-plugin/src/main/java/aQute/bnd/maven/reporter/plugin/entries/mavenproject/MavenAggregatorConcentPlugin.java b/maven/bnd-reporter-maven-plugin/src/main/java/aQute/bnd/maven/reporter/plugin/entries/mavenproject/MavenAggregatorConcentPlugin.java index 8918a92cb0..5cfb893112 100644 --- a/maven/bnd-reporter-maven-plugin/src/main/java/aQute/bnd/maven/reporter/plugin/entries/mavenproject/MavenAggregatorConcentPlugin.java +++ b/maven/bnd-reporter-maven-plugin/src/main/java/aQute/bnd/maven/reporter/plugin/entries/mavenproject/MavenAggregatorConcentPlugin.java @@ -10,8 +10,6 @@ import java.util.Objects; import java.util.Set; -import org.apache.maven.project.MavenProject; - import aQute.bnd.annotation.plugin.BndPlugin; import aQute.bnd.maven.reporter.plugin.MavenProjectWrapper; import aQute.bnd.maven.reporter.plugin.ReportGeneratorFactory; @@ -25,6 +23,7 @@ import biz.aQute.bnd.reporter.generator.ReportGeneratorBuilder; import biz.aQute.bnd.reporter.generator.ReportGeneratorConstants; import biz.aQute.bnd.reporter.plugins.entries.bndworkspace.BndWorkspaceContentsPlugin; +import org.apache.maven.project.MavenProject; /** * This plugins extracts the child project data of a maven project. The user can diff --git a/maven/bnd-reporter-maven-plugin/src/test/java/aQute/bnd/maven/reporter/plugin/entries/mavenproject/CodeSnippetPluginTest.java b/maven/bnd-reporter-maven-plugin/src/test/java/aQute/bnd/maven/reporter/plugin/entries/mavenproject/CodeSnippetPluginTest.java index 2f83ae9358..f2faddb60c 100644 --- a/maven/bnd-reporter-maven-plugin/src/test/java/aQute/bnd/maven/reporter/plugin/entries/mavenproject/CodeSnippetPluginTest.java +++ b/maven/bnd-reporter-maven-plugin/src/test/java/aQute/bnd/maven/reporter/plugin/entries/mavenproject/CodeSnippetPluginTest.java @@ -11,11 +11,10 @@ import java.util.Locale; import java.util.Map; -import org.apache.maven.project.MavenProject; -import org.junit.jupiter.api.Test; - import aQute.bnd.maven.reporter.plugin.MavenProjectWrapper; import aQute.lib.io.IO; +import org.apache.maven.project.MavenProject; +import org.junit.jupiter.api.Test; public class CodeSnippetPluginTest { diff --git a/maven/bnd-reporter-maven-plugin/src/test/java/aQute/bnd/maven/reporter/plugin/entries/mavenproject/CommonInfoPluginTest.java b/maven/bnd-reporter-maven-plugin/src/test/java/aQute/bnd/maven/reporter/plugin/entries/mavenproject/CommonInfoPluginTest.java index d89b6ccc0e..c7ccd3b51a 100644 --- a/maven/bnd-reporter-maven-plugin/src/test/java/aQute/bnd/maven/reporter/plugin/entries/mavenproject/CommonInfoPluginTest.java +++ b/maven/bnd-reporter-maven-plugin/src/test/java/aQute/bnd/maven/reporter/plugin/entries/mavenproject/CommonInfoPluginTest.java @@ -7,6 +7,8 @@ import java.util.List; import java.util.Locale; +import aQute.bnd.maven.reporter.plugin.MavenProjectWrapper; +import biz.aQute.bnd.reporter.manifest.dto.CommonInfoDTO; import org.apache.maven.model.Developer; import org.apache.maven.model.DistributionManagement; import org.apache.maven.model.License; @@ -15,9 +17,6 @@ import org.apache.maven.project.MavenProject; import org.junit.jupiter.api.Test; -import aQute.bnd.maven.reporter.plugin.MavenProjectWrapper; -import biz.aQute.bnd.reporter.manifest.dto.CommonInfoDTO; - public class CommonInfoPluginTest { @Test diff --git a/maven/bnd-reporter-maven-plugin/src/test/java/aQute/bnd/maven/reporter/plugin/entries/mavenproject/FileNamePluginTest.java b/maven/bnd-reporter-maven-plugin/src/test/java/aQute/bnd/maven/reporter/plugin/entries/mavenproject/FileNamePluginTest.java index e68fc759f8..55340dcd0c 100644 --- a/maven/bnd-reporter-maven-plugin/src/test/java/aQute/bnd/maven/reporter/plugin/entries/mavenproject/FileNamePluginTest.java +++ b/maven/bnd-reporter-maven-plugin/src/test/java/aQute/bnd/maven/reporter/plugin/entries/mavenproject/FileNamePluginTest.java @@ -7,11 +7,10 @@ import java.util.List; import java.util.Locale; +import aQute.bnd.maven.reporter.plugin.MavenProjectWrapper; import org.apache.maven.project.MavenProject; import org.junit.jupiter.api.Test; -import aQute.bnd.maven.reporter.plugin.MavenProjectWrapper; - public class FileNamePluginTest { @Test diff --git a/maven/bnd-reporter-maven-plugin/src/test/java/aQute/bnd/maven/reporter/plugin/entries/mavenproject/MavenAggregatorConcentPluginTest.java b/maven/bnd-reporter-maven-plugin/src/test/java/aQute/bnd/maven/reporter/plugin/entries/mavenproject/MavenAggregatorConcentPluginTest.java index b70aaa75b6..3c8a95c173 100644 --- a/maven/bnd-reporter-maven-plugin/src/test/java/aQute/bnd/maven/reporter/plugin/entries/mavenproject/MavenAggregatorConcentPluginTest.java +++ b/maven/bnd-reporter-maven-plugin/src/test/java/aQute/bnd/maven/reporter/plugin/entries/mavenproject/MavenAggregatorConcentPluginTest.java @@ -12,11 +12,10 @@ import java.util.Locale; import java.util.Map; +import aQute.bnd.maven.reporter.plugin.MavenProjectWrapper; import org.apache.maven.project.MavenProject; import org.junit.jupiter.api.Test; -import aQute.bnd.maven.reporter.plugin.MavenProjectWrapper; - public class MavenAggregatorConcentPluginTest { @Test diff --git a/maven/bnd-reporter-maven-plugin/src/test/java/aQute/bnd/maven/reporter/plugin/entries/mavenproject/MavenProjectContentPluginTest.java b/maven/bnd-reporter-maven-plugin/src/test/java/aQute/bnd/maven/reporter/plugin/entries/mavenproject/MavenProjectContentPluginTest.java index c51bc48dd4..ec86b3b391 100644 --- a/maven/bnd-reporter-maven-plugin/src/test/java/aQute/bnd/maven/reporter/plugin/entries/mavenproject/MavenProjectContentPluginTest.java +++ b/maven/bnd-reporter-maven-plugin/src/test/java/aQute/bnd/maven/reporter/plugin/entries/mavenproject/MavenProjectContentPluginTest.java @@ -10,12 +10,11 @@ import java.util.List; import java.util.Locale; +import aQute.bnd.maven.reporter.plugin.MavenProjectWrapper; import org.apache.maven.model.Build; import org.apache.maven.project.MavenProject; import org.junit.jupiter.api.Test; -import aQute.bnd.maven.reporter.plugin.MavenProjectWrapper; - public class MavenProjectContentPluginTest { @Test diff --git a/maven/bnd-resolver-maven-plugin/.settings/org.eclipse.jdt.ui.prefs b/maven/bnd-resolver-maven-plugin/.settings/org.eclipse.jdt.ui.prefs index b67dd052ad..a21ff13162 100644 --- a/maven/bnd-resolver-maven-plugin/.settings/org.eclipse.jdt.ui.prefs +++ b/maven/bnd-resolver-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-resolver-maven-plugin/src/main/java/aQute/bnd/maven/resolver/plugin/ResolverMojo.java b/maven/bnd-resolver-maven-plugin/src/main/java/aQute/bnd/maven/resolver/plugin/ResolverMojo.java index 7a39726b6b..f9445c002f 100644 --- a/maven/bnd-resolver-maven-plugin/src/main/java/aQute/bnd/maven/resolver/plugin/ResolverMojo.java +++ b/maven/bnd-resolver-maven-plugin/src/main/java/aQute/bnd/maven/resolver/plugin/ResolverMojo.java @@ -6,6 +6,14 @@ import java.util.List; import java.util.Set; +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.unmodifiable.Sets; +import biz.aQute.resolve.ResolveProcess; import org.apache.maven.execution.MavenSession; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; @@ -23,15 +31,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -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.unmodifiable.Sets; -import biz.aQute.resolve.ResolveProcess; - /** * Resolves the -runbundles for the given bndrun file. */ diff --git a/maven/bnd-run-maven-plugin/.settings/org.eclipse.jdt.ui.prefs b/maven/bnd-run-maven-plugin/.settings/org.eclipse.jdt.ui.prefs index b67dd052ad..a21ff13162 100644 --- a/maven/bnd-run-maven-plugin/.settings/org.eclipse.jdt.ui.prefs +++ b/maven/bnd-run-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-run-maven-plugin/src/main/java/aQute/bnd/maven/run/plugin/RunMojo.java b/maven/bnd-run-maven-plugin/src/main/java/aQute/bnd/maven/run/plugin/RunMojo.java index e0649db3d0..f434123ca7 100644 --- a/maven/bnd-run-maven-plugin/src/main/java/aQute/bnd/maven/run/plugin/RunMojo.java +++ b/maven/bnd-run-maven-plugin/src/main/java/aQute/bnd/maven/run/plugin/RunMojo.java @@ -9,6 +9,14 @@ import java.util.concurrent.ForkJoinPool; import java.util.concurrent.ScheduledExecutorService; +import aQute.bnd.build.ProjectLauncher; +import aQute.bnd.build.ProjectLauncher.LiveCoding; +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.unmodifiable.Sets; import org.apache.maven.execution.MavenSession; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; @@ -25,15 +33,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import aQute.bnd.build.ProjectLauncher; -import aQute.bnd.build.ProjectLauncher.LiveCoding; -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.unmodifiable.Sets; - @Mojo(name = "run", defaultPhase = LifecyclePhase.PACKAGE, requiresDirectInvocation = true, requiresProject = true, requiresDependencyResolution = ResolutionScope.TEST, threadSafe = true) public class RunMojo extends AbstractMojo { private static final Logger logger = LoggerFactory.getLogger(RunMojo.class); diff --git a/maven/bnd-testing-maven-plugin/.settings/org.eclipse.jdt.ui.prefs b/maven/bnd-testing-maven-plugin/.settings/org.eclipse.jdt.ui.prefs index b67dd052ad..a21ff13162 100644 --- a/maven/bnd-testing-maven-plugin/.settings/org.eclipse.jdt.ui.prefs +++ b/maven/bnd-testing-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-testing-maven-plugin/src/main/java/aQute/bnd/maven/testing/plugin/TestingMojo.java b/maven/bnd-testing-maven-plugin/src/main/java/aQute/bnd/maven/testing/plugin/TestingMojo.java index bbecfffd91..2e20de1cf4 100644 --- a/maven/bnd-testing-maven-plugin/src/main/java/aQute/bnd/maven/testing/plugin/TestingMojo.java +++ b/maven/bnd-testing-maven-plugin/src/main/java/aQute/bnd/maven/testing/plugin/TestingMojo.java @@ -7,6 +7,16 @@ import java.util.Optional; import java.util.Set; +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.unmodifiable.Sets; +import aQute.lib.strings.Strings; +import aQute.libg.glob.Glob; +import biz.aQute.resolve.ResolveProcess; import org.apache.maven.execution.MavenSession; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; @@ -26,17 +36,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -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.unmodifiable.Sets; -import aQute.lib.strings.Strings; -import aQute.libg.glob.Glob; -import biz.aQute.resolve.ResolveProcess; - @Mojo(name = "testing", defaultPhase = LifecyclePhase.INTEGRATION_TEST, requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME, threadSafe = true) public class TestingMojo extends AbstractMojo { private static final Logger logger = LoggerFactory.getLogger(TestingMojo.class);