Skip to content

Commit

Permalink
jdk 20+ build compatibility: bump minimum compiler target to 1.8.
Browse files Browse the repository at this point in the history
 - use -Xlint:-options due to obsolete source/target warning and -Werror
 - fix some javac warnings which fail due to -Werror in SuiteSources.java
 - add JDK 20ea to test matrix
  • Loading branch information
mbien committed Dec 20, 2022
1 parent a8edf3b commit d61f8b8
Show file tree
Hide file tree
Showing 399 changed files with 408 additions and 414 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
timeout-minutes: 60
strategy:
matrix:
java: [ '11', '17', '19' ]
java: [ '11', '17', '20-ea' ]
fail-fast: false
steps:

Expand All @@ -115,7 +115,7 @@ jobs:
restore-keys: ${{ runner.os }}-

- name: Setup Gradle Daemon to run on JDK 11
if: ${{ matrix.java > 18 }}
if: ${{ matrix.java == '20-ea' }}
run: |
mkdir -p ~/.gradle
#uses a preinstalled JDK 11 from the runner
Expand Down Expand Up @@ -159,7 +159,7 @@ jobs:
timeout-minutes: 60
strategy:
matrix:
java: [ '8', '11', '17', '19' ]
java: [ '8', '11', '17', '20-ea' ]
fail-fast: false
steps:

Expand All @@ -170,7 +170,6 @@ jobs:
distribution: ${{ env.default_java_distribution }}

- name: Setup Xvfb
if: ${{ matrix.java != '20-ea' }} # see #4299
run: |
echo "DISPLAY=:99.0" >> $GITHUB_ENV
Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
nbm.module.author=Dmitry Lipin
2 changes: 1 addition & 1 deletion apisupport/apisupport.kit/nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.6
javac.source=1.8
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
# under the License.

is.eager=true
javac.source=1.7
javac.source=1.8
requires.nb.javac=true
2 changes: 1 addition & 1 deletion contrib/cordova.platforms.ios/nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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.7
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
release.external/ios-sim=bin/ios-sim
release.external/libiDeviceNativeBinding.dylib=bin/libiDeviceNativeBinding.dylib
Expand Down
2 changes: 1 addition & 1 deletion contrib/form.j2ee/nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
# under the License.

is.eager=true
javac.source=1.6
javac.source=1.8
spec.version.base=0.36.0
requires.nb.javac=true
2 changes: 1 addition & 1 deletion contrib/groovy.grails/nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.6
javac.source=1.8
nbm.homepage=http://wiki.netbeans.org/groovy
nbm.module.author=Martin Adamek, Petr Hejl, Matthias Schmidt

Expand Down
2 changes: 1 addition & 1 deletion contrib/hibernateweb/nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@
build.compiler.deprecation=false
is.eager=true
javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.6
javac.source=1.8


2 changes: 1 addition & 1 deletion contrib/j2ee.jboss4/nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# specific language governing permissions and limitations
# under the License.

javac.source=1.6
javac.source=1.8
#javac.compilerargs=-Xlint:unchecked


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jar.name=JBoss4EjbTest.jar
javac.classpath=
javac.debug=true
javac.deprecation=false
javac.source=1.4
javac.source=1.8
javac.target=1.8
javac.test.classpath=\
${javac.classpath}:\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ javac.classpath=
javac.compilerargs=
javac.debug=true
javac.deprecation=false
javac.source=1.4
javac.source=1.8
javac.target=1.8
javac.test.classpath=\
${javac.classpath}:\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ javac.classpath=
javac.compilerargs=
javac.debug=true
javac.deprecation=false
javac.source=1.4
javac.source=1.8
javac.target=1.8
javac.test.classpath=\
${javac.classpath}:\
Expand Down
2 changes: 1 addition & 1 deletion contrib/j2ee.weblogic9/nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# under the License.
#

javac.source=1.6
javac.source=1.8
spec.version.base=1.45.0

