Browse files

Maven 3.0 Support, split of used Scala binaries into 3 separate modules

  • Loading branch information...
1 parent e89d75a commit 520b5d6d285764384653d65c7786b06c3900df51 Sven Reimers committed Aug 14, 2011
Showing with 615 additions and 234 deletions.
  1. BIN libs.scala.compiler/.pom.xml.swp
  2. +6 −6 {libs.scala → libs.scala.compiler}/lib/nbscala.patch
  3. BIN {libs.scala → libs.scala.compiler}/lib/scala-compiler.jar
  4. 0 {libs.scala → libs.scala.compiler}/license.txt
  5. +107 −0 libs.scala.compiler/pom.xml
  6. +4 −0 libs.scala.compiler/src/main/nbm/manifest.mf
  7. +6 −0 libs.scala.compiler/src/main/nbm/module.xml
  8. +44 −0 libs.scala.compiler/src/main/resources/org/netbeans/libs/scala/compiler/resources/Bundle.properties
  9. BIN {libs.scala → libs.scala.continuations}/lib/continuations.jar
  10. +35 −0 libs.scala.continuations/license.txt
  11. +4 −40 {libs.scala → libs.scala.continuations}/pom.xml
  12. +4 −0 libs.scala.continuations/src/main/nbm/manifest.mf
  13. +6 −0 libs.scala.continuations/src/main/nbm/module.xml
  14. +44 −0 ...ontinuations/src/main/resources/org/netbeans/libs/scala/continuations/resources/Bundle.properties
  15. BIN {libs.scala → libs.scala.library}/lib/scala-library.jar
  16. +35 −0 libs.scala.library/license.txt
  17. +119 −0 libs.scala.library/pom.xml
  18. +4 −0 libs.scala.library/src/main/nbm/manifest.mf
  19. +1 −1 {libs.scala → libs.scala.library}/src/main/nbm/module.xml
  20. 0 ...ibs.scala.library/src/main/resources/org/netbeans/libs/scala/library}/resources/Bundle.properties
  21. +0 −4 libs.scala/src/main/nbm/manifest.mf
  22. +2 −0 libs.xtc/pom.xml
  23. +23 −0 nbactions.xml
  24. +74 −177 pom.xml
  25. +2 −0 scala.console/pom.xml
  26. +26 −1 scala.core/pom.xml
  27. 0 scala.core/src/main/{scala → java}/org/netbeans/modules/scala/core/rats/Character.rats
  28. 0 scala.core/src/main/{scala → java}/org/netbeans/modules/scala/core/rats/Identifier.rats
  29. 0 scala.core/src/main/{scala → java}/org/netbeans/modules/scala/core/rats/Keyword.rats
  30. 0 scala.core/src/main/{scala → java}/org/netbeans/modules/scala/core/rats/LexerScala.java
  31. 0 scala.core/src/main/{scala → java}/org/netbeans/modules/scala/core/rats/LexerScala.rats
  32. 0 scala.core/src/main/{scala → java}/org/netbeans/modules/scala/core/rats/Literal.rats
  33. 0 scala.core/src/main/{scala → java}/org/netbeans/modules/scala/core/rats/ParserScala.java
  34. 0 scala.core/src/main/{scala → java}/org/netbeans/modules/scala/core/rats/ParserScala.rats
  35. 0 scala.core/src/main/{scala → java}/org/netbeans/modules/scala/core/rats/ParserState.java
  36. 0 scala.core/src/main/{scala → java}/org/netbeans/modules/scala/core/rats/Spacing.rats
  37. 0 scala.core/src/main/{scala → java}/org/netbeans/modules/scala/core/rats/State.rats
  38. 0 scala.core/src/main/{scala → java}/org/netbeans/modules/scala/core/rats/Symbol.rats
  39. 0 scala.core/src/main/{scala → java}/org/netbeans/modules/scala/core/rats/Unicode.rats
  40. 0 scala.core/src/main/{scala → java}/org/netbeans/modules/scala/core/rats/Xml.rats
  41. +13 −1 scala.debugger.projects/pom.xml
  42. +13 −1 scala.debugger/pom.xml
  43. +13 −1 scala.editor/pom.xml
  44. +2 −0 scala.platform/pom.xml
  45. +13 −1 scala.project/pom.xml
  46. +13 −1 scala.refactoring/pom.xml
  47. +2 −0 scala.stdplatform/pom.xml
