Update to NetBeans 11.1
diff --git a/.travis.yml b/.travis.yml
index 2416226..e4effbf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,14 +15,21 @@
# specific language governing permissions and limitations
# under the License.
language: java
+addons:
+ apt:
+ packages:
+ - ant
+ - ant-optional
+ - openjdk-8-jdk
jdk:
- openjdk11
before_script:
- - wget 'http://www.apache.org/dyn/closer.lua?action=download&filename=incubator/netbeans/incubating-netbeans/incubating-11.0/incubating-netbeans-11.0-bin.zip' -O /tmp/incubating-netbeans-11.0-bin.zip
- - (cd $HOME; unzip /tmp/incubating-netbeans-11.0-bin.zip)
+ - wget 'https://www.apache.org/dist/netbeans/netbeans/11.1/netbeans-11.1-bin.zip' -O /tmp/netbeans-11.1-bin.zip
+ - (cd $HOME; unzip /tmp/netbeans-11.1-bin.zip)
- unset _JAVA_OPTIONS
script:
- export JDK11=$JAVA_HOME
- - jdk_switcher use oraclejdk8
+ - export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
+ - export PATH=$JAVA_HOME/bin:$PATH
- (cd cmdline; ant -Dnbplatform.default.harness.dir=$HOME/netbeans/harness rat)
- (cd cmdline; ant -Dnbplatform.default.harness.dir=$HOME/netbeans/harness -DNETBEANS_PLATFORM=$HOME/netbeans -DJDK11=$JDK11 build-and-test)
diff --git a/NOTICE b/NOTICE
index f868b33..c2055df 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache NetBeans Jackpot 3.0
-Copyright 2017-2018 The Apache Software Foundation
+Copyright 2017-2019 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/cmdline/README.md b/cmdline/README.md
index d774b8e..9aa932e 100644
--- a/cmdline/README.md
+++ b/cmdline/README.md
@@ -27,7 +27,7 @@
#### To Build
-* Apache NetBeans 11.0
+* Apache NetBeans 11.1
* JDK 8 and JDK 11
* bash
* Apache ant 1.9.9 or above
@@ -42,7 +42,7 @@
Build using:
```
-$ ant -DNETBEANS_PLATFORM=<path-to-NetBeans-11.0> -DJDK11=<path-to-JDK-11> build-and-test
+$ ant -DNETBEANS_PLATFORM=<path-to-NetBeans-11.1> -DJDK11=<path-to-JDK-11> build-and-test
```
The built product is in tool/build/jackpot.
diff --git a/cmdline/build.xml b/cmdline/build.xml
index a94bbf2..848ad18 100644
--- a/cmdline/build.xml
+++ b/cmdline/build.xml
@@ -21,6 +21,15 @@
<!-- If you delete this file and reopen the project it will be recreated. -->
<project name="cmdline" basedir=".">
<description>Builds the module suite cmdline.</description>
+
+ <condition property="nbplatform.default.netbeans.dest.dir" value="${NETBEANS_PLATFORM}">
+ <isset property="NETBEANS_PLATFORM" />
+ </condition>
+
+ <condition property="nbplatform.default.harness.dir" value="${NETBEANS_PLATFORM}/harness">
+ <isset property="NETBEANS_PLATFORM" />
+ </condition>
+
<import file="nbproject/build-impl.xml"/>
<!-- <import file="../suite-common.xml"/>-->
@@ -43,14 +52,14 @@
</target>
<target name="build-and-test">
- <property name="version" value="11.0" />
+ <property name="version" value="11.1" />
<condition property="jackpot.root" value="${basedir}" else="${basedir}/..">
<available file="${basedir}/LICENSE" />
</condition>
<ant dir="${basedir}" inheritAll="false" inheritRefs="false">
<property name="nbplatform.default.harness.dir" value="${NETBEANS_PLATFORM}/harness" />
<property name="nbplatform.default.netbeans.dest.dir" value="${NETBEANS_PLATFORM}" />
- <property name="test.run.args" value="--add-exports=jdk.javadoc/com.sun.tools.javadoc.main=ALL-UNNAMED" />
+ <property name="test.run.args" value="--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED" />
<property name="test.nbjdk.home" value="${JDK11}" />
<property name="jackpot.root" location="${jackpot.root}" />
<target name="clean" />
@@ -61,7 +70,7 @@
<property name="nbplatform.default.harness.dir" value="${NETBEANS_PLATFORM}/harness" />
<property name="nbplatform.default.netbeans.dest.dir" value="${NETBEANS_PLATFORM}" />
<property name="continue.after.failing.tests" value="false" />
- <property name="test.run.args" value="--add-exports=jdk.javadoc/com.sun.tools.javadoc.main=ALL-UNNAMED" />
+ <property name="test.run.args" value="--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED" />
<property name="test.nbjdk.home" value="${JDK11}" />
<property name="jackpot.root" location="${jackpot.root}" />
</ant>
diff --git a/cmdline/maven/pom.xml b/cmdline/maven/pom.xml
index 82fd771..4a29e9e 100644
--- a/cmdline/maven/pom.xml
+++ b/cmdline/maven/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.apache.netbeans.modules.jackpot30</groupId>
<artifactId>jackpot30-maven-plugin</artifactId>
- <version>11.0</version>
+ <version>11.1</version>
<packaging>maven-plugin</packaging>
<name>Jackpot 3.0 Command Line Tool Maven Bridge</name>
diff --git a/cmdline/maven/src/main/java/org/netbeans/modules/jackpot30/maven/RunJackpot30.java b/cmdline/maven/src/main/java/org/netbeans/modules/jackpot30/maven/RunJackpot30.java
index 567fe18..7eedb75 100644
--- a/cmdline/maven/src/main/java/org/netbeans/modules/jackpot30/maven/RunJackpot30.java
+++ b/cmdline/maven/src/main/java/org/netbeans/modules/jackpot30/maven/RunJackpot30.java
@@ -92,7 +92,7 @@
}
cmdLine.addAll(0, Arrays.asList(launcher.toAbsolutePath().toString(),
"-classpath", Main.class.getProtectionDomain().getCodeSource().getLocation().getPath(),
- "--add-exports=jdk.javadoc/com.sun.tools.javadoc.main=ALL-UNNAMED",
+ "--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
"--add-opens=java.base/java.net=ALL-UNNAMED",
"--add-opens=java.desktop/sun.awt=ALL-UNNAMED",
Main.class.getCanonicalName()));
diff --git a/cmdline/maven/src/test/java/org/netbeans/modules/jackpot30/maven/RunJackpot30Test.java b/cmdline/maven/src/test/java/org/netbeans/modules/jackpot30/maven/RunJackpot30Test.java
index 14a05a3..3808034 100644
--- a/cmdline/maven/src/test/java/org/netbeans/modules/jackpot30/maven/RunJackpot30Test.java
+++ b/cmdline/maven/src/test/java/org/netbeans/modules/jackpot30/maven/RunJackpot30Test.java
@@ -67,7 +67,7 @@
Process p = Runtime.getRuntime().exec(new String[] {
maven,
- "-Djackpot.plugin.version=11.0",
+ "-Djackpot.plugin.version=11.1",
"-q",
"jackpot30:analyze"
}, null, testDir);
diff --git a/cmdline/tool/scripts/jackpot b/cmdline/tool/scripts/jackpot
index f30015e..d7774fd 100755
--- a/cmdline/tool/scripts/jackpot
+++ b/cmdline/tool/scripts/jackpot
@@ -18,4 +18,4 @@
JACKPOT_JAR=`readlink -f "$0"`
JACKPOT_JAR=`dirname "$JACKPOT_JAR"`/jackpot.jar
-java -XX:+IgnoreUnrecognizedVMOptions --add-exports=jdk.javadoc/com.sun.tools.javadoc.main=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.desktop/sun.awt=ALL-UNNAMED -classpath `dirname "$JACKPOT_JAR"`/jackpot.jar org.netbeans.modules.jackpot30.cmdline.Main "$@"
+java -XX:+IgnoreUnrecognizedVMOptions --add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.desktop/sun.awt=ALL-UNNAMED -classpath `dirname "$JACKPOT_JAR"`/jackpot.jar org.netbeans.modules.jackpot30.cmdline.Main "$@"
diff --git a/cmdline/tool/test/unit/src/org/netbeans/modules/jackpot30/cmdline/Utils.java b/cmdline/tool/test/unit/src/org/netbeans/modules/jackpot30/cmdline/Utils.java
index 4d5db0c..c4b1f73 100644
--- a/cmdline/tool/test/unit/src/org/netbeans/modules/jackpot30/cmdline/Utils.java
+++ b/cmdline/tool/test/unit/src/org/netbeans/modules/jackpot30/cmdline/Utils.java
@@ -43,7 +43,7 @@
} else {
//JDK 9+:
return Arrays.asList(javaHome + "/bin/java",
- "--add-exports=jdk.javadoc/com.sun.tools.javadoc.main=ALL-UNNAMED",
+ "--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
"--add-opens=java.base/java.net=ALL-UNNAMED", //stream handler factory
"--add-opens=java.desktop/sun.awt=ALL-UNNAMED" //org.openide.util.RequestProcessor$TopLevelThreadGroup to method sun.awt.AppContext.getAppContext()
);
@@ -62,7 +62,7 @@
} else {
//JDK 9+:
return Arrays.asList(javaHome + "/bin/javac",
- "-J--add-exports=jdk.javadoc/com.sun.tools.javadoc.main=ALL-UNNAMED",
+ "-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
"-J--add-opens=java.base/java.net=ALL-UNNAMED", //stream handler factory
"-J--add-opens=java.desktop/sun.awt=ALL-UNNAMED", //org.openide.util.RequestProcessor$TopLevelThreadGroup to method sun.awt.AppContext.getAppContext()
"-J--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED", //Illegal reflective access by org.netbeans.modules.jackpot30.cmdline.ProcessorImpl to field com.sun.tools.javac.processing.JavacProcessingEnvironment.context
