Re: [cbi-dev] Build failure in eclipse-junit-tests with signing and bree

[Igor Fedorenko <igor@xxxxxxxxxxxxxx>]

I don't have an easy way to test this right now, but can you try
the attached diff to see if it solves the problem?

--
Regards,
Igor

On 12-09-14 9:35 PM, Paul Webster wrote:
> On Fri, Sep 14, 2012 at 9:19 PM, Igor Fedorenko <igor@xxxxxxxxxxxxxx
> <mailto:igor@xxxxxxxxxxxxxx>> wrote:
>
>     This is almost certainly a bug in maven-cbi-plugin, which does not know
>     what to do with pack200 bundles. I'll try to look at this over the
>     weekend.
>
>
> Thanks Igor.
>
> Later,
> Paul
>
> --
> Paul Webster
> Hi floor.  Make me a sammich! - GIR
>
>
> _______________________________________________
> cbi-dev mailing list
> cbi-dev@xxxxxxxxxxx
> http://dev.eclipse.org/mailman/listinfo/cbi-dev
diff --git a/maven-cbi-plugin/pom.xml b/maven-cbi-plugin/pom.xml
index d588178..4726243 100644
--- a/maven-cbi-plugin/pom.xml
+++ b/maven-cbi-plugin/pom.xml
@@ -20,7 +20,7 @@
 
   <properties>
     <maven.version>3.0</maven.version>
-    <tycho.version>0.14.0</tycho.version>
+    <tycho.version>0.15.0</tycho.version>
     <tycho-repo.url>https://oss.sonatype.org/content/groups/public/</tycho-repo.url>
   </properties>
 
diff --git a/maven-cbi-plugin/src/main/java/org/eclipse/cbi/mojo/AbstractPluginScannerMojo.java b/maven-cbi-plugin/src/main/java/org/eclipse/cbi/mojo/AbstractPluginScannerMojo.java
index 95496c9..c3f790a 100644
--- a/maven-cbi-plugin/src/main/java/org/eclipse/cbi/mojo/AbstractPluginScannerMojo.java
+++ b/maven-cbi-plugin/src/main/java/org/eclipse/cbi/mojo/AbstractPluginScannerMojo.java
@@ -14,6 +14,7 @@ import org.apache.maven.plugin.MojoFailureException;
 import org.codehaus.plexus.util.IOUtil;
 import org.eclipse.tycho.core.osgitools.BundleReader;
 import org.eclipse.tycho.core.osgitools.OsgiManifest;
+import org.eclipse.tycho.core.osgitools.OsgiManifestParserException;
 
 abstract class AbstractPluginScannerMojo
     extends AbstractMojo
@@ -42,8 +43,19 @@ abstract class AbstractPluginScannerMojo
                 Map<File, OsgiManifest> manifests = new HashMap<File, OsgiManifest>();
                 for ( File plugin : plugins )
                 {
-                    OsgiManifest manifest = bundleReader.loadManifest( plugin );
-                    manifests.put( plugin, manifest );
+                    if ( plugin.getName().endsWith( ".pack.gz" ) )
+                    {
+                        continue;
+                    }
+                    try
+                    {
+                        OsgiManifest manifest = bundleReader.loadManifest( plugin );
+                        manifests.put( plugin, manifest );
+                    }
+                    catch ( OsgiManifestParserException e )
+                    {
+                        getLog().error( e );
+                    }
                 }
 
                 processPlugins( properties, manifests );