View
BIN libs.scala.compiler/.pom.xml.swp
Binary file not shown.
View
12 libs.scala/lib/nbscala.patch → libs.scala.compiler/lib/nbscala.patch
@@ -1,6 +1,6 @@
Index: src/compiler/scala/tools/nsc/Global.scala
===================================================================
---- src/compiler/scala/tools/nsc/Global.scala (revision 25485)
+--- src/compiler/scala/tools/nsc/Global.scala (revision 24954)
+++ src/compiler/scala/tools/nsc/Global.scala (working copy)
@@ -57,6 +57,7 @@
def rootLoader: LazyType = platform.rootLoader
@@ -12,9 +12,9 @@ Index: src/compiler/scala/tools/nsc/Global.scala
object gen extends {
Index: src/compiler/scala/tools/nsc/typechecker/Namers.scala
===================================================================
---- src/compiler/scala/tools/nsc/typechecker/Namers.scala (revision 25485)
+--- src/compiler/scala/tools/nsc/typechecker/Namers.scala (revision 24954)
+++ src/compiler/scala/tools/nsc/typechecker/Namers.scala (working copy)
-@@ -1256,8 +1256,12 @@
+@@ -1247,8 +1247,12 @@
typeSig(tree)
return
}
@@ -31,9 +31,9 @@ Index: src/compiler/scala/tools/nsc/typechecker/Namers.scala
isValidSelector(from stripEnd "$")(notMember)
Index: src/compiler/scala/tools/nsc/typechecker/Typers.scala
===================================================================
---- src/compiler/scala/tools/nsc/typechecker/Typers.scala (revision 25485)
+--- src/compiler/scala/tools/nsc/typechecker/Typers.scala (revision 24954)
+++ src/compiler/scala/tools/nsc/typechecker/Typers.scala (working copy)
-@@ -3591,6 +3591,11 @@
+@@ -3564,6 +3564,11 @@
}
def makeErrorTree = {
@@ -47,7 +47,7 @@ Index: src/compiler/scala/tools/nsc/typechecker/Typers.scala
case SelectFromTypeTree(_, _) => treeCopy.SelectFromTypeTree(tree, qual, name)
Index: src/compiler/scala/tools/nsc/interactive/Global.scala
===================================================================
---- src/compiler/scala/tools/nsc/interactive/Global.scala (revision 25485)
+--- src/compiler/scala/tools/nsc/interactive/Global.scala (revision 24954)
+++ src/compiler/scala/tools/nsc/interactive/Global.scala (working copy)
@@ -734,9 +734,7 @@
(!implicitlyAdded || m.implicitlyAdded)
View
BIN libs.scala/lib/scala-compiler.jar → libs.scala.compiler/lib/scala-compiler.jar
Binary file not shown.
View
0 libs.scala/license.txt → libs.scala.compiler/license.txt
File renamed without changes.
View
107 libs.scala.compiler/pom.xml
@@ -0,0 +1,107 @@
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.netbeans.modules</groupId>
+ <artifactId>nbscala</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org-netbeans-libs-scala-compiler</artifactId>
+ <version>${libs.scala.version}</version>
+ <name>org-netbeans-libs-scala-compiler</name>
+ <packaging>nbm</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.netbeans.modules</groupId>
+ <artifactId>org-netbeans-libs-scala-library</artifactId>
+ <version>${libs.scala.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.modules</groupId>
+ <artifactId>org-netbeans-libs-scala-continuations</artifactId>
+ <version>${libs.scala.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-compiler</artifactId>
+ <version>${scala.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>install-scala-compiler</id>
+ <goals>
+ <goal>install-file</goal>
+ </goals>
+ <phase>process-resources</phase> <!-- use process-resources phase to.force re-installation -->
+ <configuration>
+ <file>${project.basedir}/lib/scala-compiler.jar</file>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-compiler</artifactId>
+ <version>${scala.version}</version>
+ <packaging>jar</packaging>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>nbm-maven-plugin</artifactId>
+ <version>3.5</version>
+ <extensions>true</extensions>
+ <configuration>
+ <publicPackages>
+ <publicPackage>ch.epfl.lamp.compiler.msil</publicPackage>
+ <publicPackage>ch.epfl.lamp.compiler.msil.emit</publicPackage>
+ <publicPackage>ch.epfl.lamp.compiler.msil.util</publicPackage>
+ <publicPackage>ch.epfl.lamp.fjbg</publicPackage>
+ <publicPackage>ch.epfl.lamp.util</publicPackage>
+ <publicPackage>scala.tools.ant</publicPackage>
+ <publicPackage>scala.tools.ant.sabbus</publicPackage>
+ <publicPackage>scala.tools.nsc</publicPackage>
+ <publicPackage>scala.tools.nsc.ast</publicPackage>
+ <publicPackage>scala.tools.nsc.ast.parser</publicPackage>
+ <publicPackage>scala.tools.nsc.backend</publicPackage>
+ <publicPackage>scala.tools.nsc.backend.icode</publicPackage>
+ <publicPackage>scala.tools.nsc.backend.icode.analysis</publicPackage>
+ <publicPackage>scala.tools.nsc.backend.jvm</publicPackage>
+ <publicPackage>scala.tools.nsc.backend.msil</publicPackage>
+ <publicPackage>scala.tools.nsc.backend.opt</publicPackage>
+ <publicPackage>scala.tools.nsc.dependencies</publicPackage>
+ <publicPackage>scala.tools.nsc.doc</publicPackage>
+ <publicPackage>scala.tools.nsc.doc.html</publicPackage>
+ <publicPackage>scala.tools.nsc.doc.html.page</publicPackage>
+ <publicPackage>scala.tools.nsc.doc.model</publicPackage>
+ <publicPackage>scala.tools.nsc.doc.model.comment</publicPackage>
+ <publicPackage>scala.tools.nsc.interactive</publicPackage>
+ <publicPackage>scala.tools.nsc.interpreter</publicPackage>
+ <publicPackage>scala.tools.nsc.io</publicPackage>
+ <publicPackage>scala.tools.nsc.javac</publicPackage>
+ <publicPackage>scala.tools.nsc.matching</publicPackage>
+ <publicPackage>scala.tools.nsc.plugins</publicPackage>
+ <publicPackage>scala.tools.nsc.reporters</publicPackage>
+ <publicPackage>scala.tools.nsc.settings</publicPackage>
+ <publicPackage>scala.tools.nsc.symtab</publicPackage>
+ <publicPackage>scala.tools.nsc.symtab.classfile</publicPackage>
+ <publicPackage>scala.tools.nsc.symtab.clr</publicPackage>
+ <publicPackage>scala.tools.nsc.transform</publicPackage>
+ <publicPackage>scala.tools.nsc.typechecker</publicPackage>
+ <publicPackage>scala.tools.nsc.util</publicPackage>
+ <publicPackage>scala.tools.util</publicPackage>
+ </publicPackages>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
+
View
4 libs.scala.compiler/src/main/nbm/manifest.mf
@@ -0,0 +1,4 @@
+Manifest-Version: 1.0
+OpenIDE-Module-Display-Category: Scala
+AutoUpdate-Show-In-Client: true
+OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/scala/compiler/resources/Bundle.properties
View
6 libs.scala.compiler/src/main/nbm/module.xml
@@ -0,0 +1,6 @@
+<nbm>
+ <!--moduleType>autoload</moduleType-->
+ <codeNameBase>org.netbeans.libs.scala.compiler/1</codeNameBase>
+ <licenseName>BSD-style License</licenseName>
+ <licenseFile>license.txt</licenseFile>
+</nbm>
View
44 ....compiler/src/main/resources/org/netbeans/libs/scala/compiler/resources/Bundle.properties
@@ -0,0 +1,44 @@
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+#
+# Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+#
+# The contents of this file are subject to the terms of either the GNU
+# General Public License Version 2 only ("GPL") or the Common
+# Development and Distribution License("CDDL") (collectively, the
+# "License"). You may not use this file except in compliance with the
+# License. You can obtain a copy of the License at
+# http://www.netbeans.org/cddl-gplv2.html
+# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+# specific language governing permissions and limitations under the
+# License. When distributing the software, include this License Header
+# Notice in each file and include the License file at
+# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun in the GPL Version 2 section of the License file that
+# accompanied this code. If applicable, add the following below the
+# License Header, with the fields enclosed by brackets [] replaced by
+# your own identifying information:
+# "Portions Copyrighted [year] [name of copyright owner]"
+#
+# Contributor(s):
+#
+# The Original Software is NetBeans. The Initial Developer of the Original
+# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+# Microsystems, Inc. All Rights Reserved.
+#
+# If you wish your version of this file to be governed by only the CDDL
+# or only the GPL Version 2, indicate your decision by adding
+# "[Contributor] elects to include this software in this distribution
+# under the [CDDL or GPL Version 2] license." If you do not indicate a
+# single choice of license, a recipient has the option to distribute
+# your version of this file under either the CDDL, the GPL Version 2 or
+# to extend the choice of license to its licensees as provided above.
+# However, if you add GPL Version 2 code and therefore, elected the GPL
+# Version 2 license, then the option applies only if the new code is
+# made subject to such option by the copyright holder.
+
+OpenIDE-Module-Name=Scala Compiler
+OpenIDE-Module-Display-Category=Scala
+OpenIDE-Module-Short-Description=Bundles Scala compiler and source files.
+OpenIDE-Module-Long-Description=\
+ This module bundles Scala compiler and source files.
View
BIN libs.scala/lib/continuations.jar → ...scala.continuations/lib/continuations.jar
Binary file not shown.
View
35 libs.scala.continuations/license.txt
@@ -0,0 +1,35 @@
+SCALA LICENSE
+
+Copyright (c) 2002-2011 EPFL, Lausanne, unless otherwise specified.
+All rights reserved.
+
+This software was developed by the Programming Methods Laboratory of the
+Swiss Federal Institute of Technology (EPFL), Lausanne, Switzerland.
+
+Permission to use, copy, modify, and distribute this software in source
+or binary form for any purpose with or without fee is hereby granted,
+provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ 3. Neither the name of the EPFL nor the names of its contributors
+ may be used to endorse or promote products derived from this
+ software without specific prior written permission.
+
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
View
44 libs.scala/pom.xml → libs.scala.continuations/pom.xml
@@ -8,23 +8,13 @@
<version>1.0-SNAPSHOT</version>
</parent>
- <artifactId>org-netbeans-libs-scala</artifactId>
+ <artifactId>org-netbeans-libs-scala-continuations</artifactId>
<version>${libs.scala.version}</version>
- <name>org-netbeans-libs-scala</name>
+ <name>org-netbeans-libs-scala-continuations</name>
<packaging>nbm</packaging>
<dependencies>
<dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
- <version>${scala.version}</version>
- </dependency>
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-compiler</artifactId>
- <version>${scala.version}</version>
- </dependency>
- <dependency>
<groupId>org.scala-lang.plugins</groupId>
<artifactId>continuations</artifactId>
<version>${scala.version}</version>
@@ -39,34 +29,6 @@
<artifactId>maven-install-plugin</artifactId>
<executions>
<execution>
- <id>install-scala-library</id>
- <goals>
- <goal>install-file</goal>
- </goals>
- <phase>process-resources</phase> <!-- use process-resources phase to.force re-installation -->
- <configuration>
- <file>${project.basedir}/lib/scala-library.jar</file>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
- <version>${scala.version}</version>
- <packaging>jar</packaging>
- </configuration>
- </execution>
- <execution>
- <id>install-scala-compiler</id>
- <goals>
- <goal>install-file</goal>
- </goals>
- <phase>process-resources</phase> <!-- use process-resources phase to.force re-installation -->
- <configuration>
- <file>${project.basedir}/lib/scala-compiler.jar</file>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-compiler</artifactId>
- <version>${scala.version}</version>
- <packaging>jar</packaging>
- </configuration>
- </execution>
- <execution>
<id>install-continuations</id>
<goals>
<goal>install-file</goal>
@@ -85,6 +47,8 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>nbm-maven-plugin</artifactId>
+ <version>3.5</version>
+ <extensions>true</extensions>
<configuration>
<publicPackages>
<publicPackage>ch.epfl.lamp.compiler.msil</publicPackage>
View
4 libs.scala.continuations/src/main/nbm/manifest.mf
@@ -0,0 +1,4 @@
+Manifest-Version: 1.0
+OpenIDE-Module-Display-Category: Scala
+AutoUpdate-Show-In-Client: true
+OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/scala/continuations/resources/Bundle.properties
View
6 libs.scala.continuations/src/main/nbm/module.xml
@@ -0,0 +1,6 @@
+<nbm>
+ <!--moduleType>autoload</moduleType-->
+ <codeNameBase>org.netbeans.libs.scala.continuations/1</codeNameBase>
+ <licenseName>BSD-style License</licenseName>
+ <licenseFile>license.txt</licenseFile>
+</nbm>
View
44 ...ions/src/main/resources/org/netbeans/libs/scala/continuations/resources/Bundle.properties
@@ -0,0 +1,44 @@
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+#
+# Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+#
+# The contents of this file are subject to the terms of either the GNU
+# General Public License Version 2 only ("GPL") or the Common
+# Development and Distribution License("CDDL") (collectively, the
+# "License"). You may not use this file except in compliance with the
+# License. You can obtain a copy of the License at
+# http://www.netbeans.org/cddl-gplv2.html
+# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+# specific language governing permissions and limitations under the
+# License. When distributing the software, include this License Header
+# Notice in each file and include the License file at
+# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun in the GPL Version 2 section of the License file that
+# accompanied this code. If applicable, add the following below the
+# License Header, with the fields enclosed by brackets [] replaced by
+# your own identifying information:
+# "Portions Copyrighted [year] [name of copyright owner]"
+#
+# Contributor(s):
+#
+# The Original Software is NetBeans. The Initial Developer of the Original
+# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+# Microsystems, Inc. All Rights Reserved.
+#
+# If you wish your version of this file to be governed by only the CDDL
+# or only the GPL Version 2, indicate your decision by adding
+# "[Contributor] elects to include this software in this distribution
+# under the [CDDL or GPL Version 2] license." If you do not indicate a
+# single choice of license, a recipient has the option to distribute
+# your version of this file under either the CDDL, the GPL Version 2 or
+# to extend the choice of license to its licensees as provided above.
+# However, if you add GPL Version 2 code and therefore, elected the GPL
+# Version 2 license, then the option applies only if the new code is
+# made subject to such option by the copyright holder.
+
+OpenIDE-Module-Name=Scala Runtime Continuations
+OpenIDE-Module-Display-Category=Scala
+OpenIDE-Module-Short-Description=Bundles Scala runtime library and source files.
+OpenIDE-Module-Long-Description=\
+ This module bundles Scala runtime library and source files.
View
BIN libs.scala/lib/scala-library.jar → libs.scala.library/lib/scala-library.jar
Binary file not shown.
View
35 libs.scala.library/license.txt
@@ -0,0 +1,35 @@
+SCALA LICENSE
+
+Copyright (c) 2002-2011 EPFL, Lausanne, unless otherwise specified.
+All rights reserved.
+
+This software was developed by the Programming Methods Laboratory of the
+Swiss Federal Institute of Technology (EPFL), Lausanne, Switzerland.
+
+Permission to use, copy, modify, and distribute this software in source
+or binary form for any purpose with or without fee is hereby granted,
+provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ 3. Neither the name of the EPFL nor the names of its contributors
+ may be used to endorse or promote products derived from this
+ software without specific prior written permission.
+
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
View
119 libs.scala.library/pom.xml
@@ -0,0 +1,119 @@
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.netbeans.modules</groupId>
+ <artifactId>nbscala</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org-netbeans-libs-scala-library</artifactId>
+ <version>${libs.scala.version}</version>
+ <name>org-netbeans-libs-scala-library</name>
+ <packaging>nbm</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <version>${scala.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>install-scala-library</id>
+ <goals>
+ <goal>install-file</goal>
+ </goals>
+ <phase>process-resources</phase> <!-- use process-resources phase to.force re-installation -->
+ <configuration>
+ <file>${project.basedir}/lib/scala-library.jar</file>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <version>${scala.version}</version>
+ <packaging>jar</packaging>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>nbm-maven-plugin</artifactId>
+ <version>3.5</version>
+ <extensions>true</extensions>
+ <configuration>
+ <publicPackages>
+ <publicPackage>scala</publicPackage>
+ <publicPackage>scala.actors</publicPackage>
+ <publicPackage>scala.actors.remote</publicPackage>
+ <publicPackage>scala.actors.scheduler</publicPackage>
+ <publicPackage>scala.actors.threadpool</publicPackage>
+ <publicPackage>scala.actors.threadpool.helpers</publicPackage>
+ <publicPackage>scala.actors.threadpool.locks</publicPackage>
+ <publicPackage>scala.annotation</publicPackage>
+ <publicPackage>scala.annotation.target</publicPackage>
+ <publicPackage>scala.annotation.unchecked</publicPackage>
+ <publicPackage>scala.collection</publicPackage>
+ <publicPackage>scala.collection.generic</publicPackage>
+ <publicPackage>scala.collection.immutable</publicPackage>
+ <publicPackage>scala.collection.interfaces</publicPackage>
+ <publicPackage>scala.collection.mutable</publicPackage>
+ <publicPackage>scala.collection.parallel</publicPackage>
+ <publicPackage>scala.collection.script</publicPackage>
+ <publicPackage>scala.compat</publicPackage>
+ <publicPackage>scala.concurrent</publicPackage>
+ <publicPackage>scala.concurrent.forkjoin</publicPackage>
+ <publicPackage>scala.io</publicPackage>
+ <publicPackage>scala.math</publicPackage>
+ <publicPackage>scala.mobile</publicPackage>
+ <publicPackage>scala.ref</publicPackage>
+ <publicPackage>scala.reflect</publicPackage>
+ <publicPackage>scala.reflect.generic</publicPackage>
+ <publicPackage>scala.runtime</publicPackage>
+ <publicPackage>scala.swing</publicPackage>
+ <publicPackage>scala.swing.event</publicPackage>
+ <publicPackage>scala.swing.model</publicPackage>
+ <publicPackage>scala.swing.test</publicPackage>
+ <publicPackage>scala.sys</publicPackage>
+ <publicPackage>scala.sys.process</publicPackage>
+ <publicPackage>scala.testing</publicPackage>
+ <publicPackage>scala.text</publicPackage>
+ <publicPackage>scala.util</publicPackage>
+ <publicPackage>scala.util.automata</publicPackage>
+ <publicPackage>scala.util.control</publicPackage>
+ <publicPackage>scala.util.grammar</publicPackage>
+ <publicPackage>scala.util.logging</publicPackage>
+ <publicPackage>scala.util.matching</publicPackage>
+ <publicPackage>scala.util.parsing.ast</publicPackage>
+ <publicPackage>scala.util.parsing.combinator</publicPackage>
+ <publicPackage>scala.util.parsing.combinator.lexical</publicPackage>
+ <publicPackage>scala.util.parsing.combinator.syntactical</publicPackage>
+ <publicPackage>scala.util.parsing.combinator.testing</publicPackage>
+ <publicPackage>scala.util.parsing.input</publicPackage>
+ <publicPackage>scala.util.parsing.json</publicPackage>
+ <publicPackage>scala.util.parsing.syntax</publicPackage>
+ <publicPackage>scala.util.regexp</publicPackage>
+ <publicPackage>scala.xml</publicPackage>
+ <publicPackage>scala.xml.dtd</publicPackage>
+ <publicPackage>scala.xml.factory</publicPackage>
+ <publicPackage>scala.xml.include</publicPackage>
+ <publicPackage>scala.xml.include.sax</publicPackage>
+ <publicPackage>scala.xml.parsing</publicPackage>
+ <publicPackage>scala.xml.persistent</publicPackage>
+ <publicPackage>scala.xml.pull</publicPackage>
+ <publicPackage>scala.xml.transform</publicPackage>
+ </publicPackages>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
+
View
4 libs.scala.library/src/main/nbm/manifest.mf
@@ -0,0 +1,4 @@
+Manifest-Version: 1.0
+OpenIDE-Module-Display-Category: Scala
+AutoUpdate-Show-In-Client: true
+OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/scala/library/resources/Bundle.properties
View
2 libs.scala/src/main/nbm/module.xml → libs.scala.library/src/main/nbm/module.xml
@@ -1,6 +1,6 @@
<nbm>
<!--moduleType>autoload</moduleType-->
- <codeNameBase>org.netbeans.libs.scala/1</codeNameBase>
+ <codeNameBase>org.netbeans.libs.scala.library/1</codeNameBase>
<licenseName>BSD-style License</licenseName>
<licenseFile>license.txt</licenseFile>
</nbm>
View
0 ...ns/libs/scala/resources/Bundle.properties → ...scala/library/resources/Bundle.properties
File renamed without changes.
View
4 libs.scala/src/main/nbm/manifest.mf
@@ -1,4 +0,0 @@
-Manifest-Version: 1.0
-OpenIDE-Module-Display-Category: Scala
-AutoUpdate-Show-In-Client: true
-OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/scala/resources/Bundle.properties
View
2 libs.xtc/pom.xml
@@ -22,6 +22,8 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>nbm-maven-plugin</artifactId>
+ <version>3.5</version>
+ <extensions>true</extensions>
<configuration>
<publicPackages>
<publicPackage>xtc</publicPackage>
View
23 nbactions.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actions>
+ <action>
+ <actionName>run</actionName>
+ <goals>
+ <goal>package</goal>
+ <goal>nbm:cluster</goal>
+ <goal>nbm:run-ide</goal>
+ </goals>
+ </action>
+ <action>
+ <actionName>debug</actionName>
+ <goals>
+ <goal>package</goal>
+ <goal>nbm:cluster</goal>
+ <goal>nbm:run-ide</goal>
+ </goals>
+ <properties>
+ <jpda.listen>true</jpda.listen>
+ <netbeans.run.params>-J-Xdebug -J-Xnoagent -J-Xrunjdwp:transport=dt_socket,suspend=n,server=n,address=${jpda.address}</netbeans.run.params>
+ </properties>
+ </action>
+</actions>
View
251 pom.xml
@@ -12,7 +12,7 @@
<artifactId>nbscala</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>nbscala</name>
+ <name>Scala Support for NetBeans</name>
<url>http://blogtrader.net</url>
<description>NetBeans Plugins for Scala</description>
<organization>
@@ -31,6 +31,13 @@
<role>BDFL</role>
</roles>
</developer>
+ <developer>
+ <id>svennb</id>
+ <name>Sven Reimers</name>
+ <email>sreimers [at] gmail.com</email>
+ <url>http://nbguru.blogspot.com</url>
+ <timezone>+2</timezone>
+ </developer>
</developers>
<licenses>
@@ -63,51 +70,26 @@
</properties>
<repositories>
+ <!--
+ Repository hosting NetBeans modules, especially APIs.
+ Versions are based on IDE releases, e.g.: RELEASE691
+ To create your own repository, use: nbm:populate-repository
+ -->
<repository>
<id>netbeans</id>
<name>NetBeans Platform Maven Repository</name>
<url>http://bits.netbeans.org/maven2/</url>
</repository>
</repositories>
-
- <profiles>
- <profile>
- <!-- @see http://maven.apache.org/general.html#tools-jar-dependency -->
- <id>default-tools.jar</id>
- <activation>
- <property>
- <name>java.vendor</name>
- <value>Sun Microsystems Inc.</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.sun</groupId>
- <artifactId>tools</artifactId>
- <version>1.4.2</version>
- <scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>run-ide</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <run.arguments></run.arguments>
- </properties>
- </profile>
- <profile>
- <id>debug-ide</id>
- <properties>
- <run.arguments>-J-Xdebug -J-Xnoagent -J-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000</run.arguments>
- </properties>
- </profile>
- </profiles>
-
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
<!-- ***************************************************************************************************************
*
*
@@ -122,160 +104,75 @@
<pluginManagement>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>nbm-maven-plugin</artifactId>
+ <version>3.5</version>
+ <configuration>
+ <cluster>nbscala</cluster>
+ </configuration>
+ </plugin>
+ <plugin>
+ <!-- NetBeans 6.9+ requires JDK 6 -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>2.3.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.5</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.3</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>1.2.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-8</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
- <version>2.3.1</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.0</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.3</version>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
- </plugin>
- <plugin>
+ <plugin>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
- <executions>
- <execution>
- <phase>process-resources</phase> <!-- to support mix java/scala -->
+ <version>2.15.2</version>
+ <executions>
+ <execution>
<goals>
- <goal>add-source</goal> <!-- to support mix java/scala -->
<goal>compile</goal>
- <goal>testCompile</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <scalaVersion>${scala.version}</scalaVersion>
- <jvmArgs>
- <jvmArg>-Xms64m</jvmArg>
- <jvmArg>-Xmx512m</jvmArg>
- <jvmArg>-Xss64m</jvmArg> <!-- to avoid StackOverFlowError -->
- </jvmArgs>
- <args>
- <arg>-target:jvm-1.5</arg>
- <arg>-make:transitivenocp</arg>
- <arg>-dependencyfile</arg>
- <arg>${project.build.directory}/.scala_dependencies</arg>
- </args>
- <compilerPlugins>
- <complierPlugin>
- <groupId>org.scala-lang.plugins</groupId>
- <artifactId>continuations</artifactId>
- <version>${scala.version}</version>
- </complierPlugin>
- </compilerPlugins>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.3.1</version>
+ <configuration>
+ <!-- to have the jar plugin pickup the nbm generated manifest -->
+ <useDefaultManifestFile>true</useDefaultManifestFile>
</configuration>
</plugin>
-
</plugins>
</pluginManagement>
-
- <!-- ***********************************************************************************************************
- *
- *
- *
- ************************************************************************************************************ -->
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <useDefaultManifestFile>true</useDefaultManifestFile> <!-- to have the jar plugin pickup the nbm generated manifest -->
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>nbm-maven-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <descriptor>src/main/nbm/module.xml</descriptor>
- <cluster>scala</cluster>
- <forcedVersion>${netbeans.version}</forcedVersion>
- <netbeansInstallDirectory>${nb.installation}</netbeansInstallDirectory> <!-- to have the goal 'nbm:populate-repository' find the installation and populating the local repository with them, set it on your maven settings.xml -->
- <netbeansInstallation>${nb.installation}</netbeansInstallation> <!-- to have the goal 'nbm:run-ide' find the installation of the local netbeans -->
- <additionalArguments>${run.arguments}</additionalArguments> <!-- to have the goal 'nbm:run-ide' under debug mode -->
- </configuration>
- </plugin>
- </plugins>
-
</build>
-
- <!-- ***************************************************************************************************************
- *
- * Project modules
- *
- **************************************************************************************************************** -->
+
+ <profiles>
+ <profile>
+ <id>updatesite</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>nbm-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>site</id>
+ <phase>package</phase>
+ <goals>
+ <goal>autoupdate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
<modules>
- <module>libs.scala</module>
+ <module>libs.scala.compiler</module>
+ <module>libs.scala.continuations</module>
+ <module>libs.scala.library</module>
<module>libs.xtc</module>
<module>scala.core</module>
<module>scala.editor</module>
View
2 scala.console/pom.xml
@@ -80,6 +80,8 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>nbm-maven-plugin</artifactId>
+ <version>3.5</version>
+ <extensions>true</extensions>
<configuration>
<publicPackages>
</publicPackages>
View
27 scala.core/pom.xml
@@ -181,7 +181,17 @@
<!-- subproject dependencies -->
<dependency>
<groupId>org.netbeans.modules</groupId>
- <artifactId>org-netbeans-libs-scala</artifactId>
+ <artifactId>org-netbeans-libs-scala-compiler</artifactId>
+ <version>${libs.scala.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.modules</groupId>
+ <artifactId>org-netbeans-libs-scala-library</artifactId>
+ <version>${libs.scala.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.modules</groupId>
+ <artifactId>org-netbeans-libs-scala-continuations</artifactId>
<version>${libs.scala.version}</version>
</dependency>
<dependency>
@@ -197,14 +207,29 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
</plugin>
<plugin>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
+ <version>2.15.2</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>nbm-maven-plugin</artifactId>
+ <version>3.5</version>
+ <extensions>true</extensions>
<configuration>
<publicPackages>
<publicPackage>org.netbeans.api.language.util.lex</publicPackage>
View
0 ...ns/modules/scala/core/rats/Character.rats → ...ns/modules/scala/core/rats/Character.rats
File renamed without changes.
View
0 ...s/modules/scala/core/rats/Identifier.rats → ...s/modules/scala/core/rats/Identifier.rats
File renamed without changes.
View
0 ...eans/modules/scala/core/rats/Keyword.rats → ...eans/modules/scala/core/rats/Keyword.rats
File renamed without changes.
View
0 ...s/modules/scala/core/rats/LexerScala.java → ...s/modules/scala/core/rats/LexerScala.java
File renamed without changes.
View
0 ...s/modules/scala/core/rats/LexerScala.rats → ...s/modules/scala/core/rats/LexerScala.rats
File renamed without changes.
View
0 ...eans/modules/scala/core/rats/Literal.rats → ...eans/modules/scala/core/rats/Literal.rats
File renamed without changes.
View
0 .../modules/scala/core/rats/ParserScala.java → .../modules/scala/core/rats/ParserScala.java
File renamed without changes.
View
0 .../modules/scala/core/rats/ParserScala.rats → .../modules/scala/core/rats/ParserScala.rats
File renamed without changes.
View
0 .../modules/scala/core/rats/ParserState.java → .../modules/scala/core/rats/ParserState.java
File renamed without changes.
View
0 ...eans/modules/scala/core/rats/Spacing.rats → ...eans/modules/scala/core/rats/Spacing.rats
File renamed without changes.
View
0 ...tbeans/modules/scala/core/rats/State.rats → ...tbeans/modules/scala/core/rats/State.rats
File renamed without changes.
View
0 ...beans/modules/scala/core/rats/Symbol.rats → ...beans/modules/scala/core/rats/Symbol.rats
File renamed without changes.
View
0 ...eans/modules/scala/core/rats/Unicode.rats → ...eans/modules/scala/core/rats/Unicode.rats
File renamed without changes.
View
0 ...netbeans/modules/scala/core/rats/Xml.rats → ...netbeans/modules/scala/core/rats/Xml.rats
File renamed without changes.
View
14 scala.debugger.projects/pom.xml
@@ -178,7 +178,17 @@
<!-- subproject dependencies -->
<dependency>
<groupId>org.netbeans.modules</groupId>
- <artifactId>org-netbeans-libs-scala</artifactId>
+ <artifactId>org-netbeans-libs-scala-compiler</artifactId>
+ <version>${libs.scala.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.modules</groupId>
+ <artifactId>org-netbeans-libs-scala-library</artifactId>
+ <version>${libs.scala.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.modules</groupId>
+ <artifactId>org-netbeans-libs-scala-continuations</artifactId>
<version>${libs.scala.version}</version>
</dependency>
<dependency>
@@ -198,6 +208,8 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>nbm-maven-plugin</artifactId>
+ <version>3.5</version>
+ <extensions>true</extensions>
<configuration>
<publicPackages>
</publicPackages>
View
14 scala.debugger/pom.xml
@@ -128,7 +128,17 @@
<!-- subproject dependencies -->
<dependency>
<groupId>org.netbeans.modules</groupId>
- <artifactId>org-netbeans-libs-scala</artifactId>
+ <artifactId>org-netbeans-libs-scala-compiler</artifactId>
+ <version>${libs.scala.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.modules</groupId>
+ <artifactId>org-netbeans-libs-scala-library</artifactId>
+ <version>${libs.scala.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.modules</groupId>
+ <artifactId>org-netbeans-libs-scala-continuations</artifactId>
<version>${libs.scala.version}</version>
</dependency>
<dependency>
@@ -153,6 +163,8 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>nbm-maven-plugin</artifactId>
+ <version>3.5</version>
+ <extensions>true</extensions>
<configuration>
<publicPackages>
</publicPackages>
View
14 scala.editor/pom.xml
@@ -254,7 +254,17 @@
<!-- subproject dependencies -->
<dependency>
<groupId>org.netbeans.modules</groupId>
- <artifactId>org-netbeans-libs-scala</artifactId>
+ <artifactId>org-netbeans-libs-scala-compiler</artifactId>
+ <version>${libs.scala.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.modules</groupId>
+ <artifactId>org-netbeans-libs-scala-library</artifactId>
+ <version>${libs.scala.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.modules</groupId>
+ <artifactId>org-netbeans-libs-scala-continuations</artifactId>
<version>${libs.scala.version}</version>
</dependency>
<dependency>
@@ -283,6 +293,8 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>nbm-maven-plugin</artifactId>
+ <version>3.5</version>
+ <extensions>true</extensions>
<configuration>
<publicPackages>
</publicPackages>
View
2 scala.platform/pom.xml
@@ -76,6 +76,8 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>nbm-maven-plugin</artifactId>
+ <version>3.5</version>
+ <extensions>true</extensions>
<configuration>
<publicPackages>
<publicPackage>org.netbeans.api.scala.platform</publicPackage>
View
14 scala.project/pom.xml
@@ -209,7 +209,17 @@
<!-- subproject dependencies -->
<dependency>
<groupId>org.netbeans.modules</groupId>
- <artifactId>org-netbeans-libs-scala</artifactId>
+ <artifactId>org-netbeans-libs-scala-compiler</artifactId>
+ <version>${libs.scala.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.modules</groupId>
+ <artifactId>org-netbeans-libs-scala-library</artifactId>
+ <version>${libs.scala.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.modules</groupId>
+ <artifactId>org-netbeans-libs-scala-continuations</artifactId>
<version>${libs.scala.version}</version>
</dependency>
<dependency>
@@ -239,6 +249,8 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>nbm-maven-plugin</artifactId>
+ <version>3.5</version>
+ <extensions>true</extensions>
<configuration>
<publicPackages>
<publicPackage>org.netbeans.modules.scala.project.api</publicPackage>
View
14 scala.refactoring/pom.xml
@@ -211,7 +211,17 @@
<!-- subproject dependencies -->
<dependency>
<groupId>org.netbeans.modules</groupId>
- <artifactId>org-netbeans-libs-scala</artifactId>
+ <artifactId>org-netbeans-libs-scala-library</artifactId>
+ <version>${libs.scala.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.modules</groupId>
+ <artifactId>org-netbeans-libs-scala-compiler</artifactId>
+ <version>${libs.scala.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.modules</groupId>
+ <artifactId>org-netbeans-libs-scala-continuations</artifactId>
<version>${libs.scala.version}</version>
</dependency>
<dependency>
@@ -235,6 +245,8 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>nbm-maven-plugin</artifactId>
+ <version>3.5</version>
+ <extensions>true</extensions>
<configuration>
<publicPackages>
</publicPackages>
View
2 scala.stdplatform/pom.xml
@@ -114,6 +114,8 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>nbm-maven-plugin</artifactId>
+ <version>3.5</version>
+ <extensions>true</extensions>
<configuration>
<publicPackages>
<publicPackage>org.netbeans.modules.scala.stdplatform</publicPackage>

0 comments on commit 520b5d6

Please sign in to comment.