[FELIX-6074] Do not analyze dependencies before the upToDate check

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1854551 13f79535-47bb-0310-9956-ffa450edef68
apache · Feb 28, 2019 · 9487647 · 9487647
1 parent e12e94c
commit 9487647
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 17 deletions.
diff --git a/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/AntPlugin.java b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/AntPlugin.java
@@ -50,7 +50,7 @@ public class AntPlugin extends BundlePlugin
 
     @Override
     protected void execute( Map<String, String> originalInstructions,
-        Jar[] classpath ) throws MojoExecutionException
+        ClassPathItem[] classpath ) throws MojoExecutionException
     {
         final String artifactId = getProject().getArtifactId();
         final String baseDir = getProject().getBasedir().getPath();

diff --git a/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
@@ -426,7 +426,7 @@ protected boolean reportErrors( String prefix, Analyzer analyzer )
 
 
     protected void execute(Map<String, String> originalInstructions,
-                           Jar[] classpath) throws MojoExecutionException
+                           ClassPathItem[] classpath) throws MojoExecutionException
     {
         try
         {
@@ -512,7 +512,7 @@ else if ( customPackaging )
 
 
     protected Builder getOSGiBuilder( MavenProject currentProject, Map<String, String> originalInstructions,
-        Jar[] classpath ) throws Exception
+        ClassPathItem[] classpath ) throws Exception
     {
         Properties properties = new Properties();
         properties.putAll( getDefaultProperties( currentProject ) );
@@ -589,7 +589,11 @@ protected Builder getOSGiBuilder( MavenProject currentProject, Map<String, Strin
         builder.setProperties( sanitize( properties ) );
         if ( classpath != null )
         {
-            builder.setClasspath( classpath );
+            Jar[] jars = new Jar[ classpath.length ];
+            for ( int i = 0; i < classpath.length; i++ ) {
+                jars[i] = new Jar( classpath[i].id, classpath[i].file );
+            }
+            builder.setClasspath( jars );
         }
 
         return builder;
@@ -916,7 +920,7 @@ public boolean updateExcludesInDeps( MavenProject project, List<Dependency> depe
 
 
     protected Builder buildOSGiBundle(MavenProject currentProject, Map<String, String> originalInstructions,
-                                      Jar[] classpath) throws Exception
+                                      ClassPathItem[] classpath) throws Exception
     {
         Builder builder = getOSGiBuilder( currentProject, originalInstructions, classpath );
 
@@ -1574,14 +1578,14 @@ private void doMavenMetadata( MavenProject currentProject, Jar jar ) throws IOEx
     }
 
 
-    protected Jar[] getClasspath(MavenProject currentProject) throws IOException, MojoExecutionException
+    protected ClassPathItem[] getClasspath(MavenProject currentProject) throws IOException, MojoExecutionException
     {
-        List<Jar> list = new ArrayList<Jar>( currentProject.getArtifacts().size() + 1 );
+        List<ClassPathItem> list = new ArrayList<ClassPathItem>( currentProject.getArtifacts().size() + 1 );
 
         String d = currentProject.getBuild() != null ? currentProject.getBuild().getOutputDirectory() : null;
         if ( d != null )
         {
-            list.add( new Jar( ".", d ) );
+            list.add( new ClassPathItem( ".", new File( d ) ) );
         }
 
         final Collection<Artifact> artifacts = getSelectedDependencies(currentProject.getArtifacts() );
@@ -1597,11 +1601,11 @@ protected Jar[] getClasspath(MavenProject currentProject) throws IOException, Mo
                                     + currentProject.getArtifact() );
                     continue;
                 }
-                Jar jar = new Jar( artifact.getArtifactId(), file );
+                ClassPathItem jar = new ClassPathItem( artifact.getArtifactId(), file );
                 list.add( jar );
             }
         }
-        Jar[] cp = new Jar[list.size()];
+        ClassPathItem[] cp = new ClassPathItem[list.size()];
         list.toArray( cp );
 
         return cp;
