This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new bab6bf8 Remove remaining references to compile.source and
compile.target
bab6bf8 is described below
commit bab6bf88fdea1d46fad2ac50c0ebf70e3f9bd648
Author: Mark Thomas <[email protected]>
AuthorDate: Mon Jan 24 14:53:50 2022 +0000
Remove remaining references to compile.source and compile.target
These are now unused with compile.release the effective replacement
---
modules/jdbc-pool/build.xml | 4 ----
res/bnd/build-defaults.bnd | 4 ++--
res/ide-support/netbeans/nb-tomcat.xml | 2 +-
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/modules/jdbc-pool/build.xml b/modules/jdbc-pool/build.xml
index 2feb3a4..0381503 100644
--- a/modules/jdbc-pool/build.xml
+++ b/modules/jdbc-pool/build.xml
@@ -153,8 +153,6 @@
<javac srcdir="${basedir}/src/main/java" destdir="${tomcat.classes}"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
- source="${compile.source}"
- target="${compile.target}"
release="${compile.release}"
encoding="ISO-8859-1"
includeantruntime="false">
@@ -193,8 +191,6 @@
<javac srcdir="${basedir}/src/test/java" destdir="${tomcat.testclasses}"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
- source="${compile.source}"
- target="${compile.target}"
release="${compile.release}"
encoding="ISO-8859-1"
includeantruntime="false">
diff --git a/res/bnd/build-defaults.bnd b/res/bnd/build-defaults.bnd
index b7ddb81..d07caa5 100644
--- a/res/bnd/build-defaults.bnd
+++ b/res/bnd/build-defaults.bnd
@@ -22,8 +22,8 @@ Implementation-Title: Apache Tomcat
Implementation-Version: ${version}
Implementation-Vendor: Apache Software Foundation
-X-Compile-Source-JDK: ${compile.source}
-X-Compile-Target-JDK: ${compile.target}
+X-Compile-Source-JDK: ${compile.release}
+X-Compile-Target-JDK: ${compile.release}
-includeresource.notice:
META-INF/NOTICE;literal="${replace;${cat;../META-INF/default.notice};@YEAR@;${year}}\n"
-includeresource.license: {META-INF/LICENSE=../META-INF/default.license}
diff --git a/res/ide-support/netbeans/nb-tomcat.xml
b/res/ide-support/netbeans/nb-tomcat.xml
index bbcdcd4..3a0db47 100644
--- a/res/ide-support/netbeans/nb-tomcat.xml
+++ b/res/ide-support/netbeans/nb-tomcat.xml
@@ -75,7 +75,7 @@
includes="${files}"
debug="true"
deprecation="${compile.deprecation}"
- source="${compile.source}"
+ source="${compile.release}"
encoding="ISO-8859-1"
includeantruntime="false">
<classpath path="${nb-test.classpath}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
