Merge pull request apache#7247 from mbien/use-release-flag

Use javac release option where possible
sdedic · May 24, 2024 · b6cf63e · b6cf63e
2 parents 66c7486 + 2b114b3
commit b6cf63e
Show file tree

Hide file tree

Showing 26 changed files with 26 additions and 50 deletions.
diff --git a/cpplite/cpplite.editor/nbproject/project.properties b/cpplite/cpplite.editor/nbproject/project.properties
@@ -15,6 +15,5 @@
 # specific language governing permissions and limitations
 # under the License.
 
-javac.source=11
-javac.target=11
+javac.release=11
 javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/enterprise/cloud.oracle/nbproject/project.properties b/enterprise/cloud.oracle/nbproject/project.properties
@@ -40,6 +40,6 @@ release.external/resilience4j-circuitbreaker-1.7.1.jar=modules/ext/resilience4j-
 release.external/resilience4j-core-1.7.1.jar=modules/ext/resilience4j-core-1.7.1.jar
 release.external/vavr-0.10.2.jar=modules/ext/vavr-0.10.2.jar
 release.external/vavr-match-0.10.2.jar=modules/ext/vavr-match-0.10.2.jar
-javac.source=11
+javac.release=11
 javac.compilerargs=-Xlint -Xlint:-serial
 spec.version.base.fatal.warning=false
diff --git a/enterprise/glassfish.common/nbproject/project.properties b/enterprise/glassfish.common/nbproject/project.properties
@@ -16,8 +16,7 @@
 # under the License.
 
 javac.compilerargs=-Xlint -Xlint:-serial
-javac.source=11
-javac.target=11
+javac.release=11
 
 test.config.stableBTD.includes=**/*Test.class
 test.config.stableBTD.excludes=\

diff --git a/enterprise/glassfish.eecommon/nbproject/project.properties b/enterprise/glassfish.eecommon/nbproject/project.properties
@@ -15,8 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 is.autoload=true
-javac.source=11
-javac.target=11
+javac.release=11
 javac.compilerargs=-Xlint -Xlint:-serial
 spec.version.base=1.62.0
 

diff --git a/enterprise/glassfish.javaee/nbproject/project.properties b/enterprise/glassfish.javaee/nbproject/project.properties
@@ -15,8 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 javac.compilerargs=-Xlint -Xlint:-serial
-javac.source=11
-javac.target=11
+javac.release=11
 
 test.config.stableBTD.includes=**/*Test.class
 test.config.stableBTD.excludes=\

diff --git a/enterprise/glassfish.tooling/nbproject/project.properties b/enterprise/glassfish.tooling/nbproject/project.properties
@@ -14,6 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-javac.source=11
-javac.target=11
+javac.release=11
 javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/ide/git/nbproject/project.properties b/ide/git/nbproject/project.properties
@@ -15,8 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 javac.compilerargs=-Xlint:unchecked
-javac.source=11
-javac.target=11
+javac.release=11
 nbm.homepage=http://netbeans.org/projects/versioncontrol/pages/Git_main
 nbm.module.author=Ondrej Vrabec
 nbm.needs.restart=true

diff --git a/ide/languages.hcl/nbproject/project.properties b/ide/languages.hcl/nbproject/project.properties
@@ -14,6 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-javac.source=17
-javac.target=17
+javac.release=17
 
diff --git a/ide/libs.git/nbproject/project.properties b/ide/libs.git/nbproject/project.properties
@@ -17,8 +17,7 @@
 
 is.autoload=true
 
-javac.source=11
-javac.target=11
+javac.release=11
 
 javadoc.arch=${basedir}/arch.xml
 javadoc.apichanges=${basedir}/apichanges.xml

diff --git a/ide/o.n.swing.dirchooser/nbproject/project.properties b/ide/o.n.swing.dirchooser/nbproject/project.properties
@@ -14,6 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-javac.source=11
-javac.target=11
+javac.release=11
 javadoc.arch=${basedir}/arch.xml
diff --git a/ide/versioning.util/nbproject/project.properties b/ide/versioning.util/nbproject/project.properties
@@ -16,8 +16,7 @@
 # under the License.
 
 javac.compilerargs=-Xlint:unchecked
-javac.source=11
-javac.target=11
+javac.release=11
 
 javadoc.name=Versioning Support Utilities
 spec.version.base=2.1.0

diff --git a/java/gradle.java/nbproject/project.properties b/java/gradle.java/nbproject/project.properties
@@ -16,8 +16,7 @@
 # under the License.
 
 is.autoload=true
-javac.source=17
-javac.target=17
+javac.release=17
 javac.compilerargs=-Xlint -Xlint:-serial
 nbm.module.author=Laszlo Kishalmi
 javadoc.arch=${basedir}/arch.xml

diff --git a/java/java.disco/nbproject/project.properties b/java/java.disco/nbproject/project.properties
@@ -19,6 +19,5 @@ is.autoload=true
 release.external/checker-qual-3.9.1.jar=modules/ext/checker-qual-3.9.1.jar
 release.external/jdktools-11.0.11.jar=modules/ext/jdktools-11.0.11.jar
 release.external/discoclient-2.0.24.jar=modules/ext/discoclient-2.0.24.jar
