Upgraded to nbm-maven-pluging 3.9

dcaoyuan · Feb 19, 2013 · ca87175 · ca87175
1 parent 405f575
commit ca87175
Show file tree

Hide file tree

Showing 35 changed files with 105 additions and 152 deletions.
diff --git a/libs.sbt/pom.xml b/libs.sbt/pom.xml
@@ -258,6 +258,9 @@
                 <artifactId>nbm-maven-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
+                    <codeNameBase>org.netbeans.libs.sbt/1</codeNameBase>
+                    <licenseName>BSD-style License</licenseName>
+                    <licenseFile>license.txt</licenseFile>
                     <publicPackages>
                         <publicPackage>sbt</publicPackage>
                         <publicPackage>sbt.complete</publicPackage>

diff --git a/libs.sbt/src/main/nbm/module.xml b/libs.sbt/src/main/nbm/module.xml
diff --git a/libs.scala.compiler/pom.xml b/libs.scala.compiler/pom.xml
@@ -46,6 +46,9 @@
                 <artifactId>nbm-maven-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
+                    <codeNameBase>org.netbeans.libs.scala.compiler/1</codeNameBase>
+                    <licenseName>BSD-style License</licenseName>
+                    <licenseFile>license.txt</licenseFile>
                     <publicPackages>
                         <publicPackage>ch.epfl.lamp.compiler.msil</publicPackage>
                         <publicPackage>ch.epfl.lamp.compiler.msil.emit</publicPackage>

diff --git a/libs.scala.compiler/src/main/nbm/module.xml b/libs.scala.compiler/src/main/nbm/module.xml
diff --git a/libs.scala.continuations/pom.xml b/libs.scala.continuations/pom.xml
@@ -51,6 +51,9 @@
                 <artifactId>nbm-maven-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
+                    <codeNameBase>org.netbeans.libs.scala.continuations/1</codeNameBase>
+                    <licenseName>BSD-style License</licenseName>
+                    <licenseFile>license.txt</licenseFile>
                     <publicPackages>
                         <publicPackage>scala.tools.selectivecps</publicPackage>
                     </publicPackages>

diff --git a/libs.scala.continuations/src/main/nbm/module.xml b/libs.scala.continuations/src/main/nbm/module.xml
diff --git a/libs.scala.library/pom.xml b/libs.scala.library/pom.xml
@@ -36,6 +36,9 @@
                 <artifactId>nbm-maven-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
+                    <codeNameBase>org.netbeans.libs.scala.library/1</codeNameBase>
+                    <licenseName>BSD-style License</licenseName>
+                    <licenseFile>license.txt</licenseFile>
                     <publicPackages>
                         <publicPackage>scala</publicPackage>
                         <publicPackage>scala.annotation</publicPackage>

diff --git a/libs.scala.library/src/main/nbm/module.xml b/libs.scala.library/src/main/nbm/module.xml
diff --git a/libs.scala.reflect/pom.xml b/libs.scala.reflect/pom.xml
@@ -41,6 +41,9 @@
                 <artifactId>nbm-maven-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
+                    <codeNameBase>org.netbeans.libs.scala.reflect/1</codeNameBase>
+                    <licenseName>BSD-style License</licenseName>
+                    <licenseFile>license.txt</licenseFile>
                     <publicPackages>
                         <publicPackage>scala.reflect.api</publicPackage>
                         <publicPackage>scala.reflect.internal</publicPackage>

diff --git a/libs.scala.reflect/src/main/nbm/module.xml b/libs.scala.reflect/src/main/nbm/module.xml
diff --git a/libs.xtc/pom.xml b/libs.xtc/pom.xml
@@ -13,7 +13,7 @@
     <name>org-netbeans-libs-xtc</name>
     <packaging>nbm</packaging>
     <description>The XTC Libs
-    TODO: Describe and Link, where these are from</description>
+        TODO: Describe and Link, where these are from</description>
 
     <build>
         <plugins>
@@ -26,6 +26,9 @@
                 <artifactId>nbm-maven-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
+                    <codeNameBase>xtc/1</codeNameBase>
+                    <licenseName>LGPL version 2.1</licenseName>
+                    <licenseFile>license.txt</licenseFile>
                     <publicPackages>
                         <publicPackage>xtc</publicPackage>
                         <publicPackage>xtc.lang</publicPackage>

diff --git a/libs.xtc/src/main/nbm/module.xml b/libs.xtc/src/main/nbm/module.xml
diff --git a/pom.xml b/pom.xml
@@ -69,7 +69,7 @@
         <scala.core.version>1.6.0</scala.core.version>
         <scala.editor.version>1.6.0</scala.editor.version>
         <scala.console.version>1.6.0</scala.console.version>
