jlahoda closed pull request #4: Upgrading to JDK 11 and Apache NetBeans 10 URL: https://github.com/apache/incubator-netbeans-jackpot30/pull/4
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/.travis.yml b/.travis.yml index 48e04b6..3160af1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,13 +16,13 @@ # under the License. language: java jdk: - - openjdk10 + - openjdk11 before_script: - - wget 'http://www.apache.org/dyn/closer.lua?action=download&filename=incubator/netbeans/incubating-netbeans-java/incubating-9.0/incubating-netbeans-java-9.0-bin.zip' -O /tmp/incubating-netbeans-java-9.0-bin.zip - - (cd $HOME; unzip /tmp/incubating-netbeans-java-9.0-bin.zip) + - wget 'http://www.apache.org/dyn/closer.lua?action=download&filename=incubator/netbeans/incubating-netbeans/incubating-10.0/incubating-netbeans-10.0-bin.zip' -O /tmp/incubating-netbeans-10.0-bin.zip + - (cd $HOME; unzip /tmp/incubating-netbeans-10.0-bin.zip) - unset _JAVA_OPTIONS script: - - export JDK10=$JAVA_HOME + - export JDK11=$JAVA_HOME - jdk_switcher use oraclejdk8 - (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 -DJDK10=$JDK10 build-and-test) + - (cd cmdline; ant -Dnbplatform.default.harness.dir=$HOME/netbeans/harness -DNETBEANS_PLATFORM=$HOME/netbeans -DJDK11=$JDK11 build-and-test) diff --git a/cmdline/README.md b/cmdline/README.md index d73ccd9..e9f4463 100644 --- a/cmdline/README.md +++ b/cmdline/README.md @@ -27,21 +27,21 @@ This tool allows to run NetBeans Java code checker without the NetBeans IDE. Thi #### To Build -* NetBeans 9.0 -* JDK 8 and JDK 10 +* NetBeans 10.0 +* JDK 8 and JDK 11 * bash * ant 1.9.9 or above #### To Run -* JDK 10 +* JDK 11 ### Building Build using: ``` -$ ant -DNETBEANS_PLATFORM=<path-to-NetBeans-9.0> -DJDK10=<path-to-JDK-10> build-and-test +$ ant -DNETBEANS_PLATFORM=<path-to-NetBeans-10.0> -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 ec36182..a22e2a8 100644 --- a/cmdline/build.xml +++ b/cmdline/build.xml @@ -51,7 +51,7 @@ <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.nbjdk.home" value="${JDK10}" /> + <property name="test.nbjdk.home" value="${JDK11}" /> <property name="jackpot.root" location="${jackpot.root}" /> <target name="clean" /> <target name="build" /> @@ -62,13 +62,13 @@ <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.nbjdk.home" value="${JDK10}" /> + <property name="test.nbjdk.home" value="${JDK11}" /> <property name="jackpot.root" location="${jackpot.root}" /> </ant> <property environment="env"/> <exec executable="build/test/scripted/run" dir="tool" failonerror="true"> - <env key="JAVA_HOME" path="${JDK10}" /> - <env key="PATH" path="${JDK10}/bin:${env.PATH}" /> + <env key="JAVA_HOME" path="${JDK11}" /> + <env key="PATH" path="${JDK11}/bin:${env.PATH}" /> </exec> </target> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
