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.

Sign up for GitHub

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

Feature/master/update_to_nb_15_jdk17 #35

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Feature/master/update_to_nb_15_jdk17 #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cfe68f2
update NB version and dependencies
akronenw Sep 22, 2022
151ab91
fix build after dependency updates
Sep 22, 2022
c55990e
start fixing unit tests
Sep 22, 2022
dd2605d
fix unit tests
Sep 26, 2022
6b748ac
bring back the headless toolkit but with a wrapper
Sep 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
140 changes: 57 additions & 83 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,27 +23,11 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<netbeans.version>RELEASE82</netbeans.version>
<netbeans.version>RELEASE150</netbeans.version>
<netbeans.run.params.ide/>
<netbeans.run.params>${netbeans.run.params.ide} -J-Dnetbeans.full.hack=true</netbeans.run.params>
</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</name>
<url>http://bits.netbeans.org/nexus/content/groups/netbeans</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>

<dependencies>
<!--
<dependency>
Expand Down Expand Up @@ -149,6 +133,11 @@
<artifactId>org-netbeans-modules-parsing-indexing</artifactId>
<version>${netbeans.version}</version>
</dependency>
<dependency>
<groupId>org.netbeans.modules</groupId>
<artifactId>org-netbeans-modules-parsing-nb</artifactId>
<version>${netbeans.version}</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-util-ui</artifactId>
Expand Down Expand Up @@ -218,6 +207,11 @@
<artifactId>org-netbeans-modules-projectapi</artifactId>
<version>${netbeans.version}</version>
</dependency>
<dependency>
<groupId>org.netbeans.modules</groupId>
<artifactId>org-netbeans-modules-projectapi-nb</artifactId>
<version>${netbeans.version}</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-netbeans-modules-project-ant</artifactId>
Expand All @@ -226,7 +220,7 @@
<!-- TODO: causes "friend" error. Not sure if we actually need it though -->
<!--
<dependency>
<groupId>org.netbeans.modules</groupId>
<groupId>org.netbeans.api</groupId>
<artifactId>org-netbeans-modules-projectui</artifactId>
<version>${netbeans.version}</version>
</dependency>
Expand Down Expand Up @@ -261,7 +255,7 @@
<version>${netbeans.version}</version>
</dependency>
<dependency>
<groupId>org.netbeans.modules</groupId>
<groupId>org.netbeans.api</groupId>
<artifactId>org-netbeans-modules-gsf-testrunner</artifactId>
<version>${netbeans.version}</version>
</dependency>
Expand Down Expand Up @@ -293,12 +287,12 @@
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
<version>4.0.0</version>
<version>5.12.1</version>
</dependency>
<dependency>
<groupId>org.pegdown</groupId>
<artifactId>pegdown</artifactId>
<version>1.4.0</version>
<version>1.6.0</version>
</dependency>
<dependency>
<groupId>com.moandjiezana.toml</groupId>
Expand All @@ -308,34 +302,20 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>14.0.1</version>
<version>31.1-jre</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.1</version>
<version>3.12.0</version>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>3.0</version>
<version>5.1.0</version>
</dependency>

<!-- Test Dependencies -->
<!-- Project API Implementation -->
<dependency>
<groupId>org.netbeans.modules</groupId>
<artifactId>org-netbeans-modules-projectapi-nb</artifactId>
<version>${netbeans.version}</version>
<scope>test</scope>
</dependency>
<!-- Parsing API IDE Bridge -->
<dependency>
<groupId>org.netbeans.modules</groupId>
<artifactId>org-netbeans-modules-parsing-nb</artifactId>
<version>${netbeans.version}</version>
<scope>test</scope>
</dependency>
<!-- Projects SPI (Internal) -->
<dependency>
<groupId>org.netbeans.modules</groupId>
Expand All @@ -360,31 +340,19 @@
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
<version>1.3</version> <!-- JUnit 4.10 needs 1.1 -->
<version>1.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.10</version> <!-- NbJunit needs 4.10 -->
<version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.9.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
<version>1.5.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
<version>1.5.1</version>
<artifactId>mockito-core</artifactId>
<version>4.8.0</version>
<scope>test</scope>
</dependency>

Expand Down Expand Up @@ -421,29 +389,29 @@
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<groupId>org.apache.netbeans.utilities</groupId>
<artifactId>nbm-maven-plugin</artifactId>
<version>4.1</version>
<version>4.8</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.18.1</version>
<version>3.0.0-M7</version>
</plugin>
</plugins>
</pluginManagement>

