Merge pull request #6863 from chrisrueger/remove-leftover-p2-files

Some cleanup

Author: chrisrueger

biz.aQute.bndlib.tests/test/test/JarTest.java

@@ -15,7 +15,6 @@
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.lang.reflect.Method;
-import java.nio.charset.StandardCharsets;
 import java.text.Collator;
 import java.util.Locale;
 import java.util.jar.Attributes;

biz.aQute.bndlib/src/aQute/bnd/osgi/Jar.java

@@ -4,9 +4,6 @@
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.toList;
 
-import aQute.bnd.header.Attrs;
-import aQute.bnd.header.OSGiHeader;
-import aQute.bnd.header.Parameters;
 import java.io.Closeable;
 import java.io.DataInputStream;
 import java.io.File;
@@ -30,7 +27,6 @@
 import java.time.format.DateTimeParseException;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Comparator;
 import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.List;
@@ -62,6 +58,9 @@
 import java.util.zip.ZipOutputStream;
 
 import aQute.bnd.exceptions.Exceptions;
+import aQute.bnd.header.Attrs;
+import aQute.bnd.header.OSGiHeader;
+import aQute.bnd.header.Parameters;
 import aQute.bnd.stream.MapStream;
 import aQute.bnd.version.Version;
 import aQute.lib.base64.Base64;

biz.aQute.bndlib/src/aQute/bnd/osgi/ManifestResource.java

@@ -6,8 +6,6 @@
 import java.io.OutputStream;
 import java.util.jar.Manifest;
 
-import aQute.lib.manifest.ManifestUtil;
-
 /**
  * Bnd Resource for Manifest with correct support for writing the manifest to an
  * output stream.

maven-plugins/bnd-baseline-maven-plugin/src/main/java/aQute/bnd/maven/baseline/plugin/BaselineMojo.java

@@ -18,7 +18,6 @@
 import aQute.bnd.osgi.Instructions;
 import aQute.bnd.osgi.Jar;
 import aQute.bnd.osgi.Processor;
-import aQute.bnd.service.diff.Delta;
 import aQute.bnd.service.diff.Diff;
 import aQute.bnd.version.MavenVersion;
 import aQute.lib.io.IO;

org.bndtools.p2/bnd.bnd

@@ -1,10 +1,8 @@
 # Set javac settings from JDT prefs
 -include: ${workspace}/cnf/includes/jdt.bnd, ${workspace}/cnf/includes/bndtools.bnd
 
--fixupmessages: Eclipse: The Bundle
 Bundle-SymbolicName: org.bndtools.p2.dummy
-p2.version: ${base.version}.${first;${def;-snapshot;DEV};REL}
-timestamp: ${tstamp}
+-fixupmessages: The Bundle Symbolic org.bndtools.p2.dummy starts with the project name org.bndtools.p2 but then continues while it is not a sub-bundle
 
 # Plugins to be included in the Bndtools p2 update repository
 -dependson: \

org.bndtools.p2/features.bnd

@@ -5,10 +5,7 @@ Bundle-License:  \
         file="license.txt";\
         link="(ASL-2.0 or EPL-2.0)"
 
-
-Bundle-DocURL:          https://bnd.bndtools.org/
 Bundle-Vendor           bnd
-Bundle-Copyright:       Copyright bndtools
 
 features        = \
         bndtools.main.feature.bndrun, \