diff --git a/maven/bnd-baseline-maven-plugin/src/it/invalid-with-consumer/postbuild.groovy b/maven/bnd-baseline-maven-plugin/src/it/invalid-with-consumer/postbuild.groovy index c921722aeb..c3e49ce169 100644 --- a/maven/bnd-baseline-maven-plugin/src/it/invalid-with-consumer/postbuild.groovy +++ b/maven/bnd-baseline-maven-plugin/src/it/invalid-with-consumer/postbuild.groovy @@ -1,4 +1,3 @@ -import java.io.*; import java.util.regex.Pattern File build_log_file = new File("${basedir}/build.log") diff --git a/maven/bnd-baseline-maven-plugin/src/it/invalid-with-provider-require-bundle-version-change/postbuild.groovy b/maven/bnd-baseline-maven-plugin/src/it/invalid-with-provider-require-bundle-version-change/postbuild.groovy index d6af0b1e12..e3e6dec0b8 100644 --- a/maven/bnd-baseline-maven-plugin/src/it/invalid-with-provider-require-bundle-version-change/postbuild.groovy +++ b/maven/bnd-baseline-maven-plugin/src/it/invalid-with-provider-require-bundle-version-change/postbuild.groovy @@ -1,4 +1,3 @@ -import java.io.*; import java.util.regex.Pattern File build_log_file = new File("${basedir}/build.log") diff --git a/maven/bnd-baseline-maven-plugin/src/it/invalid-with-provider/postbuild.groovy b/maven/bnd-baseline-maven-plugin/src/it/invalid-with-provider/postbuild.groovy index 911f5f0325..95e191f0e2 100644 --- a/maven/bnd-baseline-maven-plugin/src/it/invalid-with-provider/postbuild.groovy +++ b/maven/bnd-baseline-maven-plugin/src/it/invalid-with-provider/postbuild.groovy @@ -1,4 +1,3 @@ -import java.io.*; import java.util.regex.Pattern File build_log_file = new File("${basedir}/build.log") diff --git a/maven/bnd-baseline-maven-plugin/src/it/valid-no-previous/postbuild.groovy b/maven/bnd-baseline-maven-plugin/src/it/valid-no-previous/postbuild.groovy index 10652c61ec..9ae253d253 100644 --- a/maven/bnd-baseline-maven-plugin/src/it/valid-no-previous/postbuild.groovy +++ b/maven/bnd-baseline-maven-plugin/src/it/valid-no-previous/postbuild.groovy @@ -1,4 +1,3 @@ -import java.io.*; import java.util.regex.Pattern File build_log_file = new File("${basedir}/build.log") diff --git a/maven/bnd-baseline-maven-plugin/src/it/valid-with-previous-same/postbuild.groovy b/maven/bnd-baseline-maven-plugin/src/it/valid-with-previous-same/postbuild.groovy index a055805f64..1f3fc2146d 100644 --- a/maven/bnd-baseline-maven-plugin/src/it/valid-with-previous-same/postbuild.groovy +++ b/maven/bnd-baseline-maven-plugin/src/it/valid-with-previous-same/postbuild.groovy @@ -1,4 +1,3 @@ -import java.io.*; import java.util.regex.Pattern File build_log_file = new File("${basedir}/build.log") diff --git a/maven/bnd-baseline-maven-plugin/src/it/valid-with-provider-no-bundle-version-change/postbuild.groovy b/maven/bnd-baseline-maven-plugin/src/it/valid-with-provider-no-bundle-version-change/postbuild.groovy index 2783e74ccd..e0a54295da 100644 --- a/maven/bnd-baseline-maven-plugin/src/it/valid-with-provider-no-bundle-version-change/postbuild.groovy +++ b/maven/bnd-baseline-maven-plugin/src/it/valid-with-provider-no-bundle-version-change/postbuild.groovy @@ -1,4 +1,3 @@ -import java.io.*; import java.util.regex.Pattern File build_log_file = new File("${basedir}/build.log") diff --git a/maven/bnd-baseline-maven-plugin/src/it/valid-with-provider/postbuild.groovy b/maven/bnd-baseline-maven-plugin/src/it/valid-with-provider/postbuild.groovy index 1fd33a73d8..8c26f443e6 100644 --- a/maven/bnd-baseline-maven-plugin/src/it/valid-with-provider/postbuild.groovy +++ b/maven/bnd-baseline-maven-plugin/src/it/valid-with-provider/postbuild.groovy @@ -1,4 +1,3 @@ -import java.io.*; import java.util.regex.Pattern File build_log_file = new File("${basedir}/build.log") diff --git a/maven/bnd-export-maven-plugin/src/it/export/postbuild.groovy b/maven/bnd-export-maven-plugin/src/it/export/postbuild.groovy index 562179af72..d8014780fb 100644 --- a/maven/bnd-export-maven-plugin/src/it/export/postbuild.groovy +++ b/maven/bnd-export-maven-plugin/src/it/export/postbuild.groovy @@ -1,10 +1,12 @@ -import aQute.bnd.build.*; -import aQute.bnd.build.model.*; -import aQute.bnd.osgi.*; -import aQute.bnd.properties.*; -import aQute.bnd.version.*; -import aQute.lib.io.*; -import java.util.jar.*; +import aQute.bnd.build.Workspace +import aQute.bnd.build.model.BndEditModel +import aQute.bnd.osgi.Processor +import aQute.bnd.properties.Document +import aQute.bnd.version.MavenVersion +import aQute.lib.io.IO + +import java.util.jar.Attributes +import java.util.jar.JarFile; def baseVersion = new MavenVersion(bndVersion).toReleaseVersion() diff --git a/maven/bnd-indexer-maven-plugin/src/it/add-mvn/postbuild.groovy b/maven/bnd-indexer-maven-plugin/src/it/add-mvn/postbuild.groovy index d940c58e11..d95fdfa10f 100644 --- a/maven/bnd-indexer-maven-plugin/src/it/add-mvn/postbuild.groovy +++ b/maven/bnd-indexer-maven-plugin/src/it/add-mvn/postbuild.groovy @@ -1,7 +1,11 @@ -import aQute.bnd.osgi.repository.*; -import aQute.bnd.osgi.resource.*; -import org.osgi.resource.*; -import org.osgi.service.repository.*; +import aQute.bnd.osgi.repository.ResourcesRepository +import aQute.bnd.osgi.repository.XMLResourceParser +import aQute.bnd.osgi.resource.RequirementBuilder +import aQute.bnd.osgi.resource.ResourceUtils +import org.osgi.resource.Capability +import org.osgi.resource.Requirement +import org.osgi.resource.Resource +import org.osgi.service.repository.Repository; public Repository check(String xmlFile, String gzipFile, int size, boolean localURL, boolean doCheck) { // Check the bundles exist! diff --git a/maven/bnd-indexer-maven-plugin/src/it/bad-remote-metadata/postbuild.groovy b/maven/bnd-indexer-maven-plugin/src/it/bad-remote-metadata/postbuild.groovy index 4d615a671e..45f884d85e 100644 --- a/maven/bnd-indexer-maven-plugin/src/it/bad-remote-metadata/postbuild.groovy +++ b/maven/bnd-indexer-maven-plugin/src/it/bad-remote-metadata/postbuild.groovy @@ -1,7 +1,11 @@ -import aQute.bnd.osgi.repository.*; -import aQute.bnd.osgi.resource.*; -import org.osgi.resource.*; -import org.osgi.service.repository.*; +import aQute.bnd.osgi.repository.ResourcesRepository +import aQute.bnd.osgi.repository.XMLResourceParser +import aQute.bnd.osgi.resource.RequirementBuilder +import aQute.bnd.osgi.resource.ResourceUtils +import org.osgi.resource.Capability +import org.osgi.resource.Requirement +import org.osgi.resource.Resource +import org.osgi.service.repository.Repository; public Repository check(String xmlFile, String gzipFile, int size, boolean localURL, boolean doCheck) { // Check the bundles exist! diff --git a/maven/bnd-indexer-maven-plugin/src/it/bad-remote-metadata/prebuild.groovy b/maven/bnd-indexer-maven-plugin/src/it/bad-remote-metadata/prebuild.groovy index 714194e94c..a4dbae3cbb 100644 --- a/maven/bnd-indexer-maven-plugin/src/it/bad-remote-metadata/prebuild.groovy +++ b/maven/bnd-indexer-maven-plugin/src/it/bad-remote-metadata/prebuild.groovy @@ -1,6 +1,8 @@ -import java.nio.file.*; import aQute.lib.io.IO +import java.nio.file.Files +import java.nio.file.Path +import java.nio.file.Paths; Path source = Paths.get("${projectsDirectory}/local-repo/org/objenesis"); Path target = Paths.get("${localRepositoryPath}/org/objenesis"); diff --git a/maven/bnd-indexer-maven-plugin/src/it/in-build/postbuild.groovy b/maven/bnd-indexer-maven-plugin/src/it/in-build/postbuild.groovy index 2eb5aca8db..47dfdab707 100644 --- a/maven/bnd-indexer-maven-plugin/src/it/in-build/postbuild.groovy +++ b/maven/bnd-indexer-maven-plugin/src/it/in-build/postbuild.groovy @@ -1,7 +1,11 @@ -import aQute.bnd.osgi.repository.*; -import aQute.bnd.osgi.resource.*; -import org.osgi.resource.*; -import org.osgi.service.repository.*; +import aQute.bnd.osgi.repository.ResourcesRepository +import aQute.bnd.osgi.repository.XMLResourceParser +import aQute.bnd.osgi.resource.RequirementBuilder +import aQute.bnd.osgi.resource.ResourceUtils +import org.osgi.resource.Capability +import org.osgi.resource.Requirement +import org.osgi.resource.Resource +import org.osgi.service.repository.Repository; public Repository check(String xmlFile, String gzipFile, int size, boolean localURL, boolean doCheck) { // Check the bundles exist! diff --git a/maven/bnd-indexer-maven-plugin/src/it/include-jar/postbuild.groovy b/maven/bnd-indexer-maven-plugin/src/it/include-jar/postbuild.groovy index 8012b5e548..227f7be0f9 100644 --- a/maven/bnd-indexer-maven-plugin/src/it/include-jar/postbuild.groovy +++ b/maven/bnd-indexer-maven-plugin/src/it/include-jar/postbuild.groovy @@ -1,7 +1,11 @@ -import aQute.bnd.osgi.repository.*; -import aQute.bnd.osgi.resource.*; -import org.osgi.resource.*; -import org.osgi.service.repository.*; +import aQute.bnd.osgi.repository.ResourcesRepository +import aQute.bnd.osgi.repository.XMLResourceParser +import aQute.bnd.osgi.resource.RequirementBuilder +import aQute.bnd.osgi.resource.ResourceUtils +import org.osgi.resource.Capability +import org.osgi.resource.Requirement +import org.osgi.resource.Resource +import org.osgi.service.repository.Repository; public Repository check(String xmlFile, String gzipFile, int size, boolean localURL, boolean doCheck) { // Check the bundles exist! diff --git a/maven/bnd-indexer-maven-plugin/src/it/index-deployment-repo-no-dist-mgmt/postbuild.groovy b/maven/bnd-indexer-maven-plugin/src/it/index-deployment-repo-no-dist-mgmt/postbuild.groovy index b2e1dfc71a..c1eed605fc 100644 --- a/maven/bnd-indexer-maven-plugin/src/it/index-deployment-repo-no-dist-mgmt/postbuild.groovy +++ b/maven/bnd-indexer-maven-plugin/src/it/index-deployment-repo-no-dist-mgmt/postbuild.groovy @@ -1,7 +1,11 @@ -import aQute.bnd.osgi.repository.*; -import aQute.bnd.osgi.resource.*; -import org.osgi.resource.*; -import org.osgi.service.repository.*; +import aQute.bnd.osgi.repository.ResourcesRepository +import aQute.bnd.osgi.repository.XMLResourceParser +import aQute.bnd.osgi.resource.RequirementBuilder +import aQute.bnd.osgi.resource.ResourceUtils +import org.osgi.resource.Capability +import org.osgi.resource.Requirement +import org.osgi.resource.Resource +import org.osgi.service.repository.Repository; public Repository check(String xmlFile, String gzipFile, int size, boolean localURL, boolean doCheck) { // Check the bundles exist! diff --git a/maven/bnd-indexer-maven-plugin/src/it/index-deployment-repo/postbuild.groovy b/maven/bnd-indexer-maven-plugin/src/it/index-deployment-repo/postbuild.groovy index 737503d249..ac78441b44 100644 --- a/maven/bnd-indexer-maven-plugin/src/it/index-deployment-repo/postbuild.groovy +++ b/maven/bnd-indexer-maven-plugin/src/it/index-deployment-repo/postbuild.groovy @@ -1,7 +1,11 @@ -import aQute.bnd.osgi.repository.*; -import aQute.bnd.osgi.resource.*; -import org.osgi.resource.*; -import org.osgi.service.repository.*; +import aQute.bnd.osgi.repository.ResourcesRepository +import aQute.bnd.osgi.repository.XMLResourceParser +import aQute.bnd.osgi.resource.RequirementBuilder +import aQute.bnd.osgi.resource.ResourceUtils +import org.osgi.resource.Capability +import org.osgi.resource.Requirement +import org.osgi.resource.Resource +import org.osgi.service.repository.Repository; public Repository check(String xmlFile, String gzipFile, int size, boolean localURL, boolean doCheck) { // Check the bundles exist! diff --git a/maven/bnd-indexer-maven-plugin/src/it/index-folder-includes-excludes/postbuild.groovy b/maven/bnd-indexer-maven-plugin/src/it/index-folder-includes-excludes/postbuild.groovy index b0e3cf39e4..ca5efb65cd 100644 --- a/maven/bnd-indexer-maven-plugin/src/it/index-folder-includes-excludes/postbuild.groovy +++ b/maven/bnd-indexer-maven-plugin/src/it/index-folder-includes-excludes/postbuild.groovy @@ -1,7 +1,11 @@ -import aQute.bnd.osgi.repository.*; -import aQute.bnd.osgi.resource.*; -import org.osgi.resource.*; -import org.osgi.service.repository.*; +import aQute.bnd.osgi.repository.ResourcesRepository +import aQute.bnd.osgi.repository.XMLResourceParser +import aQute.bnd.osgi.resource.RequirementBuilder +import aQute.bnd.osgi.resource.ResourceUtils +import org.osgi.resource.Capability +import org.osgi.resource.Requirement +import org.osgi.resource.Resource +import org.osgi.service.repository.Repository; public Repository check(String xmlFile, String gzipFile, int size, boolean localURL, boolean doCheck) { // Check the bundles exist! diff --git a/maven/bnd-indexer-maven-plugin/src/it/index-folder/postbuild.groovy b/maven/bnd-indexer-maven-plugin/src/it/index-folder/postbuild.groovy index 6f9fa3e8e0..8047015402 100644 --- a/maven/bnd-indexer-maven-plugin/src/it/index-folder/postbuild.groovy +++ b/maven/bnd-indexer-maven-plugin/src/it/index-folder/postbuild.groovy @@ -1,7 +1,11 @@ -import aQute.bnd.osgi.repository.*; -import aQute.bnd.osgi.resource.*; -import org.osgi.resource.*; -import org.osgi.service.repository.*; +import aQute.bnd.osgi.repository.ResourcesRepository +import aQute.bnd.osgi.repository.XMLResourceParser +import aQute.bnd.osgi.resource.RequirementBuilder +import aQute.bnd.osgi.resource.ResourceUtils +import org.osgi.resource.Capability +import org.osgi.resource.Requirement +import org.osgi.resource.Resource +import org.osgi.service.repository.Repository; public Repository check(String xmlFile, String gzipFile, int size, boolean localURL, boolean doCheck) { // Check the bundles exist! diff --git a/maven/bnd-indexer-maven-plugin/src/it/local-repo-dependency/postbuild.groovy b/maven/bnd-indexer-maven-plugin/src/it/local-repo-dependency/postbuild.groovy index eb95d1a2ae..7944f3a7af 100644 --- a/maven/bnd-indexer-maven-plugin/src/it/local-repo-dependency/postbuild.groovy +++ b/maven/bnd-indexer-maven-plugin/src/it/local-repo-dependency/postbuild.groovy @@ -1,7 +1,11 @@ -import aQute.bnd.osgi.repository.*; -import aQute.bnd.osgi.resource.*; -import org.osgi.resource.*; -import org.osgi.service.repository.*; +import aQute.bnd.osgi.repository.ResourcesRepository +import aQute.bnd.osgi.repository.XMLResourceParser +import aQute.bnd.osgi.resource.RequirementBuilder +import aQute.bnd.osgi.resource.ResourceUtils +import org.osgi.resource.Capability +import org.osgi.resource.Requirement +import org.osgi.resource.Resource +import org.osgi.service.repository.Repository; public Repository check(String xmlFile, String gzipFile, int size, boolean localURL, boolean doCheck) { // Check the bundles exist! diff --git a/maven/bnd-indexer-maven-plugin/src/it/non-transitive/postbuild.groovy b/maven/bnd-indexer-maven-plugin/src/it/non-transitive/postbuild.groovy index 211c596410..5db126b513 100644 --- a/maven/bnd-indexer-maven-plugin/src/it/non-transitive/postbuild.groovy +++ b/maven/bnd-indexer-maven-plugin/src/it/non-transitive/postbuild.groovy @@ -1,7 +1,11 @@ -import aQute.bnd.osgi.repository.*; -import aQute.bnd.osgi.resource.*; -import org.osgi.resource.*; -import org.osgi.service.repository.*; +import aQute.bnd.osgi.repository.ResourcesRepository +import aQute.bnd.osgi.repository.XMLResourceParser +import aQute.bnd.osgi.resource.RequirementBuilder +import aQute.bnd.osgi.resource.ResourceUtils +import org.osgi.resource.Capability +import org.osgi.resource.Requirement +import org.osgi.resource.Resource +import org.osgi.service.repository.Repository; public Repository check(String xmlFile, String gzipFile, int size, boolean localURL, boolean doCheck) { // Check the bundles exist! diff --git a/maven/bnd-indexer-maven-plugin/src/it/rename-output/postbuild.groovy b/maven/bnd-indexer-maven-plugin/src/it/rename-output/postbuild.groovy index 2b920095eb..c602f49184 100644 --- a/maven/bnd-indexer-maven-plugin/src/it/rename-output/postbuild.groovy +++ b/maven/bnd-indexer-maven-plugin/src/it/rename-output/postbuild.groovy @@ -1,7 +1,11 @@ -import aQute.bnd.osgi.repository.*; -import aQute.bnd.osgi.resource.*; -import org.osgi.resource.*; -import org.osgi.service.repository.*; +import aQute.bnd.osgi.repository.ResourcesRepository +import aQute.bnd.osgi.repository.XMLResourceParser +import aQute.bnd.osgi.resource.RequirementBuilder +import aQute.bnd.osgi.resource.ResourceUtils +import org.osgi.resource.Capability +import org.osgi.resource.Requirement +import org.osgi.resource.Resource +import org.osgi.service.repository.Repository; public Repository check(String xmlFile, String gzipFile, int size, boolean localURL, boolean doCheck) { // Check the bundles exist! diff --git a/maven/bnd-indexer-maven-plugin/src/it/require-local/postbuild.groovy b/maven/bnd-indexer-maven-plugin/src/it/require-local/postbuild.groovy index 365676b5e2..9c46684452 100644 --- a/maven/bnd-indexer-maven-plugin/src/it/require-local/postbuild.groovy +++ b/maven/bnd-indexer-maven-plugin/src/it/require-local/postbuild.groovy @@ -1,7 +1,11 @@ -import aQute.bnd.osgi.repository.*; -import aQute.bnd.osgi.resource.*; -import org.osgi.resource.*; -import org.osgi.service.repository.*; +import aQute.bnd.osgi.repository.ResourcesRepository +import aQute.bnd.osgi.repository.XMLResourceParser +import aQute.bnd.osgi.resource.RequirementBuilder +import aQute.bnd.osgi.resource.ResourceUtils +import org.osgi.resource.Capability +import org.osgi.resource.Requirement +import org.osgi.resource.Resource +import org.osgi.service.repository.Repository; public Repository check(String xmlFile, String gzipFile, int size, boolean localURL, boolean doCheck) { // Check the bundles exist! diff --git a/maven/bnd-indexer-maven-plugin/src/it/scoped/postbuild.groovy b/maven/bnd-indexer-maven-plugin/src/it/scoped/postbuild.groovy index a7059c3233..d04dcf1380 100644 --- a/maven/bnd-indexer-maven-plugin/src/it/scoped/postbuild.groovy +++ b/maven/bnd-indexer-maven-plugin/src/it/scoped/postbuild.groovy @@ -1,7 +1,11 @@ -import aQute.bnd.osgi.repository.*; -import aQute.bnd.osgi.resource.*; -import org.osgi.resource.*; -import org.osgi.service.repository.*; +import aQute.bnd.osgi.repository.ResourcesRepository +import aQute.bnd.osgi.repository.XMLResourceParser +import aQute.bnd.osgi.resource.RequirementBuilder +import aQute.bnd.osgi.resource.ResourceUtils +import org.osgi.resource.Capability +import org.osgi.resource.Requirement +import org.osgi.resource.Resource +import org.osgi.service.repository.Repository; public Repository check(String xmlFile, String gzipFile, int size, boolean localURL, boolean doCheck) { // Check the bundles exist! diff --git a/maven/bnd-indexer-maven-plugin/src/it/transitive/postbuild.groovy b/maven/bnd-indexer-maven-plugin/src/it/transitive/postbuild.groovy index 447e0676de..99668b2cfe 100644 --- a/maven/bnd-indexer-maven-plugin/src/it/transitive/postbuild.groovy +++ b/maven/bnd-indexer-maven-plugin/src/it/transitive/postbuild.groovy @@ -1,7 +1,11 @@ -import aQute.bnd.osgi.repository.*; -import aQute.bnd.osgi.resource.*; -import org.osgi.resource.*; -import org.osgi.service.repository.*; +import aQute.bnd.osgi.repository.ResourcesRepository +import aQute.bnd.osgi.repository.XMLResourceParser +import aQute.bnd.osgi.resource.RequirementBuilder +import aQute.bnd.osgi.resource.ResourceUtils +import org.osgi.resource.Capability +import org.osgi.resource.Requirement +import org.osgi.resource.Resource +import org.osgi.service.repository.Repository; public Repository check(String xmlFile, String gzipFile, int size, boolean localURL, boolean doCheck) { // Check the bundles exist! diff --git a/maven/bnd-maven-plugin/src/it/jar-test-api-bundle/postbuild.groovy b/maven/bnd-maven-plugin/src/it/jar-test-api-bundle/postbuild.groovy index aa20e11ae5..0e9c081dde 100644 --- a/maven/bnd-maven-plugin/src/it/jar-test-api-bundle/postbuild.groovy +++ b/maven/bnd-maven-plugin/src/it/jar-test-api-bundle/postbuild.groovy @@ -1,6 +1,7 @@ -import java.util.jar.*; import groovy.xml.XmlSlurper +import java.util.jar.Attributes +import java.util.jar.JarFile def bsn = 'jar-test-api-bundle' def version = '0.0.1' diff --git a/maven/bnd-maven-plugin/src/it/jar-test-bnd-process-skipIfEmpty/postbuild.groovy b/maven/bnd-maven-plugin/src/it/jar-test-bnd-process-skipIfEmpty/postbuild.groovy index 20756e1669..db6ab9e3c8 100644 --- a/maven/bnd-maven-plugin/src/it/jar-test-bnd-process-skipIfEmpty/postbuild.groovy +++ b/maven/bnd-maven-plugin/src/it/jar-test-bnd-process-skipIfEmpty/postbuild.groovy @@ -1,5 +1,3 @@ -import java.util.jar.*; - def bsn = 'jar-test-bnd-process-skipIfEmpty' // Check the bundles exist! diff --git a/maven/bnd-maven-plugin/src/it/jar-test-bnd-process-tests-goal-fragment/postbuild.groovy b/maven/bnd-maven-plugin/src/it/jar-test-bnd-process-tests-goal-fragment/postbuild.groovy index be7d44f3a4..c21b556bc4 100644 --- a/maven/bnd-maven-plugin/src/it/jar-test-bnd-process-tests-goal-fragment/postbuild.groovy +++ b/maven/bnd-maven-plugin/src/it/jar-test-bnd-process-tests-goal-fragment/postbuild.groovy @@ -1,6 +1,7 @@ -import java.util.jar.*; import groovy.xml.XmlSlurper +import java.util.jar.Attributes +import java.util.jar.JarFile def bsn = 'jar-test-bnd-process-tests-goal-fragment' def version = '0.0.1-SNAPSHOT' diff --git a/maven/bnd-maven-plugin/src/it/jar-test-bnd-process-tests-goal/postbuild.groovy b/maven/bnd-maven-plugin/src/it/jar-test-bnd-process-tests-goal/postbuild.groovy index 28e9ef843f..7486dd2b57 100644 --- a/maven/bnd-maven-plugin/src/it/jar-test-bnd-process-tests-goal/postbuild.groovy +++ b/maven/bnd-maven-plugin/src/it/jar-test-bnd-process-tests-goal/postbuild.groovy @@ -1,6 +1,7 @@ -import java.util.jar.*; import groovy.xml.XmlSlurper +import java.util.jar.Attributes +import java.util.jar.JarFile def bsn = 'jar-test-bnd-process-tests-goal' def version = '0.0.1-SNAPSHOT' diff --git a/maven/bnd-maven-plugin/src/it/jar-test-bnd-process-tests-skipIfEmpty/postbuild.groovy b/maven/bnd-maven-plugin/src/it/jar-test-bnd-process-tests-skipIfEmpty/postbuild.groovy index 1f2cebe995..2441c7b8f5 100644 --- a/maven/bnd-maven-plugin/src/it/jar-test-bnd-process-tests-skipIfEmpty/postbuild.groovy +++ b/maven/bnd-maven-plugin/src/it/jar-test-bnd-process-tests-skipIfEmpty/postbuild.groovy @@ -1,6 +1,6 @@ -import java.util.jar.*; import groovy.xml.XmlSlurper +import java.util.jar.JarFile def bsn = 'jar-test-bnd-process-tests-skipIfEmpty' def version = '0.0.1' diff --git a/maven/bnd-maven-plugin/src/it/jar-test-impl-bundle/postbuild.groovy b/maven/bnd-maven-plugin/src/it/jar-test-impl-bundle/postbuild.groovy index d66b9ab8db..d82688a02d 100644 --- a/maven/bnd-maven-plugin/src/it/jar-test-impl-bundle/postbuild.groovy +++ b/maven/bnd-maven-plugin/src/it/jar-test-impl-bundle/postbuild.groovy @@ -1,8 +1,11 @@ -import java.time.*; -import java.time.format.*; -import java.util.jar.*; import groovy.xml.XmlSlurper +import java.time.Instant +import java.time.ZoneId +import java.time.ZonedDateTime +import java.time.format.DateTimeFormatter +import java.util.jar.JarEntry +import java.util.jar.JarFile def bsn = 'jar-test-impl-bundle' def version = '0.0.1-SNAPSHOT' diff --git a/maven/bnd-maven-plugin/src/it/jar-test-in-build-pluginManagement-inheritance/postbuild.groovy b/maven/bnd-maven-plugin/src/it/jar-test-in-build-pluginManagement-inheritance/postbuild.groovy index 42ef82359e..870f71e617 100644 --- a/maven/bnd-maven-plugin/src/it/jar-test-in-build-pluginManagement-inheritance/postbuild.groovy +++ b/maven/bnd-maven-plugin/src/it/jar-test-in-build-pluginManagement-inheritance/postbuild.groovy @@ -1,6 +1,7 @@ -import java.util.jar.*; import groovy.xml.XmlSlurper +import java.util.jar.Attributes +import java.util.jar.JarFile def bsn = 'jar-test-inheriting-api-bundle' def version = '0.0.1' diff --git a/maven/bnd-maven-plugin/src/it/jar-test-war-bundle/postbuild.groovy b/maven/bnd-maven-plugin/src/it/jar-test-war-bundle/postbuild.groovy index ccd3256a0b..fb91ff4847 100644 --- a/maven/bnd-maven-plugin/src/it/jar-test-war-bundle/postbuild.groovy +++ b/maven/bnd-maven-plugin/src/it/jar-test-war-bundle/postbuild.groovy @@ -1,6 +1,7 @@ -import java.util.jar.*; import groovy.xml.XmlSlurper +import java.util.jar.Attributes +import java.util.jar.JarFile def bsn = 'jar-test-war-bundle' def version = '0.0.1-SNAPSHOT' diff --git a/maven/bnd-maven-plugin/src/it/jar-test-wrapper-bundle/postbuild.groovy b/maven/bnd-maven-plugin/src/it/jar-test-wrapper-bundle/postbuild.groovy index a775b4ba47..6e439bed13 100644 --- a/maven/bnd-maven-plugin/src/it/jar-test-wrapper-bundle/postbuild.groovy +++ b/maven/bnd-maven-plugin/src/it/jar-test-wrapper-bundle/postbuild.groovy @@ -1,8 +1,12 @@ -import java.time.*; -import java.time.format.*; -import java.util.jar.*; import groovy.xml.XmlSlurper +import java.time.Instant +import java.time.ZoneId +import java.time.ZonedDateTime +import java.time.format.DateTimeFormatter +import java.util.jar.Attributes +import java.util.jar.JarEntry +import java.util.jar.JarFile def bsn = 'test.wrapper.bundle' def moduleDir = 'jar-test-wrapper-bundle' diff --git a/maven/bnd-maven-plugin/src/it/test-api-bundle/postbuild.groovy b/maven/bnd-maven-plugin/src/it/test-api-bundle/postbuild.groovy index 8d2b4c872a..69f694d0a0 100644 --- a/maven/bnd-maven-plugin/src/it/test-api-bundle/postbuild.groovy +++ b/maven/bnd-maven-plugin/src/it/test-api-bundle/postbuild.groovy @@ -1,4 +1,5 @@ -import java.util.jar.*; +import java.util.jar.Attributes +import java.util.jar.JarFile; // Check the bundles exist! File api_bundle = new File(basedir, 'target/test-api-bundle-0.0.1.jar') diff --git a/maven/bnd-maven-plugin/src/it/test-bnd-process-tests-goal-fragment/postbuild.groovy b/maven/bnd-maven-plugin/src/it/test-bnd-process-tests-goal-fragment/postbuild.groovy index 01692d73d5..88db45f6b7 100644 --- a/maven/bnd-maven-plugin/src/it/test-bnd-process-tests-goal-fragment/postbuild.groovy +++ b/maven/bnd-maven-plugin/src/it/test-bnd-process-tests-goal-fragment/postbuild.groovy @@ -1,4 +1,5 @@ -import java.util.jar.*; +import java.util.jar.Attributes +import java.util.jar.JarFile; // Check the bundles exist! File tests_test_bundle_fragment = new File(basedir, 'target/test-bnd-process-tests-goal-fragment-0.0.1-SNAPSHOT-tests.jar') diff --git a/maven/bnd-maven-plugin/src/it/test-bnd-process-tests-goal/postbuild.groovy b/maven/bnd-maven-plugin/src/it/test-bnd-process-tests-goal/postbuild.groovy index a5bdff1c4e..5eca60a317 100644 --- a/maven/bnd-maven-plugin/src/it/test-bnd-process-tests-goal/postbuild.groovy +++ b/maven/bnd-maven-plugin/src/it/test-bnd-process-tests-goal/postbuild.groovy @@ -1,4 +1,5 @@ -import java.util.jar.*; +import java.util.jar.Attributes +import java.util.jar.JarFile; // Check the bundles exist! File tests_main_bundle = new File(basedir, 'target/test-bnd-process-tests-goal-0.0.1-SNAPSHOT.jar') diff --git a/maven/bnd-maven-plugin/src/it/test-bnd-process-tests-skipIfEmpty/postbuild.groovy b/maven/bnd-maven-plugin/src/it/test-bnd-process-tests-skipIfEmpty/postbuild.groovy index 1bc0a45150..046784b3e3 100644 --- a/maven/bnd-maven-plugin/src/it/test-bnd-process-tests-skipIfEmpty/postbuild.groovy +++ b/maven/bnd-maven-plugin/src/it/test-bnd-process-tests-skipIfEmpty/postbuild.groovy @@ -1,5 +1,3 @@ -import java.util.jar.*; - // Check the bundles exist! File test_bnd_process_tests_skipIfEmpty = new File(basedir, 'target/test-bnd-process-tests-skipIfEmpty-0.0.1.jar') assert !test_bnd_process_tests_skipIfEmpty.exists() diff --git a/maven/bnd-maven-plugin/src/it/test-impl-bundle/postbuild.groovy b/maven/bnd-maven-plugin/src/it/test-impl-bundle/postbuild.groovy index 61eeee1164..261cb4983a 100644 --- a/maven/bnd-maven-plugin/src/it/test-impl-bundle/postbuild.groovy +++ b/maven/bnd-maven-plugin/src/it/test-impl-bundle/postbuild.groovy @@ -1,4 +1,5 @@ -import java.util.jar.*; +import java.util.jar.Attributes +import java.util.jar.JarFile; // Check the bundles exist! File impl_bundle = new File(basedir, 'target/test-impl-bundle-0.0.1-SNAPSHOT.jar') diff --git a/maven/bnd-maven-plugin/src/it/test-in-build-pluginManagement-inheritance/postbuild.groovy b/maven/bnd-maven-plugin/src/it/test-in-build-pluginManagement-inheritance/postbuild.groovy index 72dac5c1b9..9ab5a04a5a 100644 --- a/maven/bnd-maven-plugin/src/it/test-in-build-pluginManagement-inheritance/postbuild.groovy +++ b/maven/bnd-maven-plugin/src/it/test-in-build-pluginManagement-inheritance/postbuild.groovy @@ -1,4 +1,5 @@ -import java.util.jar.*; +import java.util.jar.Attributes +import java.util.jar.JarFile; // Check the bundles exist! File in_build_pluginManagement_api_bundle = new File(basedir, 'test-inheriting-api-bundle/target/test-inheriting-api-bundle-0.0.1.jar') diff --git a/maven/bnd-maven-plugin/src/it/test-war-bundle/postbuild.groovy b/maven/bnd-maven-plugin/src/it/test-war-bundle/postbuild.groovy index 79d588ed45..eac3303a6b 100644 --- a/maven/bnd-maven-plugin/src/it/test-war-bundle/postbuild.groovy +++ b/maven/bnd-maven-plugin/src/it/test-war-bundle/postbuild.groovy @@ -1,4 +1,5 @@ -import java.util.jar.*; +import java.util.jar.Attributes +import java.util.jar.JarFile; // Check the bundles exist! File war_bundle = new File(basedir, 'target/test-war-bundle-0.0.1-SNAPSHOT.war') diff --git a/maven/bnd-maven-plugin/src/it/test-wrapper-bundle/postbuild.groovy b/maven/bnd-maven-plugin/src/it/test-wrapper-bundle/postbuild.groovy index acb877b7d8..c68adef719 100644 --- a/maven/bnd-maven-plugin/src/it/test-wrapper-bundle/postbuild.groovy +++ b/maven/bnd-maven-plugin/src/it/test-wrapper-bundle/postbuild.groovy @@ -1,4 +1,5 @@ -import java.util.jar.*; +import java.util.jar.Attributes +import java.util.jar.JarFile; // Check the bundles exist! File wrapper_bundle = new File(basedir, 'target/test-wrapper-bundle-0.0.1-BUILD-SNAPSHOT.jar') diff --git a/maven/bnd-resolver-maven-plugin/src/it/resolve-from-defaults/postbuild.groovy b/maven/bnd-resolver-maven-plugin/src/it/resolve-from-defaults/postbuild.groovy index a7674668dc..e4e5cb64cd 100644 --- a/maven/bnd-resolver-maven-plugin/src/it/resolve-from-defaults/postbuild.groovy +++ b/maven/bnd-resolver-maven-plugin/src/it/resolve-from-defaults/postbuild.groovy @@ -1,8 +1,8 @@ -import aQute.bnd.build.*; -import aQute.bnd.build.model.*; -import aQute.bnd.osgi.*; -import aQute.bnd.properties.*; -import aQute.lib.io.*; +import aQute.bnd.build.Workspace +import aQute.bnd.build.model.BndEditModel +import aQute.bnd.osgi.Processor +import aQute.bnd.properties.Document +import aQute.lib.io.IO; // The resolve-from-defaults case diff --git a/maven/bnd-resolver-maven-plugin/src/it/resolve-from-dependencies/postbuild.groovy b/maven/bnd-resolver-maven-plugin/src/it/resolve-from-dependencies/postbuild.groovy index 007d7c768a..45618daa71 100644 --- a/maven/bnd-resolver-maven-plugin/src/it/resolve-from-dependencies/postbuild.groovy +++ b/maven/bnd-resolver-maven-plugin/src/it/resolve-from-dependencies/postbuild.groovy @@ -1,8 +1,8 @@ -import aQute.bnd.build.*; -import aQute.bnd.build.model.*; -import aQute.bnd.osgi.*; -import aQute.bnd.properties.*; -import aQute.lib.io.*; +import aQute.bnd.build.Workspace +import aQute.bnd.build.model.BndEditModel +import aQute.bnd.osgi.Processor +import aQute.bnd.properties.Document +import aQute.lib.io.IO; // The resolve-from-dependencies case diff --git a/maven/bnd-resolver-maven-plugin/src/it/resolve-from-dependencyManagement/postbuild.groovy b/maven/bnd-resolver-maven-plugin/src/it/resolve-from-dependencyManagement/postbuild.groovy index 7f999a44c2..04ff12c0db 100644 --- a/maven/bnd-resolver-maven-plugin/src/it/resolve-from-dependencyManagement/postbuild.groovy +++ b/maven/bnd-resolver-maven-plugin/src/it/resolve-from-dependencyManagement/postbuild.groovy @@ -1,8 +1,8 @@ -import aQute.bnd.build.*; -import aQute.bnd.build.model.*; -import aQute.bnd.osgi.*; -import aQute.bnd.properties.*; -import aQute.lib.io.*; +import aQute.bnd.build.Workspace +import aQute.bnd.build.model.BndEditModel +import aQute.bnd.osgi.Processor +import aQute.bnd.properties.Document +import aQute.lib.io.IO; // Check the bndrun file exist! File bndrunFile = new File(basedir, 'test.bndrun') diff --git a/maven/bnd-resolver-maven-plugin/src/it/resolve-from-inputbundles/postbuild.groovy b/maven/bnd-resolver-maven-plugin/src/it/resolve-from-inputbundles/postbuild.groovy index 5e6e0fdbb6..276233d0d5 100644 --- a/maven/bnd-resolver-maven-plugin/src/it/resolve-from-inputbundles/postbuild.groovy +++ b/maven/bnd-resolver-maven-plugin/src/it/resolve-from-inputbundles/postbuild.groovy @@ -1,8 +1,8 @@ -import aQute.bnd.build.*; -import aQute.bnd.build.model.*; -import aQute.bnd.osgi.*; -import aQute.bnd.properties.*; -import aQute.lib.io.*; +import aQute.bnd.build.Workspace +import aQute.bnd.build.model.BndEditModel +import aQute.bnd.osgi.Processor +import aQute.bnd.properties.Document +import aQute.lib.io.IO; // The resolve-from-inputbundles case diff --git a/maven/bnd-resolver-maven-plugin/src/it/resolve-from-scopes/postbuild.groovy b/maven/bnd-resolver-maven-plugin/src/it/resolve-from-scopes/postbuild.groovy index 4a8a46ce08..6361337b01 100644 --- a/maven/bnd-resolver-maven-plugin/src/it/resolve-from-scopes/postbuild.groovy +++ b/maven/bnd-resolver-maven-plugin/src/it/resolve-from-scopes/postbuild.groovy @@ -1,8 +1,8 @@ -import aQute.bnd.build.*; -import aQute.bnd.build.model.*; -import aQute.bnd.osgi.*; -import aQute.bnd.properties.*; -import aQute.lib.io.*; +import aQute.bnd.build.Workspace +import aQute.bnd.build.model.BndEditModel +import aQute.bnd.osgi.Processor +import aQute.bnd.properties.Document +import aQute.lib.io.IO; // Check the bndrun file exist! File bndrunFile = new File(basedir, 'test.bndrun') diff --git a/maven/bnd-resolver-maven-plugin/src/it/resolve-infer-with-custom-bsn/postbuild.groovy b/maven/bnd-resolver-maven-plugin/src/it/resolve-infer-with-custom-bsn/postbuild.groovy index ff304e504c..5a58b1a697 100644 --- a/maven/bnd-resolver-maven-plugin/src/it/resolve-infer-with-custom-bsn/postbuild.groovy +++ b/maven/bnd-resolver-maven-plugin/src/it/resolve-infer-with-custom-bsn/postbuild.groovy @@ -1,8 +1,8 @@ -import aQute.bnd.build.*; -import aQute.bnd.build.model.*; -import aQute.bnd.osgi.*; -import aQute.bnd.properties.*; -import aQute.lib.io.*; +import aQute.bnd.build.Workspace +import aQute.bnd.build.model.BndEditModel +import aQute.bnd.osgi.Processor +import aQute.bnd.properties.Document +import aQute.lib.io.IO; // The resolve-infer-with-custom-bsn case diff --git a/maven/bnd-resolver-maven-plugin/src/it/resolve-with-project-props/postbuild.groovy b/maven/bnd-resolver-maven-plugin/src/it/resolve-with-project-props/postbuild.groovy index 45c17095b5..0c2f468354 100644 --- a/maven/bnd-resolver-maven-plugin/src/it/resolve-with-project-props/postbuild.groovy +++ b/maven/bnd-resolver-maven-plugin/src/it/resolve-with-project-props/postbuild.groovy @@ -1,8 +1,8 @@ -import aQute.bnd.build.*; -import aQute.bnd.build.model.*; -import aQute.bnd.osgi.*; -import aQute.bnd.properties.*; -import aQute.lib.io.*; +import aQute.bnd.build.Workspace +import aQute.bnd.build.model.BndEditModel +import aQute.bnd.osgi.Processor +import aQute.bnd.properties.Document +import aQute.lib.io.IO; // The resolve-infer-with-custom-bsn case diff --git a/maven/bnd-resolver-maven-plugin/src/it/resolve/postbuild.groovy b/maven/bnd-resolver-maven-plugin/src/it/resolve/postbuild.groovy index 104b45d29b..5a3a3ed450 100644 --- a/maven/bnd-resolver-maven-plugin/src/it/resolve/postbuild.groovy +++ b/maven/bnd-resolver-maven-plugin/src/it/resolve/postbuild.groovy @@ -1,8 +1,8 @@ -import aQute.bnd.build.*; -import aQute.bnd.build.model.*; -import aQute.bnd.osgi.*; -import aQute.bnd.properties.*; -import aQute.lib.io.*; +import aQute.bnd.build.Workspace +import aQute.bnd.build.model.BndEditModel +import aQute.bnd.osgi.Processor +import aQute.bnd.properties.Document +import aQute.lib.io.IO; // Check the bndrun file exist! File bndrunFile = new File(basedir, 'test.bndrun') diff --git a/maven/bnd-testing-maven-plugin/src/it/test-with-resolve-from-dependencies/postbuild.groovy b/maven/bnd-testing-maven-plugin/src/it/test-with-resolve-from-dependencies/postbuild.groovy index 9f04c365ae..7cacba96c5 100644 --- a/maven/bnd-testing-maven-plugin/src/it/test-with-resolve-from-dependencies/postbuild.groovy +++ b/maven/bnd-testing-maven-plugin/src/it/test-with-resolve-from-dependencies/postbuild.groovy @@ -1,8 +1,8 @@ -import aQute.bnd.build.*; -import aQute.bnd.build.model.*; -import aQute.bnd.osgi.*; -import aQute.bnd.properties.*; -import aQute.lib.io.*; +import aQute.bnd.build.Workspace +import aQute.bnd.build.model.BndEditModel +import aQute.bnd.osgi.Processor +import aQute.bnd.properties.Document +import aQute.lib.io.IO import groovy.xml.XmlSlurper // Check the bndrun file exist! diff --git a/maven/bnd-testing-maven-plugin/src/it/test-with-resolve/postbuild.groovy b/maven/bnd-testing-maven-plugin/src/it/test-with-resolve/postbuild.groovy index ec93c9babd..5cff61190b 100644 --- a/maven/bnd-testing-maven-plugin/src/it/test-with-resolve/postbuild.groovy +++ b/maven/bnd-testing-maven-plugin/src/it/test-with-resolve/postbuild.groovy @@ -1,8 +1,8 @@ -import aQute.bnd.build.*; -import aQute.bnd.build.model.*; -import aQute.bnd.osgi.*; -import aQute.bnd.properties.*; -import aQute.lib.io.*; +import aQute.bnd.build.Workspace +import aQute.bnd.build.model.BndEditModel +import aQute.bnd.osgi.Processor +import aQute.bnd.properties.Document +import aQute.lib.io.IO import groovy.xml.XmlSlurper // Check the bndrun file exist!