-javac.source=11
-javac.target=11
+javac.release=11
 javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/java/jshell.support/nbproject/project.properties b/java/jshell.support/nbproject/project.properties
@@ -15,8 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-javac.source=11
-javac.target=11
+javac.release=11
 javac.compilerargs=-Xlint -Xlint:-serial
 spec.version.base=1.25.0
 is.eager=true
diff --git a/java/maven.checkstyle/nbproject/project.properties b/java/maven.checkstyle/nbproject/project.properties
@@ -14,6 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-javac.source=11
-javac.target=11
+javac.release=11
 javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/java/maven.hints/nbproject/project.properties b/java/maven.hints/nbproject/project.properties
@@ -16,8 +16,7 @@
 # under the License.
 
 is.eager=true
-javac.source=11
-javac.target=11
+javac.release=11
 #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
@@ -16,7 +16,6 @@
 # under the License.
 
 is.autoload=true
-javac.source=11
-javac.target=11
+javac.release=11
 javac.compilerargs=-Xlint -Xlint:-serial
 
diff --git a/java/maven.indexer/nbproject/project.properties b/java/maven.indexer/nbproject/project.properties
@@ -17,8 +17,7 @@
 
 test.config.stableBTD.includes=**/*Test.class
 is.autoload=true
-javac.source=11
-javac.target=11
+javac.release=11
 javac.compilerargs=-Xlint -Xlint:-serial
 release.external/indexer-core-7.1.2.jar=modules/ext/maven/indexer-core-7.1.2.jar
 release.external/search-api-7.1.2.jar=modules/ext/maven/search-api-7.1.2.jar

diff --git a/java/maven/nbproject/project.properties b/java/maven/nbproject/project.properties
@@ -34,7 +34,7 @@ test.config.stableBTD.excludes=\
 
 jnlp.indirect.files=maven-nblib/netbeans-eventspy.jar,maven-nblib/netbeans-cos.jar
 
-# TODO remove after JDK 17 bump (code uses CompilationUnitTree#getModule)
+# build needs CompilationUnitTree#getModule (jdk17) and ModuleInfoSupportTest needs functioning nb-javac
 requires.nb.javac=true
 
 test-unit-sys-prop.test.netbeans.dest.dir=${netbeans.dest.dir}
diff --git a/nb/ide.dashboard/nbproject/project.properties b/nb/ide.dashboard/nbproject/project.properties
@@ -16,6 +16,5 @@
 # under the License.
 
 javac.compilerargs=-Xlint:unchecked
-javac.source=17
-javac.target=17
+javac.release=17
 
diff --git a/nb/o.n.upgrader/nbproject/project.properties b/nb/o.n.upgrader/nbproject/project.properties
@@ -16,8 +16,7 @@
 # under the License.
 
 javac.compilerargs=-Xlint:unchecked
-javac.source=11
-javac.target=11
+javac.release=11
 module.jar.dir=core
 
 javadoc.arch=${basedir}/arch.xml

diff --git a/platform/api.dashboard/nbproject/project.properties b/platform/api.dashboard/nbproject/project.properties
@@ -16,8 +16,7 @@
 # under the License.
 is.autoload=true
 javac.compilerargs=-Xlint:unchecked
-javac.source=17
-javac.target=17
+javac.release=17
 # javadoc.arch=${basedir}/arch.xml
 # javadoc.apichanges=${basedir}/apichanges.xml
 

diff --git a/webcommon/javascript.cdtdebug.ui/nbproject/project.properties b/webcommon/javascript.cdtdebug.ui/nbproject/project.properties
@@ -15,8 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-javac.source=11
-javac.target=11
+javac.release=11
 javadoc.arch=${basedir}/arch.xml
 
 is.eager=true

diff --git a/webcommon/javascript.cdtdebug/nbproject/project.properties b/webcommon/javascript.cdtdebug/nbproject/project.properties
@@ -15,8 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-javac.source=11
-javac.target=11
+javac.release=11
 javadoc.arch=${basedir}/arch.xml
 
 is.autoload=true

diff --git a/webcommon/javascript2.editor/nbproject/project.properties b/webcommon/javascript2.editor/nbproject/project.properties
@@ -15,8 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-javac.source=11
-javac.target=11
+javac.release=11
 javac.compilerargs=-Xlint -Xlint:-serial
 javadoc.arch=${basedir}/arch.xml
 nbm.needs.restart=true

diff --git a/webcommon/lib.chrome_devtools_protocol/nbproject/project.properties b/webcommon/lib.chrome_devtools_protocol/nbproject/project.properties
@@ -17,8 +17,7 @@
 
 is.autoload=true
 javac.compilerargs=-Xlint:unchecked
-javac.source=11
-javac.target=11
+javac.release=11
 
 #javadoc.apichanges=${basedir}/apichanges.xml
 #javadoc.arch=${basedir}/arch.xml