Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed project to allow building with and running inside of netbeans 8.2 #170

Merged
merged 5 commits into from Nov 8, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
33 changes: 19 additions & 14 deletions pom.xml
Expand Up @@ -58,7 +58,7 @@
we should build it using lower version NetBeans to get it to be able installed both
on lower and higher version, unless we use un-compatible features of higher version.
-->
<netbeans.version>RELEASE81</netbeans.version>
<netbeans.version>RELEASE82</netbeans.version>

<scala.version>2.11.3-nbscala</scala.version> <!-- use nbscala patched scala runtime @see libs.local-->
<sbt.version>0.13.1</sbt.version>
Expand All @@ -69,19 +69,19 @@
<libs.scala.version>2.11.3.1</libs.scala.version>
<libs.scalariform.version>0.1.5.2</libs.scalariform.version>
<libs.xtc.version>1.15.2</libs.xtc.version>
<scala.console.version>1.8.1.0</scala.console.version>
<scala.core.version>1.8.1.0</scala.core.version>
<scala.debugger.version>1.8.1.0</scala.debugger.version>
<scala.debugger.projects.version>1.8.1.1</scala.debugger.projects.version>
<scala.editor.version>1.8.1.1</scala.editor.version>
<scala.fontscolors.version>1.8.1.1</scala.fontscolors.version>
<scala.maven.version>1.8.1.0</scala.maven.version>
<scala.platform.version>1.8.1.0</scala.platform.version>
<scala.project.version>1.8.1.0</scala.project.version>
<scala.refactoring.version>1.8.1.0</scala.refactoring.version>
<scala.sbt.version>1.8.1.0</scala.sbt.version>
<scala.sbt.project.version>1.8.1.0</scala.sbt.project.version>
<scala.stdplatform.version>1.8.1.0</scala.stdplatform.version>
<scala.console.version>1.8.2.0</scala.console.version>
<scala.core.version>1.8.2.0</scala.core.version>
<scala.debugger.version>1.8.2.0</scala.debugger.version>
<scala.debugger.projects.version>1.8.2.0</scala.debugger.projects.version>
<scala.editor.version>1.8.2.0</scala.editor.version>
<scala.fontscolors.version>1.8.2.0</scala.fontscolors.version>
<scala.maven.version>1.8.2.0</scala.maven.version>
<scala.platform.version>1.8.2.0</scala.platform.version>
<scala.project.version>1.8.2.0</scala.project.version>
<scala.refactoring.version>1.8.2.0</scala.refactoring.version>
<scala.sbt.version>1.8.2.0</scala.sbt.version>
<scala.sbt.project.version>1.8.2.0</scala.sbt.project.version>
<scala.stdplatform.version>1.8.2.0</scala.stdplatform.version>
</properties>

<repositories>
Expand Down Expand Up @@ -477,6 +477,11 @@
<artifactId>org-netbeans-modules-scala-refactoring</artifactId>
<version>${scala.refactoring.version}</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-netbeans-modules-csl-types</artifactId>
<version>${netbeans.version}</version>
</dependency>

<!-- The clusters platform, java, ide and nb represent a full functioning Netbeans IDE -->
<dependency>
Expand Down
5 changes: 4 additions & 1 deletion scala.core/pom.xml
Expand Up @@ -158,7 +158,10 @@
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-windows</artifactId>
</dependency>

<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-netbeans-modules-csl-types</artifactId>
</dependency>
<!-- maven or scalac transitive dependencies (scalac will check class dependencies deeply): <scope>runtime</scope> -->
<!-- <dependency>
<groupId>org.netbeans.modules</groupId>
Expand Down
4 changes: 4 additions & 0 deletions scala.debugger.projects/pom.xml
Expand Up @@ -134,6 +134,10 @@
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-windows</artifactId>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-netbeans-modules-csl-types</artifactId>
</dependency>

<dependency> <!-- to avoid transitive dependencies on following jars that are brought in by log4j-1.2.15 -->
<groupId>log4j</groupId>
Expand Down
4 changes: 4 additions & 0 deletions scala.editor/pom.xml
Expand Up @@ -198,6 +198,10 @@
<groupId>org.netbeans.modules</groupId>
<artifactId>org-netbeans-modules-options-editor</artifactId>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-netbeans-modules-csl-types</artifactId>
</dependency>

<!-- subproject dependencies -->
<dependency>
Expand Down
4 changes: 4 additions & 0 deletions scala.project/pom.xml
Expand Up @@ -166,6 +166,10 @@
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-windows</artifactId>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-netbeans-modules-csl-types</artifactId>
</dependency>

<!-- subproject dependencies -->
<dependency>
Expand Down
5 changes: 4 additions & 1 deletion scala.refactoring/pom.xml
Expand Up @@ -170,7 +170,10 @@
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-windows</artifactId>
</dependency>

<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-netbeans-modules-csl-types</artifactId>
</dependency>
<!-- subproject dependencies -->
<dependency>
<groupId>org.netbeans.modules</groupId>
Expand Down
5 changes: 4 additions & 1 deletion scala.sbt/pom.xml
Expand Up @@ -142,7 +142,10 @@
<groupId>org.netbeans.api</groupId>
<artifactId>org-netbeans-api-debugger-jpda</artifactId>
</dependency>

<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-netbeans-modules-csl-types</artifactId>
</dependency>
<dependency>
<groupId>org.netbeans.modules</groupId>
<artifactId>org-netbeans-libs-scala-library</artifactId>
Expand Down