-		<scala.maven.version>1.6.0</scala.maven.version>
+        <scala.maven.version>1.6.0</scala.maven.version>
         <scala.platform.version>1.6.0</scala.platform.version>
         <scala.sbt.version>1.6.0</scala.sbt.version>
         <scala.stdplatform.version>1.6.0</scala.stdplatform.version>
@@ -123,7 +123,7 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>nbm-maven-plugin</artifactId>
-                    <version>3.8.1</version>
+                    <version>3.9</version>
                     <extensions>true</extensions>
                     <configuration>
                         <brandingToken>${brandingToken}</brandingToken>

diff --git a/scala.console/pom.xml b/scala.console/pom.xml
@@ -126,6 +126,9 @@
                 <artifactId>nbm-maven-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
+                    <codeNameBase>org.netbeans.modules.scala.console/1</codeNameBase>
+                    <licenseName>CDDL-GPLV2</licenseName>
+                    <licenseFile>license.txt</licenseFile>
                     <publicPackages>
                     </publicPackages>
                 </configuration>

diff --git a/scala.console/src/main/nbm/module.xml b/scala.console/src/main/nbm/module.xml
diff --git a/scala.core/pom.xml b/scala.core/pom.xml
@@ -178,7 +178,7 @@
             <scope>provided</scope>
         </dependency>
 
-       <!-- subproject dependencies -->
+        <!-- subproject dependencies -->
         <dependency>
             <groupId>org.netbeans.modules</groupId>
             <artifactId>org-netbeans-libs-scala-library</artifactId>
@@ -233,6 +233,16 @@
                 <artifactId>nbm-maven-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
+                    <codeNameBase>org.netbeans.modules.scala.core/1</codeNameBase>
+                    <licenseName>CDDL-GPLV2</licenseName>
+                    <licenseFile>license.txt</licenseFile>
+                    <!-- to resolve the references to friend modules or private classes -->
+                    <moduleDependencies>
+                        <dependency>
+                            <id>org.netbeans.api:org-netbeans-modules-parsing-api</id>
+                            <type>impl</type>
+                        </dependency>
+                    </moduleDependencies> 
                     <publicPackages>
                         <publicPackage>org.netbeans.api.language.util.lex</publicPackage>
                         <publicPackage>org.netbeans.api.language.util.ast</publicPackage>

diff --git a/scala.core/src/main/nbm/module.xml b/scala.core/src/main/nbm/module.xml
diff --git a/scala.debugger.projects/pom.xml b/scala.debugger.projects/pom.xml
@@ -210,6 +210,16 @@
                 <artifactId>nbm-maven-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
+                    <codeNameBase>org.netbeans.modules.scala.debugger.projects/1</codeNameBase>
+                    <licenseName>CDDL-GPLV2</licenseName>
+                    <licenseFile>license.txt</licenseFile> 
+                    <moduleDependencies>
+                        <dependency>
+                            <id>org.netbeans.modules:org-netbeans-modules-debugger-jpda-ui</id>
+                            <type>impl</type>
+                            <explicitValue>org.netbeans.modules.debugger.jpda.ui/1 > 1.23</explicitValue>
+                        </dependency>
+                    </moduleDependencies>
                     <publicPackages>
                     </publicPackages>
                 </configuration>

diff --git a/scala.debugger.projects/src/main/nbm/module.xml b/scala.debugger.projects/src/main/nbm/module.xml
diff --git a/scala.debugger/pom.xml b/scala.debugger/pom.xml
@@ -185,6 +185,9 @@
                 <artifactId>nbm-maven-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
+                    <codeNameBase>org.netbeans.modules.scala.debugger/1</codeNameBase>
+                    <licenseName>CDDL-GPLV2</licenseName>
+                    <licenseFile>license.txt</licenseFile>    
                     <publicPackages>
                     </publicPackages>
                 </configuration>

diff --git a/scala.debugger/src/main/nbm/module.xml b/scala.debugger/src/main/nbm/module.xml
diff --git a/scala.editor/pom.xml b/scala.editor/pom.xml
@@ -231,7 +231,7 @@
         </dependency>
 
         <!-- maven transitive dependencies: <scope>runtime</scope> -->
-<!--        <dependency>
+        <!--        <dependency>
             <groupId>org.netbeans.modules</groupId>
             <artifactId>org-netbeans-modules-editor-settings-storage</artifactId>
             <version>${netbeans.version}</version>
@@ -305,6 +305,28 @@
                 <artifactId>nbm-maven-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