<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<groupId>org.apache.netbeans.utilities</groupId>
<artifactId>nbm-maven-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<licenseName>GPL3</licenseName>
<licenseFile>LICENSE.txt</licenseFile>
<moduleDependencies>
<dependency>
<id>org.netbeans.modules:org-netbeans-modules-gsf-testrunner</id>
<id>org.netbeans.api:org-netbeans-modules-gsf-testrunner</id>
<type>impl</type>
</dependency>
<dependency>
Expand All @@ -457,21 +425,20 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<version>3.3.0</version>
<configuration>
<!-- to have the jar plugin pickup the nbm generated manifest -->
<useDefaultManifestFile>true</useDefaultManifestFile>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>

<plugin>
<!-- NetBeans 7.4+ requires JDK 7 -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<version>3.10.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<release>17</release>
<useIncrementalCompilation>true</useIncrementalCompilation>
<compilerArgument>-Xlint:unchecked</compilerArgument>
</configuration>
Expand All @@ -480,7 +447,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>javacc-maven-plugin</artifactId>
<version>2.6</version>
<version>3.0.1</version>
<executions>
<execution>
<id>generate-parser</id>
Expand All @@ -495,14 +462,14 @@
<dependency>
<groupId>net.java.dev.javacc</groupId>
<artifactId>javacc</artifactId>
<version>7.0.2</version>
<version>7.0.12</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.5.0</version>
<version>3.1.0</version>
<executions>
<execution>
<id>map-tokens</id>
Expand All @@ -525,7 +492,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.9.1</version>
<version>3.3.0</version>
<executions>
<execution>
<id>compile-build-addon</id>
Expand Down Expand Up @@ -568,11 +535,18 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<!--
java.awt.headless=true: Stop tests hijacking UI on development machine
jna.nosys=true: Don't try to load JNA from the host system, use our dependency instead (needed for Appveyor, which has an old JNA on it)
noverify: Fix for JDK bug with PowerMock
-->
<argLine>-Djava.awt.headless=true -Djna.nosys=true -noverify</argLine>
java.awt.headless=true: Stop tests hijacking UI on development machine
jna.nosys=true: Don't try to load JNA from the host system, use our dependency instead (needed for Appveyor, which has an old JNA on it)
noverify: Fix for JDK bug with PowerMock
-->
<argLine>
-Djava.awt.headless=true
-Djna.nosys=true
--add-opens=java.desktop/javax.swing.text=ALL-UNNAMED
--add-opens=java.desktop/javax.swing.text.html=ALL-UNNAMED
--add-opens=java.base/java.net=ALL-UNNAMED
--add-opens=java.prefs/java.util.prefs=ALL-UNNAMED
</argLine>
<forkCount>1</forkCount>
<reuseForks>false</reuseForks>
<excludes>
Expand All @@ -585,7 +559,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<version>3.3.0</version>
<executions>
<execution>
<id>set-up-unit-test-data</id>
Expand Down Expand Up @@ -635,7 +609,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.15</version>
<version>3.0.0-M7</version>
<configuration>
<systemProperties>
<property>
Expand Down Expand Up @@ -663,7 +637,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<version>3.3.0</version>

<executions>
<execution>
Expand All @@ -685,9 +659,9 @@
</plugin>

<plugin>
<groupId>com.mycila.maven-license-plugin</groupId>
<artifactId>maven-license-plugin</artifactId>
<version>1.9.0</version>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>4.2.rc3</version>
<executions>
<execution>
<goals>
Expand Down Expand Up @@ -746,8 +720,8 @@

<plugin>
<groupId>org.jasig.maven</groupId>
<artifactId>maven-notice-plugin</artifactId>
<version>1.0.4</version>
<artifactId>notice-maven-plugin</artifactId>
<version>2.0.0</version>
<configuration>
<licenseMapping>
<mapping>license-mappings.xml</mapping>
Expand Down
12 changes: 5 additions & 7 deletions src/test/java/com/github/drrb/rust/netbeans/cargo/CargoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,21 @@
*/
package com.github.drrb.rust.netbeans.cargo;

import static com.github.drrb.rust.netbeans.cargo.Cargo.*;
import com.github.drrb.rust.netbeans.commandrunner.CommandFuture;
import com.github.drrb.rust.netbeans.commandrunner.CommandRunner;
import com.github.drrb.rust.netbeans.commandrunner.HumbleCommandFuture;
import com.github.drrb.rust.netbeans.commandrunner.Shell;
import com.github.drrb.rust.netbeans.configuration.RustConfiguration;
import com.github.drrb.rust.netbeans.project.RustProject;
import static com.github.drrb.rust.netbeans.test.Matchers.isProcess;
import com.github.drrb.rust.netbeans.test.TemporaryPreferences;
import java.io.File;
import static org.junit.Assert.assertEquals;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;

import java.io.File;

import static com.github.drrb.rust.netbeans.cargo.Cargo.*;
import static com.github.drrb.rust.netbeans.test.Matchers.isProcess;
import static org.junit.Assert.assertEquals;
import static org.mockito.Matchers.argThat;
import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

Expand Down
Loading