aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Fedorenko2012-09-18 08:19:11 (EDT)
committerPaul Webster2012-09-18 08:19:11 (EDT)
commit5d242dfe79af2e1e41ba2cc780a2a90377753a70 (patch)
tree371aac313694ec82b048db38778dffae7340fcd6
parent32ab30a3c2462eecd2e4073f3717af90cf76a4f3 (diff)
downloadeclipse.platform.releng.aggregator-5d242dfe79af2e1e41ba2cc780a2a90377753a70.zip
eclipse.platform.releng.aggregator-5d242dfe79af2e1e41ba2cc780a2a90377753a70.tar.gz
eclipse.platform.releng.aggregator-5d242dfe79af2e1e41ba2cc780a2a90377753a70.tar.bz2
Bug 385998 - Problem with building eclipse-junit-tests when using eclipse-pack
Ignore .pack.gz files
-rw-r--r--maven-cbi-plugin/pom.xml2
-rw-r--r--maven-cbi-plugin/src/main/java/org/eclipse/cbi/mojo/AbstractPluginScannerMojo.java16
2 files changed, 15 insertions, 3 deletions
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 63b04ac..bf6c502 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
@@ -25,6 +25,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
@@ -53,8 +54,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 );