commit d032ab24d51f884fe3bd5782e8d5465183388726
author Milos Kleint <mkleint@users.noreply.github.com> Sat Nov 14 09:12:28 2015 +1100
committer Milos Kleint <mkleint@users.noreply.github.com> Sat Nov 14 09:12:28 2015 +1100
tree 8a4c5623de480f41b7f536264580f4d3986206a3
parent 0892393b9cfb7f96ce1744d5daca4f05e6faeff2
parent 6c74316ad260c64aec3409b487a130e84e28493b

Merge pull request #14 from tstupka/master

changes for NB release 8.1

pom.xml

diff --git a/pom.xml b/pom.xml
index 69f6777..5f5f645 100644
--- a/pom.xml
+++ b/pom.xml
@@ -498,7 +498,7 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>nbm-maven-harness</artifactId>
-            <version>8.0</version>
+            <version>8.1</version>
         </dependency>
         <dependency>
             <groupId>org.codehaus.plexus</groupId>

src/main/java/org/codehaus/mojo/nbm/CreateWebstartAppMojo.java

diff --git a/src/main/java/org/codehaus/mojo/nbm/CreateWebstartAppMojo.java b/src/main/java/org/codehaus/mojo/nbm/CreateWebstartAppMojo.java
index 1e98f39..e53b832 100644
--- a/src/main/java/org/codehaus/mojo/nbm/CreateWebstartAppMojo.java
+++ b/src/main/java/org/codehaus/mojo/nbm/CreateWebstartAppMojo.java
@@ -30,6 +30,7 @@
 import java.net.URL;
 import java.util.Properties;
 import java.util.StringTokenizer;
+import java.util.jar.Attributes;
 import java.util.jar.JarFile;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
@@ -662,11 +663,23 @@
             }
 
             JarFile theJar = new JarFile( jar );
-            String codenamebase = theJar.getManifest().getMainAttributes().getValue( "OpenIDE-Module" );
+            Attributes attr = theJar.getManifest().getMainAttributes();
+            String codenamebase = attr.getValue( "OpenIDE-Module" );
+            if ( codenamebase == null )
+            {
+                codenamebase = attr.getValue("Bundle-SymbolicName");
+            }
             if ( codenamebase == null )
             {
                 throw new IOException( "Not a NetBeans Module: " + jar );
             }
+            
+            // see http://hg.netbeans.org/main-silver/rev/87823abb86d9
+            if (codenamebase.equals("org.objectweb.asm.all")
+                    && jar.getParentFile().getName().equals("core")
+                    && jar.getParentFile().getParentFile().getName().startsWith("platform")) {
+                continue;
+            }
             {
                 int slash = codenamebase.indexOf( '/' );
                 if ( slash >= 0 )