test.config.stableBTD.includes=**/*Test.class
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@


is.eager=true
javac.source=1.6
javac.source=1.8
release.external/svnClientAdapter-svnkit-1.10.12.jar=modules/ext/svnClientAdapter-svnkit.jar
release.external/org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar=modules/ext/svnkit.jar
release.external/sqljet-1.1.10.jar=modules/ext/sqljet.jar
Expand Down
2 changes: 1 addition & 1 deletion contrib/websvc.metro.model/nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ 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
is.eager=true
javac.source=1.6
javac.source=1.8
javadoc.title=Configuration model for metro.xml config file
javadoc.overview=${basedir}/overview.html
javadoc.arch=${basedir}/../arch/arch-websvc-metro-model.xml
Expand Down
2 changes: 1 addition & 1 deletion contrib/websvc.wsitconf/nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# specific language governing permissions and limitations
# under the License.

javac.source=1.6
javac.source=1.8
javadoc.title=Web Services Interoperability Technologies Configuration Module
javadoc.overview=${basedir}/overview.html
javadoc.arch=${basedir}/../arch/arch-websvc-wsitconf.xml
Expand Down
2 changes: 1 addition & 1 deletion contrib/websvc.wsitmodelext/nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# specific language governing permissions and limitations
# under the License.
is.autoload=true
javac.source=1.6
javac.source=1.8
javadoc.title=Web Services Interoperability Technologies WSDL Extensions Module
javadoc.overview=${basedir}/overview.html
javadoc.arch=${basedir}/../arch/arch-websvc-wsitmodelext.xml
Expand Down
2 changes: 1 addition & 1 deletion cpplite/cpplite.kit/nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
# specific language governing permissions and limitations
# under the License.

javac.source=1.7
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
2 changes: 1 addition & 1 deletion enterprise/api.web.webmodule/nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.

javac.source=1.6
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial

is.autoload=true
Expand Down
2 changes: 1 addition & 1 deletion enterprise/el.lexer/nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

is.autoload=true
javac.compilerargs=-Xlint:unchecked
javac.source=1.6
javac.source=1.8
#javadoc.arch=${basedir}/arch.xml
#javadoc.apichanges=${basedir}/apichanges.xml
javadoc.title=Expression Language Lexer API
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ javac.classpath=\
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false
javac.source=1.4
javac.source=1.8
javac.target=1.8
javac.test.classpath=\
${javac.classpath}:\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ javac.classpath=
javac.compilerargs=
javac.debug=true
javac.deprecation=false
javac.source=1.4
javac.source=1.8
javac.target=${default.javac.target}
javac.test.classpath=\
${javac.classpath}:\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ javac.classpath=
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false
javac.source=1.4
javac.source=1.8
javac.target=1.8
javac.test.classpath=\
${javac.classpath}:\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ javac.classpath=
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false
javac.source=1.5
javac.source=1.8
javac.target=1.8
javac.test.classpath=\
${javac.classpath}:\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jar.name=EJBModule2_1_4.jar
javac.classpath=
javac.debug=true
javac.deprecation=false
javac.source=1.4
javac.source=1.8
javac.target=1.8
javac.test.classpath=\
${javac.classpath}:\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jar.name=EJBModule_1_4.jar
javac.classpath=
javac.debug=true
javac.deprecation=false
javac.source=1.4
javac.source=1.8
javac.target=1.8
javac.test.classpath=\
${javac.classpath}:\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jar.name=EJBModule_5_0.jar
javac.classpath=
javac.debug=true
javac.deprecation=false
javac.source=1.5
javac.source=1.8
javac.target=1.8
javac.test.classpath=\
${javac.classpath}:\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jar.name=EJBModule_6_0.jar
javac.classpath=
javac.debug=true
javac.deprecation=false
javac.source=1.5
javac.source=1.8
javac.target=1.8
javac.test.classpath=\
${javac.classpath}:\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jar.name=EJBModule_7_0.jar
javac.classpath=
javac.debug=true
javac.deprecation=false
javac.source=1.5
javac.source=1.8
javac.target=1.8
javac.test.classpath=\
${javac.classpath}:\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jar.content.additional=\
jar.name=EnterpriseApplication_1_4.ear
javac.debug=true
javac.deprecation=false
javac.source=1.4
javac.source=1.8
javac.target=1.8
meta.inf=src/conf
no.dependencies=false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jar.content.additional=\
jar.name=EnterpriseApplication_5_0.ear
javac.debug=true
javac.deprecation=false
javac.source=1.5
javac.source=1.8
javac.target=1.8
meta.inf=src/conf
no.dependencies=false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ javac.classpath=
javac.compilerargs=
javac.debug=true
javac.deprecation=false
javac.source=1.4
javac.source=1.8
javac.target=1.8
javac.test.classpath=\
${javac.classpath}:\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ javac.classpath=
javac.compilerargs=
javac.debug=true
javac.deprecation=false
javac.source=1.5
javac.source=1.8
javac.target=1.8
javac.test.classpath=\
${javac.classpath}:\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jar.name=BrokenEJBModule1.jar
javac.classpath=
javac.debug=true
javac.deprecation=false
javac.source=1.4
javac.source=1.8
javac.target=1.8
javac.test.classpath=\
${javac.classpath}:\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jar.name=EJBModule1.jar
javac.classpath=${file.reference.jar0.jar}
javac.debug=true
javac.deprecation=false
javac.source=1.4
javac.source=1.8
javac.target=1.8
javac.test.classpath=\
${javac.classpath}:\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jar.name=EJBModule_6_0.jar
javac.classpath=
javac.debug=true
javac.deprecation=false
javac.source=1.5
javac.source=1.8
javac.target=1.8
javac.test.classpath=\
${javac.classpath}:\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jar.name=EJBModule_5_0.jar
javac.classpath=
javac.debug=true
javac.deprecation=false
javac.source=1.5
javac.source=1.8
javac.target=1.8
javac.test.classpath=\
${javac.classpath}:\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jar.name=EJBModule_6_0.jar
javac.classpath=
javac.debug=true
javac.deprecation=false
javac.source=1.5
javac.source=1.8
javac.target=1.8
javac.test.classpath=\
${javac.classpath}:\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jar.name=EJBModule_7_0.jar
javac.classpath=
javac.debug=true
javac.deprecation=false
javac.source=1.5
javac.source=1.8
javac.target=1.8
javac.test.classpath=\
${javac.classpath}:\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ javac.debug=true
javac.deprecation=false
javac.processorpath=\
${javac.classpath}
javac.source=1.7
javac.source=1.8
javac.target=1.8
javac.test.classpath=\
${javac.classpath}:\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ javac.debug=true
javac.deprecation=false
javac.processorpath=\
${javac.classpath}
javac.source=1.7
javac.source=1.8
javac.target=1.8
javac.test.classpath=\
${javac.classpath}:\
Expand Down
Loading

0 comments on commit d61f8b8

Please sign in to comment.