@@ -2139,4 +2143,13 @@ protected static void includeJava9Fixups(MavenProject currentProject, Analyzer a
         analyzer.setProperty(Analyzer.FIXUPMESSAGES, fixups);
     }
 
+    static class ClassPathItem {
+        final String id;
+        final File file;
+
+        public ClassPathItem(String id, File file) {
+            this.id = id;
+            this.file = file;
+        }
+    }
 }
diff --git a/...s/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/InstructionsPlugin.java b/...s/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/InstructionsPlugin.java
@@ -40,7 +40,7 @@
 public class InstructionsPlugin extends BundlePlugin
 {
     @Override
-    protected void execute( Map<String, String> instructions, Jar[] classpath )
+    protected void execute( Map<String, String> instructions, ClassPathItem[] classpath )
         throws MojoExecutionException
     {
         if ( dumpInstructions == null )

diff --git a/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
@@ -91,7 +91,7 @@ public class ManifestPlugin extends BundlePlugin
     private BuildContext buildContext;
 
     @Override
-    protected void execute( Map<String, String> instructions, Jar[] classpath )
+    protected void execute( Map<String, String> instructions, ClassPathItem[] classpath )
         throws MojoExecutionException
     {
 
@@ -180,14 +180,14 @@ private boolean containsJavaFile(Scanner scanner) {
         return scanner.getIncludedFiles().length > 0;
     }
 
-    public Manifest getManifest( MavenProject project, Jar[] classpath ) throws IOException, MojoFailureException,
+    public Manifest getManifest( MavenProject project, ClassPathItem[] classpath ) throws IOException, MojoFailureException,
         MojoExecutionException, Exception
     {
         return getManifest( project, new LinkedHashMap<String, String>(), classpath, buildContext );
     }
 
 
-    public Manifest getManifest( MavenProject project, Map<String, String> instructions, Jar[] classpath,
+    public Manifest getManifest( MavenProject project, Map<String, String> instructions, ClassPathItem[] classpath,
             BuildContext buildContext ) throws IOException, MojoFailureException, MojoExecutionException, Exception
     {
         Analyzer analyzer = getAnalyzer(project, instructions, classpath);
@@ -249,14 +249,14 @@ private static void writeSCR(Resource resource, File destination, BuildContext b
         }
     }
 
-    protected Analyzer getAnalyzer( MavenProject project, Jar[] classpath ) throws IOException, MojoExecutionException,
+    protected Analyzer getAnalyzer( MavenProject project, ClassPathItem[] classpath ) throws IOException, MojoExecutionException,
         Exception
     {
         return getAnalyzer( project, new LinkedHashMap<>(), classpath );
     }
 
 
-    protected Analyzer getAnalyzer( MavenProject project, Map<String, String> instructions, Jar[] classpath )
+    protected Analyzer getAnalyzer( MavenProject project, Map<String, String> instructions, ClassPathItem[] classpath )
         throws IOException, MojoExecutionException, Exception
     {
         if ( rebuildBundle && supportedProjectTypes.contains( project.getArtifact().getType() ) )

diff --git a/tools/maven-bundle-plugin/src/test/java/org/apache/felix/bundleplugin/BundlePluginTest.java b/tools/maven-bundle-plugin/src/test/java/org/apache/felix/bundleplugin/BundlePluginTest.java
@@ -31,6 +31,7 @@
 import java.util.TreeMap;
 import java.util.jar.Manifest;
 
+import org.apache.felix.bundleplugin.BundlePlugin.ClassPathItem;
 import org.apache.maven.model.Organization;
 import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
 import org.apache.maven.project.MavenProject;
@@ -346,7 +347,7 @@ public void testEmbedDependencyMissingNegativeKey() throws Exception
         MavenProject project = getMavenProjectStub();
         project.setDependencyArtifacts(artifacts);
         Properties props = new Properties();
-        Jar[] classpath = plugin.getClasspath(project);
+        ClassPathItem[] classpath = plugin.getClasspath(project);
 
         Map instructions1 = new HashMap();
         instructions1.put( DependencyEmbedder.EMBED_DEPENDENCY, "!scope=compile" );