maven: Update pre/postbuild scripts to organize imports

Signed-off-by: BJ Hargrave <bj@hargrave.dev>
bndtools · Jun 2, 2022 · 485698d · 485698d
1 parent 0dc0b47
commit 485698d
Show file tree

Hide file tree

Showing 50 changed files with 212 additions and 144 deletions.
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
@@ -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-plugin/src/it/invalid-with-provider-require-bundle-version-change/postbuild.groovy b/...-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
@@ -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
@@ -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
@@ -1,4 +1,3 @@
-import java.io.*;
 import java.util.regex.Pattern
 
 File build_log_file = new File("${basedir}/build.log")

diff --git a/...aseline-maven-plugin/src/it/valid-with-provider-no-bundle-version-change/postbuild.groovy b/...aseline-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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...n/bnd-maven-plugin/src/it/jar-test-in-build-pluginManagement-inheritance/postbuild.groovy b/...n/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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')