+                    <codeNameBase>org.netbeans.modules.scala.editor/1</codeNameBase>
+                    <licenseName>CDDL-GPLV2</licenseName>
+                    <licenseFile>license.txt</licenseFile>
+                    <!-- to resolve the references to friend modules or private classes -->
+                    <moduleDependencies>
+                        <dependency>
+                            <id>org.netbeans.api:org-netbeans-modules-parsing-api</id>
+                            <type>impl</type>
+                        </dependency>
+                        <dependency>
+                            <id>org.netbeans.api:org-netbeans-modules-csl-api</id>
+                            <type>impl</type>
+                        </dependency>
+                        <dependency>
+                            <id>org.netbeans.modules:org-netbeans-modules-editor-settings-storage</id>
+                            <type>impl</type>
+                        </dependency>
+                        <dependency>
+                            <id>org.netbeans.modules:org-netbeans-modules-options-keymap</id>
+                            <type>impl</type>
+                        </dependency>
+                    </moduleDependencies>
                     <publicPackages>
                     </publicPackages>
                 </configuration>

diff --git a/scala.editor/src/main/nbm/module.xml b/scala.editor/src/main/nbm/module.xml
diff --git a/scala.maven/pom.xml b/scala.maven/pom.xml
@@ -97,6 +97,9 @@
                 <artifactId>nbm-maven-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
+                    <codeNameBase>org.netbeans.modules.scala.maven/1</codeNameBase>
+                    <licenseName>CDDL-GPLV2</licenseName>
+                    <licenseFile>license.txt</licenseFile>
                     <verifyRuntime>warn</verifyRuntime>
                 </configuration>
             </plugin>

diff --git a/scala.maven/src/main/nbm/module.xml b/scala.maven/src/main/nbm/module.xml
diff --git a/scala.platform/pom.xml b/scala.platform/pom.xml
@@ -78,6 +78,9 @@
                 <artifactId>nbm-maven-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
+                    <codeNameBase>org.netbeans.modules.scala.platform/1</codeNameBase>
+                    <licenseName>CDDL-GPLV2</licenseName>
+                    <licenseFile>license.txt</licenseFile>    
                     <publicPackages>
                         <publicPackage>org.netbeans.api.scala.platform</publicPackage>
                         <publicPackage>org.netbeans.spi.scala.platform</publicPackage>

diff --git a/scala.platform/src/main/nbm/module.xml b/scala.platform/src/main/nbm/module.xml
diff --git a/scala.project/pom.xml b/scala.project/pom.xml
@@ -89,7 +89,7 @@
             <artifactId>org-netbeans-modules-java-sourceui</artifactId>
             <version>${netbeans.version}</version>
         </dependency>
-<!--        <dependency>
+        <!--        <dependency>
             <groupId>org.netbeans.modules</groupId>
             <artifactId>org-netbeans-modules-junit</artifactId>
             <version>${netbeans.version}</version>
@@ -181,13 +181,13 @@
         </dependency>
 
         <!-- maven transitive dependencies: <scope>runtime</scope> -->
-<!--        <dependency>
+        <!--        <dependency>
             <groupId>org.netbeans.modules</groupId>
             <artifactId>org-netbeans-modules-junit</artifactId>
             <version>${netbeans.version}</version>
             <scope>runtime</scope>
         </dependency>-->
-<!--        <dependency>
+        <!--        <dependency>
             <groupId>org.netbeans.modules</groupId>
             <artifactId>org-netbeans-modules-java-preprocessorbridge</artifactId>
             <version>${netbeans.version}</version>
@@ -251,6 +251,9 @@
                 <artifactId>nbm-maven-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
+                    <codeNameBase>org.netbeans.modules.scala.project/1</codeNameBase>
+                    <licenseName>CDDL-GPLV2</licenseName>
+                    <licenseFile>license.txt</licenseFile>
                     <publicPackages>
                         <publicPackage>org.netbeans.modules.scala.project.api</publicPackage>
                     </publicPackages>

diff --git a/scala.project/src/main/nbm/module.xml b/scala.project/src/main/nbm/module.xml
diff --git a/scala.refactoring/pom.xml b/scala.refactoring/pom.xml
@@ -195,7 +195,7 @@
         </dependency>
 
         <!-- maven transitive dependencies: <scope>runtime</scope> -->
-<!--        <dependency>
+        <!--        <dependency>
             <groupId>org.netbeans.modules</groupId>
             <artifactId>org-netbeans-modules-masterfs</artifactId>
             <version>${netbeans.version}</version>
@@ -252,6 +252,9 @@
                 <artifactId>nbm-maven-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
+                    <codeNameBase>org.netbeans.modules.scala.refactoring/1</codeNameBase>
+                    <licenseName>CDDL-GPLV2</licenseName>
+                    <licenseFile>license.txt</licenseFile>
                     <publicPackages>
                     </publicPackages>
                 </configuration>