This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new bf8c26d Changes required to build the java cluster on JDK 17.
new b5329ca Merge pull request #3278 from mbien/jdk17
bf8c26d is described below
commit bf8c26d91ea20cb7bf29b4510938f572f2202034
Author: Michael Bien <[email protected]>
AuthorDate: Tue Nov 30 22:57:16 2021 +0100
Changes required to build the java cluster on JDK 17.
- java cluster source version bump to 1.8 in properties.
- java cluster source version bump to release=8 in ant files.
- keystore command requires "-keyalg" to be set on modern JDKs.
- fixed NPE in nb-javac ant task when only 'release' is specified.
- updated test, 1.8 is now the default.
---
.../project/queries/SourceLevelQueryImplTest.java | 2 +-
extide/o.apache.tools.ant.module/build.xml | 2 +-
harness/apisupport.harness/build.xml | 2 +-
.../nbproject/project.properties | 2 +-
harness/jemmy/nbproject/project.properties | 2 +-
harness/libs.nbi.ant/nbproject/project.properties | 4 ++-
.../libs.nbi.engine/nbproject/project.properties | 2 +-
ide/csl.api/anttask/build.xml | 2 +-
ide/db/build.xml | 4 +--
java/ant.browsetask/build.xml | 2 +-
java/debugger.jpda.ant/build.xml | 2 +-
java/form.nb/nbproject/project.properties | 2 +-
java/form.refactoring/nbproject/project.properties | 2 +-
java/form/nbproject/project.properties | 2 +-
java/i18n/nbproject/project.properties | 2 +-
java/j2ee.metadata/nbproject/project.properties | 2 +-
java/java.source.ant/build.xml | 2 +-
.../nbproject/project.properties | 2 +-
java/java.testrunner/nbproject/project.properties | 2 +-
.../AntTasks/nbproject/project.properties | 2 +-
java/javawebstart/nbproject/project.properties | 2 +-
java/junit/nbproject/project.properties | 2 +-
java/maven.checkstyle/nbproject/project.properties | 2 +-
java/maven.coverage/nbproject/project.properties | 2 +-
java/maven.hints/nbproject/project.properties | 2 +-
java/maven.indexer.ui/nbproject/project.properties | 2 +-
java/maven.junit/nbproject/project.properties | 2 +-
java/maven.kit/nbproject/project.properties | 2 +-
java/maven.osgi/nbproject/project.properties | 2 +-
.../maven.persistence/nbproject/project.properties | 2 +-
.../maven.refactoring/nbproject/project.properties | 2 +-
java/maven.search/nbproject/project.properties | 3 +-
java/maven.spring/nbproject/project.properties | 3 +-
java/websvc.jaxws21/nbproject/project.properties | 2 +-
.../websvc.jaxws21api/nbproject/project.properties | 2 +-
java/xml.jaxb/nbproject/project.properties | 2 +-
.../javafx2.platform/nbproject/project.properties | 3 +-
.../nbproject/project.properties | 5 ++-
nb/updatecenters/build.xml | 2 +-
.../antsrc/org/netbeans/nbbuild/CustomJavac.java | 41 +++++++++++++---------
nbi/engine/build.xml | 9 ++---
.../build/.ant-lib/nbproject/project.properties | 2 +-
.../nbproject/project.properties | 2 +-
.../file-renamer/nbproject/project.properties | 2 +-
.../port-occupation/nbproject/project.properties | 2 +-
platform/applemenu/nbproject/project.properties | 5 +--
.../nbproject/project.properties | 2 +-
.../nbproject/project.properties | 3 +-
.../maven.profiler/nbproject/project.properties | 2 +-
profiler/profiler.api/nbproject/project.properties | 2 +-
.../profiler.freeform/nbproject/project.properties | 3 +-
.../profiler.j2se/nbproject/project.properties | 2 +-
profiler/profiler.kit/nbproject/project.properties | 3 +-
profiler/profiler.nbimpl/build.xml | 2 +-
.../profiler.nbimpl/nbproject/project.properties | 2 +-
.../profiler.nbmodule/nbproject/project.properties | 3 +-
.../nbproject/project.properties | 3 +-
.../profiler.ppoints/nbproject/project.properties | 2 +-
.../nbproject/project.properties | 3 +-
.../nbproject/project.properties | 3 +-
.../nbproject/project.properties | 2 +-
.../nbproject/project.properties | 2 +-
.../javascript2.react/nbproject/project.properties | 2 +-
webcommon/libs.jstestdriver/build.xml | 2 +-
.../libs.jstestdriver/nbproject/project.properties | 2 +-
webcommon/netserver/nbproject/project.properties | 2 +-
.../web.client.kit/nbproject/project.properties | 2 +-
webcommon/web.inspect/nbproject/project.properties | 2 +-
68 files changed, 109 insertions(+), 93 deletions(-)
diff --git
a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/SourceLevelQueryImplTest.java
b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/SourceLevelQueryImplTest.java
index dfffbcc..b12f486 100644
---
a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/SourceLevelQueryImplTest.java
+++
b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/SourceLevelQueryImplTest.java
@@ -37,7 +37,7 @@ public class SourceLevelQueryImplTest extends TestBase {
String path =
"java/junit/src/org/netbeans/modules/junit/api/JUnitSettings.java";
FileObject f = nbRoot().getFileObject(path);
assertNotNull("found " + path, f);
- assertEquals("1.6 used for an average module", "1.6",
SourceLevelQuery.getSourceLevel(f));
+ assertEquals("1.8 used for an average module", "1.8",
SourceLevelQuery.getSourceLevel(f));
}
}
diff --git a/extide/o.apache.tools.ant.module/build.xml
b/extide/o.apache.tools.ant.module/build.xml
index 0972a06..14804e8 100644
--- a/extide/o.apache.tools.ant.module/build.xml
+++ b/extide/o.apache.tools.ant.module/build.xml
@@ -35,7 +35,7 @@
<path path="${src-bridge.cp}"/>
</classpath>
</depend>
- <javac srcdir="src-bridge" destdir="build/bridge-classes"
deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}"
source="1.6" target="1.6" includeantruntime="false">
+ <javac srcdir="src-bridge" destdir="build/bridge-classes"
deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}"
release="8" includeantruntime="false">
<classpath>
<path path="${src-bridge.cp}"/>
</classpath>
diff --git a/harness/apisupport.harness/build.xml
b/harness/apisupport.harness/build.xml
index ffbb5d9..eef8ea3 100644
--- a/harness/apisupport.harness/build.xml
+++ b/harness/apisupport.harness/build.xml
@@ -50,7 +50,7 @@
<target name="compile-jnlp-launcher" depends="init,compile">
<mkdir dir="${build.dir}/jnlp-launcher-classes"/>
- <nb-javac srcdir="jnlp-src"
destdir="${build.dir}/jnlp-launcher-classes"
deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}"
source="1.6" target="1.6" includeantruntime="false">
+ <nb-javac srcdir="jnlp-src"
destdir="${build.dir}/jnlp-launcher-classes"
deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}"
release="8" includeantruntime="false">
<classpath>
<path path="${jnlp.cp}"/>
</classpath>
diff --git a/harness/apisupport.harness/nbproject/project.properties
b/harness/apisupport.harness/nbproject/project.properties
index f401cae..be11955 100644
--- a/harness/apisupport.harness/nbproject/project.properties
+++ b/harness/apisupport.harness/nbproject/project.properties
@@ -16,7 +16,7 @@
# under the License.
javac.compilerargs=-Xlint -Xlint:-serial
-javac.source=1.6
+javac.source=1.8
jnlp.cp=\
${o.n.bootstrap.dir}/lib/boot.jar:\
${openide.modules.dir}/lib/org-openide-modules.jar:\
diff --git a/harness/jemmy/nbproject/project.properties
b/harness/jemmy/nbproject/project.properties
index 1a09c97..b7f5f65 100644
--- a/harness/jemmy/nbproject/project.properties
+++ b/harness/jemmy/nbproject/project.properties
@@ -16,7 +16,7 @@
# under the License.
is.autoload=true
javac.compilerargs=-Xlint -Xlint:-serial
-javac.source=1.6
+javac.source=1.8
release.external/jemmy-2.3.1.1.jar=modules/ext/jemmy-2.3.1.1.jar
release.external/jemmy-2.3.1.1-doc.zip=docs/jemmy-2.3.1.1-doc.zip
release.external/jemmy-2.3.1.1-src.zip=docs/jemmy-2.3.1.1-src.zip
diff --git a/harness/libs.nbi.ant/nbproject/project.properties
b/harness/libs.nbi.ant/nbproject/project.properties
index 61ef8c3..9214f6e 100644
--- a/harness/libs.nbi.ant/nbproject/project.properties
+++ b/harness/libs.nbi.ant/nbproject/project.properties
@@ -15,10 +15,12 @@
# specific language governing permissions and limitations
# under the License.
is.autoload=true
-javac.source=1.6
+javac.source=1.8
+javac.target=1.8
javac.compilerargs=-Xlint -Xlint:-serial
extra.module.files=\
modules/ext/nbi-ant-tasks.jar,\
modules/ext/nbi-registries-management.jar,\
nbi/
nbm.module.author=Dmitry Lipin
+
diff --git a/harness/libs.nbi.engine/nbproject/project.properties
b/harness/libs.nbi.engine/nbproject/project.properties
index c355fc5..4c45742 100644
--- a/harness/libs.nbi.engine/nbproject/project.properties
+++ b/harness/libs.nbi.engine/nbproject/project.properties
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
is.autoload=true
-javac.source=1.6
+javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
extra.module.files=modules/ext/nbi-engine.jar
nbm.module.author=Dmitry Lipin
diff --git a/ide/csl.api/anttask/build.xml b/ide/csl.api/anttask/build.xml
index 99fce2c..10f5ebb 100644
--- a/ide/csl.api/anttask/build.xml
+++ b/ide/csl.api/anttask/build.xml
@@ -33,7 +33,7 @@
<target name="compile">
<mkdir dir="build/classes"/>
- <javac srcdir="src" destdir="build/classes"
deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}"
target="1.6" source="1.6" >
+ <javac srcdir="src" destdir="build/classes"
deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}"
release="8" >
<classpath>
<!-- cmdline Ant -->
<pathelement location="${ant.core.lib}"/>
diff --git a/ide/db/build.xml b/ide/db/build.xml
index 11226c0..b6cb927 100644
--- a/ide/db/build.xml
+++ b/ide/db/build.xml
@@ -32,7 +32,7 @@
<target name="compile-lib" depends="init,fake-jdbc-40">
<mkdir dir="${build.dir}/lib-classes" />
- <javac target="${javac.target}" srcdir="libsrc"
destdir="${build.dir}/lib-classes" deprecation="${build.compiler.deprecation}"
debug="${build.compiler.debug}" source="1.6">
+ <javac release="8" srcdir="libsrc" destdir="${build.dir}/lib-classes"
deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
<classpath>
<pathelement path="${lib.cp}"/>
</classpath>
@@ -50,7 +50,7 @@
public class RowIdLifetime {}
</echo>
<mkdir dir="${fake-jdbc-40.build}"/>
- <javac target="${javac.target}" source="1.7"
srcdir="${fake-jdbc-40.src}" destdir="${fake-jdbc-40.build}"/>
+ <javac release="8" srcdir="${fake-jdbc-40.src}"
destdir="${fake-jdbc-40.build}"/>
</target>
<target name="jar-lib" depends="compile-lib">
diff --git a/java/ant.browsetask/build.xml b/java/ant.browsetask/build.xml
index d295211..75eac94 100644
--- a/java/ant.browsetask/build.xml
+++ b/java/ant.browsetask/build.xml
@@ -25,7 +25,7 @@
<target name="nblib" depends="init">
<mkdir dir="build/antclasses"/>
- <javac srcdir="antsrc" destdir="build/antclasses"
debug="${build.compiler.debug}" deprecation="${build.compiler.deprecation}"
source="1.6" target="1.8" includeantruntime="false">
+ <javac srcdir="antsrc" destdir="build/antclasses"
debug="${build.compiler.debug}" deprecation="${build.compiler.deprecation}"
release="8" includeantruntime="false">
<classpath>
<pathelement path="${antsrc.cp}"/>
</classpath>
diff --git a/java/debugger.jpda.ant/build.xml b/java/debugger.jpda.ant/build.xml
index b19145c..3c2bec8 100644
--- a/java/debugger.jpda.ant/build.xml
+++ b/java/debugger.jpda.ant/build.xml
@@ -25,7 +25,7 @@
<target name="nblib" depends="init">
<mkdir dir="build/antclasses"/>
- <javac srcdir="antsrc" destdir="build/antclasses" source="1.6"
target="1.6" debug="true" deprecation="true">
+ <javac srcdir="antsrc" destdir="build/antclasses" source="1.8"
target="1.8" debug="true" deprecation="true">
<classpath>
<path refid="cp"/>
<pathelement location="${ant.jar}"/>
diff --git a/java/form.nb/nbproject/project.properties
b/java/form.nb/nbproject/project.properties
index 9368e10..e7cd414 100644
--- a/java/form.nb/nbproject/project.properties
+++ b/java/form.nb/nbproject/project.properties
@@ -16,6 +16,6 @@
# under the License.
is.eager=true
-javac.source=1.6
+javac.source=1.8
spec.version.base=0.33.0
requires.nb.javac=true
diff --git a/java/form.refactoring/nbproject/project.properties
b/java/form.refactoring/nbproject/project.properties
index 360091f..23ad009 100644
--- a/java/form.refactoring/nbproject/project.properties
+++ b/java/form.refactoring/nbproject/project.properties
@@ -16,6 +16,6 @@
# under the License.
is.eager=true
-javac.source=1.6
+javac.source=1.8
spec.version.base=0.32.0
requires.nb.javac=true
diff --git a/java/form/nbproject/project.properties
b/java/form/nbproject/project.properties
index 32128ff..235ca6b 100644
--- a/java/form/nbproject/project.properties
+++ b/java/form/nbproject/project.properties
@@ -16,7 +16,7 @@
# under the License.
extra.module.files=modules/ext/AbsoluteLayout.jar
-javac.source=1.7
+javac.source=1.8
javadoc.arch=${basedir}/arch.xml
spec.version.base=1.72.0
test-unit-sys-prop.org.netbeans.modules.form.layoutdesign.test=0
diff --git a/java/i18n/nbproject/project.properties
b/java/i18n/nbproject/project.properties
index 73e1ef5..87aabfc 100644
--- a/java/i18n/nbproject/project.properties
+++ b/java/i18n/nbproject/project.properties
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-javac.source=1.6
+javac.source=1.8
javadoc.arch=${basedir}/arch.xml
disable.qa-functional.tests=true
diff --git a/java/j2ee.metadata/nbproject/project.properties
b/java/j2ee.metadata/nbproject/project.properties
index f9e1aea..256efd3 100644
--- a/java/j2ee.metadata/nbproject/project.properties
+++ b/java/j2ee.metadata/nbproject/project.properties
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-javac.source=1.6
+javac.source=1.8
javac.compilerargs=-Xlint:unchecked
javadoc.arch=${basedir}/arch.xml
diff --git a/java/java.source.ant/build.xml b/java/java.source.ant/build.xml
index 69b8ec5..470d904 100644
--- a/java/java.source.ant/build.xml
+++ b/java/java.source.ant/build.xml
@@ -25,7 +25,7 @@
<target name="nblib" depends="init">
<mkdir dir="build/antclasses"/>
- <javac srcdir="antsrc" destdir="build/antclasses" source="1.6"
target="1.6" debug="true" deprecation="true">
+ <javac srcdir="antsrc" destdir="build/antclasses" release="8"
debug="true" deprecation="true">
<classpath>
<path refid="cp"/>
<pathelement location="${ant.jar}"/>
diff --git a/java/java.testrunner.ant/nbproject/project.properties
b/java/java.testrunner.ant/nbproject/project.properties
index 7f641b7..3b054ca 100644
--- a/java/java.testrunner.ant/nbproject/project.properties
+++ b/java/java.testrunner.ant/nbproject/project.properties
@@ -15,5 +15,5 @@
# specific language governing permissions and limitations
# under the License.
is.eager=true
-javac.source=1.6
+javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/java/java.testrunner/nbproject/project.properties
b/java/java.testrunner/nbproject/project.properties
index 375b088..26aa41b 100644
--- a/java/java.testrunner/nbproject/project.properties
+++ b/java/java.testrunner/nbproject/project.properties
@@ -15,6 +15,6 @@
# specific language governing permissions and limitations
# under the License.
is.eager=true
-javac.source=1.6
+javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
requires.nb.javac=true
diff --git a/java/javawebstart/AntTasks/nbproject/project.properties
b/java/javawebstart/AntTasks/nbproject/project.properties
index 930fa63..63c39f3 100644
--- a/java/javawebstart/AntTasks/nbproject/project.properties
+++ b/java/javawebstart/AntTasks/nbproject/project.properties
@@ -53,7 +53,7 @@ javac.deprecation=false
javac.external.vm=false
javac.processorpath=\
${javac.classpath}
-javac.source=1.6
+javac.source=1.8
javac.target=1.8
javac.test.classpath=\
${javac.classpath}:\
diff --git a/java/javawebstart/nbproject/project.properties
b/java/javawebstart/nbproject/project.properties
index 5c67e0d..97bd2ae 100644
--- a/java/javawebstart/nbproject/project.properties
+++ b/java/javawebstart/nbproject/project.properties
@@ -16,7 +16,7 @@
# under the License.
javac.compilerargs=-Xlint:unchecked
-javac.source=1.7
+javac.source=1.8
extra.module.files=ant/extra/org-netbeans-modules-javawebstart-anttasks.jar
jnlp.indirect.jars=ant/extra/org-netbeans-modules-javawebstart-anttasks.jar
requires.nb.javac=true
diff --git a/java/junit/nbproject/project.properties
b/java/junit/nbproject/project.properties
index fd520bc..bb410eb 100644
--- a/java/junit/nbproject/project.properties
+++ b/java/junit/nbproject/project.properties
@@ -17,7 +17,7 @@
is.eager=true
-javac.source=1.6
+javac.source=1.8
javadoc.arch=${basedir}/arch.xml
javadoc.apichanges=${basedir}/apichanges.xml
diff --git a/java/maven.checkstyle/nbproject/project.properties
b/java/maven.checkstyle/nbproject/project.properties
index c0af75f..0f4ec98 100644
--- a/java/maven.checkstyle/nbproject/project.properties
+++ b/java/maven.checkstyle/nbproject/project.properties
@@ -14,5 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-javac.source=1.6
+javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/java/maven.coverage/nbproject/project.properties
b/java/maven.coverage/nbproject/project.properties
index 7af4122..369506d 100644
--- a/java/maven.coverage/nbproject/project.properties
+++ b/java/maven.coverage/nbproject/project.properties
@@ -14,7 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-javac.source=1.6
+javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
nbm.homepage=http://wiki.netbeans.org/MavenCodeCoverage
nbm.module.author=Jesse Glick <[email protected]>
diff --git a/java/maven.hints/nbproject/project.properties
b/java/maven.hints/nbproject/project.properties
index 82150ad..84e1499 100644
--- a/java/maven.hints/nbproject/project.properties
+++ b/java/maven.hints/nbproject/project.properties
@@ -16,7 +16,7 @@
# under the License.
is.eager=true
-javac.source=1.6
+javac.source=1.8
#javac.compilerargs=-Xlint -Xlint:-serial
test.config.stableBTD.includes=**/*Test.class
diff --git a/java/maven.indexer.ui/nbproject/project.properties
b/java/maven.indexer.ui/nbproject/project.properties
index 21cc681..430766b 100644
--- a/java/maven.indexer.ui/nbproject/project.properties
+++ b/java/maven.indexer.ui/nbproject/project.properties
@@ -16,6 +16,6 @@
# under the License.
is.autoload=true
-javac.source=1.6
+javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/java/maven.junit/nbproject/project.properties
b/java/maven.junit/nbproject/project.properties
index 41c0e06..a72717d 100644
--- a/java/maven.junit/nbproject/project.properties
+++ b/java/maven.junit/nbproject/project.properties
@@ -16,7 +16,7 @@
# under the License.
is.eager=true
-javac.source=1.6
+javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
test.config.stableBTD.includes=**/*Test.class
diff --git a/java/maven.kit/nbproject/project.properties
b/java/maven.kit/nbproject/project.properties
index 8c80113..5137752 100644
--- a/java/maven.kit/nbproject/project.properties
+++ b/java/maven.kit/nbproject/project.properties
@@ -15,5 +15,5 @@
# specific language governing permissions and limitations
# under the License.
-javac.source=1.6
+javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/java/maven.osgi/nbproject/project.properties
b/java/maven.osgi/nbproject/project.properties
index 38b9c58..d4de1d6 100644
--- a/java/maven.osgi/nbproject/project.properties
+++ b/java/maven.osgi/nbproject/project.properties
@@ -14,7 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-javac.source=1.6
+javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
test.config.stableBTD.includes=**/*Test.class
diff --git a/java/maven.persistence/nbproject/project.properties
b/java/maven.persistence/nbproject/project.properties
index 80c61c8..415ac5e 100644
--- a/java/maven.persistence/nbproject/project.properties
+++ b/java/maven.persistence/nbproject/project.properties
@@ -16,5 +16,5 @@
# under the License.
is.eager=true
-javac.source=1.6
+javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/java/maven.refactoring/nbproject/project.properties
b/java/maven.refactoring/nbproject/project.properties
index 315878a..9f9ea40 100644
--- a/java/maven.refactoring/nbproject/project.properties
+++ b/java/maven.refactoring/nbproject/project.properties
@@ -14,6 +14,6 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-javac.source=1.6
+javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
requires.nb.javac=true
diff --git a/java/maven.search/nbproject/project.properties
b/java/maven.search/nbproject/project.properties
index 80c61c8..edf7dd1 100644
--- a/java/maven.search/nbproject/project.properties
+++ b/java/maven.search/nbproject/project.properties
@@ -16,5 +16,6 @@
# under the License.
is.eager=true
-javac.source=1.6
+javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
+
diff --git a/java/maven.spring/nbproject/project.properties
b/java/maven.spring/nbproject/project.properties
index 80c61c8..edf7dd1 100644
--- a/java/maven.spring/nbproject/project.properties
+++ b/java/maven.spring/nbproject/project.properties
@@ -16,5 +16,6 @@
# under the License.
is.eager=true
-javac.source=1.6
+javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
+
diff --git a/java/websvc.jaxws21/nbproject/project.properties
b/java/websvc.jaxws21/nbproject/project.properties
index 5ac514d..deb4255 100644
--- a/java/websvc.jaxws21/nbproject/project.properties
+++ b/java/websvc.jaxws21/nbproject/project.properties
@@ -18,7 +18,7 @@
is.autoload=true
javac.compilerargs=-Xlint -Xlint:-serial
-javac.source=1.6
+javac.source=1.8
jnlp.indirect.jars=\
modules/ext/jaxws22/FastInfoset.jar,\
modules/ext/jaxws22/gmbal-api-only.jar,\
diff --git a/java/websvc.jaxws21api/nbproject/project.properties
b/java/websvc.jaxws21api/nbproject/project.properties
index dd67c56..aabbfec 100644
--- a/java/websvc.jaxws21api/nbproject/project.properties
+++ b/java/websvc.jaxws21api/nbproject/project.properties
@@ -18,7 +18,7 @@
is.autoload=true
javac.compilerargs=-Xlint -Xlint:-serial
-javac.source=1.6
+javac.source=1.8
jnlp.indirect.jars=\
modules/ext/jaxws22/api/jaxws-api.jar,\
modules/ext/jaxws22/api/jsr181-api.jar,\
diff --git a/java/xml.jaxb/nbproject/project.properties
b/java/xml.jaxb/nbproject/project.properties
index 8f48df1..3babc41 100644
--- a/java/xml.jaxb/nbproject/project.properties
+++ b/java/xml.jaxb/nbproject/project.properties
@@ -14,7 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-javac.source=1.6
+javac.source=1.8
# added to classpath for compilation of unit tests
#test.unit.cp.extra=../../junit/external/junit-4.1.jar
# added to classpath for running of unit tests
diff --git a/javafx/javafx2.platform/nbproject/project.properties
b/javafx/javafx2.platform/nbproject/project.properties
index ab06b41..ec4cf73 100644
--- a/javafx/javafx2.platform/nbproject/project.properties
+++ b/javafx/javafx2.platform/nbproject/project.properties
@@ -14,5 +14,6 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-javac.source=1.7
+javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
+
diff --git a/javafx/javafx2.scenebuilder/nbproject/project.properties
b/javafx/javafx2.scenebuilder/nbproject/project.properties
index d6f42f7..45983a7 100644
--- a/javafx/javafx2.scenebuilder/nbproject/project.properties
+++ b/javafx/javafx2.scenebuilder/nbproject/project.properties
@@ -15,12 +15,11 @@
# specific language governing permissions and limitations
# under the License.
-
-javac.source=1.6
+javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
requires.nb.javac=true
# Please change this to point to jfxrt.jar coming e.g. from the JavaFX 2.0 SDK
#test-unit-sys-prop.jfxrt.url=file:/Users/david/Thunderbird/javafx-sdk2.0/rt/lib/jfxrt.jar
# The following works only inside Oracle (I am sorry):
-test-unit-sys-prop.jfxrt.url=http://jre.us.oracle.com/java/re/javafx/2.0.2/promoted/latest/binaries/windows-i586/javafx-sdk2.0.2/rt/lib/jfxrt.jar
\ No newline at end of file
+test-unit-sys-prop.jfxrt.url=http://jre.us.oracle.com/java/re/javafx/2.0.2/promoted/latest/binaries/windows-i586/javafx-sdk2.0.2/rt/lib/jfxrt.jar
diff --git a/nb/updatecenters/build.xml b/nb/updatecenters/build.xml
index 3505cf1..4054c46 100644
--- a/nb/updatecenters/build.xml
+++ b/nb/updatecenters/build.xml
@@ -35,7 +35,7 @@
<tempfile destdir="${build.dir}" prefix="sign" suffix=".ks"
property="netbeans.bundled.ks" deleteonexit="true" />
<tempfile destdir="${build.dir}" prefix="sign" suffix=".cert"
property="netbeans.bundled.cert" deleteonexit="true"/>
<genkey
- keystore="${netbeans.bundled.ks}"
+ keystore="${netbeans.bundled.ks}" keyalg="RSA"
alias="netbeans-bundled" storepass="${netbeans.bundled.ks}"
dname="CN=Ant Group, OU=NetBeans, O=Apache.org, C=US"
/>
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavac.java
b/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavac.java
index b94786c..5474644 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavac.java
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavac.java
@@ -66,21 +66,30 @@ public class CustomJavac extends Javac {
@Override
public void execute() throws BuildException {
- String tgr = getTarget();
- if (tgr.matches("\\d+")) {
- tgr = "1." + tgr;
- }
- if (!isBootclasspathOptionUsed()) {
- setRelease(tgr.substring(2));
- }
- String src = getSource();
- if (src.matches("\\d+")) {
- src = "1." + src;
- }
- if (!JavaEnvUtils.isAtLeastJavaVersion(src)) {
- log("Cannot handle -source " + src + " from this VM; forking " +
maybeFork, Project.MSG_WARN);
- super.setFork(true);
- super.setExecutable(maybeFork);
+ String release = getRelease();
+ if (release == null || release.isEmpty()) {
+ String tgr = getTarget();
+ if (tgr.matches("\\d+")) {
+ tgr = "1." + tgr;
+ }
+ if (!isBootclasspathOptionUsed()) {
+ setRelease(tgr.substring(2));
+ }
+ String src = getSource();
+ if (src.matches("\\d+")) {
+ src = "1." + src;
+ }
+ if (!JavaEnvUtils.isAtLeastJavaVersion(src)) {
+ log("Cannot handle -source " + src + " from this VM; forking "
+ maybeFork, Project.MSG_WARN);
+ super.setFork(true);
+ super.setExecutable(maybeFork);
+ }
+ } else {
+ if (!JavaEnvUtils.isAtLeastJavaVersion(release)) {
+ log("Cannot handle -release " + release + " from this VM;
forking " + maybeFork, Project.MSG_WARN);
+ super.setFork(true);
+ super.setExecutable(maybeFork);
+ }
}
generatedClassesDir = new File(getDestdir().getParentFile(),
getDestdir().getName() + "-generated");
if (!usingExplicitIncludes) {
@@ -205,7 +214,7 @@ public class CustomJavac extends Javac {
File d = getDestdir();
if (!d.isDirectory()) {
return;
-}
+ }
FileSet classes = new FileSet();
classes.setDir(d);
classes.setIncludes("**/*$*.class");
diff --git a/nbi/engine/build.xml b/nbi/engine/build.xml
index e5e034c..8084641 100644
--- a/nbi/engine/build.xml
+++ b/nbi/engine/build.xml
@@ -188,14 +188,9 @@
</target>
<target name="probe" depends="init">
- <available property="probe.javac.source" value="1.6"
classname="java.lang.Module"/>
- <available property="probe.javac.target" value="1.6"
classname="java.lang.Module"/>
- <available property="probe.javac.source" value="1.6"
file="${nbjdk.home}/bin/jmod"/>
- <available property="probe.javac.target" value="1.6"
file="${nbjdk.home}/bin/jmod"/>
- <property name="probe.javac.source" value="1.4"/>
- <property name="probe.javac.target" value="1.4"/>
+ <property name="probe.javac.release" value="8"/>
<mkdir
dir="${build.classes.dir}/org/netbeans/installer/utils/applications/"/>
- <javac srcdir="probesrc"
destdir="${build.classes.dir}/org/netbeans/installer/utils/applications/"
source="${probe.javac.source}" debug="true" deprecation="true"
target="${probe.javac.target}"/>
+ <javac srcdir="probesrc"
destdir="${build.classes.dir}/org/netbeans/installer/utils/applications/"
release="${probe.javac.release}" debug="true" deprecation="true"/>
</target>
</project>
diff --git a/nbi/infra/build/.ant-lib/nbproject/project.properties
b/nbi/infra/build/.ant-lib/nbproject/project.properties
index 415e33b..1ebc465 100644
--- a/nbi/infra/build/.ant-lib/nbproject/project.properties
+++ b/nbi/infra/build/.ant-lib/nbproject/project.properties
@@ -54,7 +54,7 @@ javac.compilerargs=-Xlint:unchecked
javac.deprecation=true
javac.processorpath=\
${javac.classpath}
-javac.source=1.6
+javac.source=1.8
javac.target=1.8
javac.test.classpath=\
${javac.classpath}:\
diff --git a/nbi/infra/lib/registries-management/nbproject/project.properties
b/nbi/infra/lib/registries-management/nbproject/project.properties
index 2011a8f..1ea11d9 100644
--- a/nbi/infra/lib/registries-management/nbproject/project.properties
+++ b/nbi/infra/lib/registries-management/nbproject/project.properties
@@ -52,7 +52,7 @@ javac.compilerargs=
javac.deprecation=false
javac.processorpath=\
${javac.classpath}
-javac.source=1.6
+javac.source=1.8
javac.target=1.8
javac.test.classpath=\
${javac.classpath}:\
diff --git a/nbi/infra/utils/file-renamer/nbproject/project.properties
b/nbi/infra/utils/file-renamer/nbproject/project.properties
index d9880d9..95cdd2e 100644
--- a/nbi/infra/utils/file-renamer/nbproject/project.properties
+++ b/nbi/infra/utils/file-renamer/nbproject/project.properties
@@ -42,7 +42,7 @@ javac.classpath=
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false
-javac.source=1.6
+javac.source=1.8
javac.target=1.8
javac.test.classpath=\
${javac.classpath}:\
diff --git a/nbi/infra/utils/port-occupation/nbproject/project.properties
b/nbi/infra/utils/port-occupation/nbproject/project.properties
index 36d81ed..25469b2 100644
--- a/nbi/infra/utils/port-occupation/nbproject/project.properties
+++ b/nbi/infra/utils/port-occupation/nbproject/project.properties
@@ -44,7 +44,7 @@ javac.classpath=
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false
-javac.source=1.6
+javac.source=1.8
javac.target=1.8
javac.test.classpath=\
${javac.classpath}:\
diff --git a/platform/applemenu/nbproject/project.properties
b/platform/applemenu/nbproject/project.properties
index a06a886..7880f3c 100644
--- a/platform/applemenu/nbproject/project.properties
+++ b/platform/applemenu/nbproject/project.properties
@@ -16,8 +16,9 @@
# under the License.
javac.compilerargs=-Xlint -Xlint:-serial
-javac.source=1.6
+javac.source=1.8
nbm.needs.restart=true
is.eager=true
cp.extra=external/orange-extensions-1.3.1.jar
-bootclasspath.prepend=${build.dir}/desktop-classes-classes
\ No newline at end of file
+bootclasspath.prepend=${build.dir}/desktop-classes-classes
+
diff --git a/profiler/debugger.jpda.heapwalk/nbproject/project.properties
b/profiler/debugger.jpda.heapwalk/nbproject/project.properties
index e805176..2e03aa6 100644
--- a/profiler/debugger.jpda.heapwalk/nbproject/project.properties
+++ b/profiler/debugger.jpda.heapwalk/nbproject/project.properties
@@ -18,5 +18,5 @@
cp.extra=${tools.jar}
is.eager=true
javac.compilerargs=-Xlint:unchecked
-javac.source=1.6
+javac.source=1.8
javadoc.arch=${basedir}/arch.xml
diff --git a/profiler/lib.profiler.charts/nbproject/project.properties
b/profiler/lib.profiler.charts/nbproject/project.properties
index c7ee186..6894689 100644
--- a/profiler/lib.profiler.charts/nbproject/project.properties
+++ b/profiler/lib.profiler.charts/nbproject/project.properties
@@ -16,4 +16,5 @@
# under the License.
is.autoload=true
-javac.source=1.6
+javac.source=1.8
+
diff --git a/profiler/maven.profiler/nbproject/project.properties
b/profiler/maven.profiler/nbproject/project.properties
index 80c61c8..415ac5e 100644
--- a/profiler/maven.profiler/nbproject/project.properties
+++ b/profiler/maven.profiler/nbproject/project.properties
@@ -16,5 +16,5 @@
# under the License.
is.eager=true
-javac.source=1.6
+javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/profiler/profiler.api/nbproject/project.properties
b/profiler/profiler.api/nbproject/project.properties
index daa0d81..c7d5f4d 100644
--- a/profiler/profiler.api/nbproject/project.properties
+++ b/profiler/profiler.api/nbproject/project.properties
@@ -16,7 +16,7 @@
# under the License.
is.autoload=true
-javac.source=1.6
+javac.source=1.8
requires.nb.javac=true
test-unit-sys-prop.java.awt.headless=true
diff --git a/profiler/profiler.freeform/nbproject/project.properties
b/profiler/profiler.freeform/nbproject/project.properties
index 9ac3b37..abf2a96 100644
--- a/profiler/profiler.freeform/nbproject/project.properties
+++ b/profiler/profiler.freeform/nbproject/project.properties
@@ -17,4 +17,5 @@
is.eager=true
-javac.source=1.6
+javac.source=1.8
+
diff --git a/profiler/profiler.j2se/nbproject/project.properties
b/profiler/profiler.j2se/nbproject/project.properties
index b3ddf71..46911cb 100644
--- a/profiler/profiler.j2se/nbproject/project.properties
+++ b/profiler/profiler.j2se/nbproject/project.properties
@@ -16,7 +16,7 @@
# under the License.
is.eager=true
-javac.source=1.6
+javac.source=1.8
requires.nb.javac=true
test-unit-sys-prop.java.awt.headless=true
diff --git a/profiler/profiler.kit/nbproject/project.properties
b/profiler/profiler.kit/nbproject/project.properties
index c0af75f..ec4cf73 100644
--- a/profiler/profiler.kit/nbproject/project.properties
+++ b/profiler/profiler.kit/nbproject/project.properties
@@ -14,5 +14,6 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-javac.source=1.6
+javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
+
diff --git a/profiler/profiler.nbimpl/build.xml
b/profiler/profiler.nbimpl/build.xml
index 92cf0aa..68c4380 100644
--- a/profiler/profiler.nbimpl/build.xml
+++ b/profiler/profiler.nbimpl/build.xml
@@ -25,7 +25,7 @@
<target name="nblib" depends="init">
<mkdir dir="build/antclasses"/>
- <javac srcdir="antsrc" destdir="build/antclasses"
debug="${build.compiler.debug}" deprecation="${build.compiler.deprecation}"
source="1.6" target="1.6" includeantruntime="false">
+ <javac srcdir="antsrc" destdir="build/antclasses"
debug="${build.compiler.debug}" deprecation="${build.compiler.deprecation}"
release="8" includeantruntime="false">
<classpath>
<pathelement path="${antsrc.cp}"/>
</classpath>
diff --git a/profiler/profiler.nbimpl/nbproject/project.properties
b/profiler/profiler.nbimpl/nbproject/project.properties
index 252c5af..b315b76 100644
--- a/profiler/profiler.nbimpl/nbproject/project.properties
+++ b/profiler/profiler.nbimpl/nbproject/project.properties
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-javac.source=1.6
+javac.source=1.8
requires.nb.javac=true
antsrc.cp=\
diff --git a/profiler/profiler.nbmodule/nbproject/project.properties
b/profiler/profiler.nbmodule/nbproject/project.properties
index b609bdd..eae27f4 100644
--- a/profiler/profiler.nbmodule/nbproject/project.properties
+++ b/profiler/profiler.nbmodule/nbproject/project.properties
@@ -17,4 +17,5 @@
is.eager=true
javac.compilerargs=-Xlint -Xlint:-serial
-javac.source=1.6
+javac.source=1.8
+
diff --git a/profiler/profiler.oql.language/nbproject/project.properties
b/profiler/profiler.oql.language/nbproject/project.properties
index 40f6973..2068550 100644
--- a/profiler/profiler.oql.language/nbproject/project.properties
+++ b/profiler/profiler.oql.language/nbproject/project.properties
@@ -18,4 +18,5 @@
auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.tab-size=8
auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width=80
auxiliary.org-netbeans-modules-editor-indent.CodeStyle.usedProfile=default
javac.compilerargs=-Xlint -Xlint:-serial
-javac.source=1.6
+javac.source=1.8
+
diff --git a/profiler/profiler.ppoints/nbproject/project.properties
b/profiler/profiler.ppoints/nbproject/project.properties
index 6de45e1..0f73a11 100644
--- a/profiler/profiler.ppoints/nbproject/project.properties
+++ b/profiler/profiler.ppoints/nbproject/project.properties
@@ -15,5 +15,5 @@
# specific language governing permissions and limitations
# under the License.
is.autoload=true
-javac.source=1.6
+javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/profiler/profiler.snaptracer/nbproject/project.properties
b/profiler/profiler.snaptracer/nbproject/project.properties
index 8c69d4f..23d38dd 100644
--- a/profiler/profiler.snaptracer/nbproject/project.properties
+++ b/profiler/profiler.snaptracer/nbproject/project.properties
@@ -15,4 +15,5 @@
# specific language governing permissions and limitations
# under the License.
-javac.source=1.6
+javac.source=1.8
+
diff --git a/profiler/profiler.utilities/nbproject/project.properties
b/profiler/profiler.utilities/nbproject/project.properties
index 729b361..cd1e09d 100644
--- a/profiler/profiler.utilities/nbproject/project.properties
+++ b/profiler/profiler.utilities/nbproject/project.properties
@@ -16,6 +16,7 @@
# under the License.
is.autoload=true
javac.compilerargs=-Xlint -Xlint:-serial
-javac.source=1.6
+javac.source=1.8
test.config.stableBTD.includes=**/*Test.class
+
diff --git
a/webcommon/cordova/cordovaprojectupdate/nbproject/project.properties
b/webcommon/cordova/cordovaprojectupdate/nbproject/project.properties
index 363f0d4..5da823a 100644
--- a/webcommon/cordova/cordovaprojectupdate/nbproject/project.properties
+++ b/webcommon/cordova/cordovaprojectupdate/nbproject/project.properties
@@ -53,7 +53,7 @@ javac.compilerargs=
javac.deprecation=false
javac.processorpath=\
${javac.classpath}
-javac.source=1.6
+javac.source=1.8
javac.target=1.8
javac.test.classpath=\
${javac.classpath}:\
diff --git a/webcommon/javascript2.jquery/nbproject/project.properties
b/webcommon/javascript2.jquery/nbproject/project.properties
index ef24d79..250daf1 100644
--- a/webcommon/javascript2.jquery/nbproject/project.properties
+++ b/webcommon/javascript2.jquery/nbproject/project.properties
@@ -14,7 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-javac.source=1.6
+javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
jnlp.verify.excludes=docs/jquery-api.xml,docs/jquery-propertyNames.xml
diff --git a/webcommon/javascript2.react/nbproject/project.properties
b/webcommon/javascript2.react/nbproject/project.properties
index f8e71b3..ec4cf73 100644
--- a/webcommon/javascript2.react/nbproject/project.properties
+++ b/webcommon/javascript2.react/nbproject/project.properties
@@ -14,6 +14,6 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-javac.source=1.6
+javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/webcommon/libs.jstestdriver/build.xml
b/webcommon/libs.jstestdriver/build.xml
index eb562c5..33447e9 100644
--- a/webcommon/libs.jstestdriver/build.xml
+++ b/webcommon/libs.jstestdriver/build.xml
@@ -25,7 +25,7 @@
<target name="ext-compile" depends="build-init">
<mkdir dir="build/extclasses"/>
- <javac srcdir="extsrc" destdir="build/extclasses"
deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}"
source="1.6" target="1.8">
+ <javac srcdir="extsrc" destdir="build/extclasses"
deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}"
release="8">
<classpath>
<path path="${module.classpath}"/>
<path location="${cluster}/${module.jar}"/>
diff --git a/webcommon/libs.jstestdriver/nbproject/project.properties
b/webcommon/libs.jstestdriver/nbproject/project.properties
index c1b76d9..b6b72e1 100644
--- a/webcommon/libs.jstestdriver/nbproject/project.properties
+++ b/webcommon/libs.jstestdriver/nbproject/project.properties
@@ -17,7 +17,7 @@
is.autoload=true
javac.compilerargs=-Xlint -Xlint:-serial
-javac.source=1.6
+javac.source=1.8
release.build/external/libs.jstestdriver-ext.jar=modules/ext/libs.jstestdriver-ext.jar
# last version used: JsTestDriver-1.3.5.jar
diff --git a/webcommon/netserver/nbproject/project.properties
b/webcommon/netserver/nbproject/project.properties
index 6de45e1..0f73a11 100644
--- a/webcommon/netserver/nbproject/project.properties
+++ b/webcommon/netserver/nbproject/project.properties
@@ -15,5 +15,5 @@
# specific language governing permissions and limitations
# under the License.
is.autoload=true
-javac.source=1.6
+javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/webcommon/web.client.kit/nbproject/project.properties
b/webcommon/web.client.kit/nbproject/project.properties
index c0af75f..0f4ec98 100644
--- a/webcommon/web.client.kit/nbproject/project.properties
+++ b/webcommon/web.client.kit/nbproject/project.properties
@@ -14,5 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-javac.source=1.6
+javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/webcommon/web.inspect/nbproject/project.properties
b/webcommon/web.inspect/nbproject/project.properties
index 8c69d4f..fc68210 100644
--- a/webcommon/web.inspect/nbproject/project.properties
+++ b/webcommon/web.inspect/nbproject/project.properties
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-javac.source=1.6
+javac.source=1.8
---------------------------------------------------------------------
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
