This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 5ee4720ea9ca5701ac306caafa56ea41ec23372f
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Feb 28 11:16:18 2020 +0000
Remove deprecated code
---
java/org/apache/tomcat/util/digester/Digester.java | 12 ------------
webapps/docs/changelog.xml | 3 +--
2 files changed, 1 insertion(+), 14 deletions(-)
diff --git a/java/org/apache/tomcat/util/digester/Digester.java
b/java/org/apache/tomcat/util/digester/Digester.java
index fcf32c7..46d80d0 100644
--- a/java/org/apache/tomcat/util/digester/Digester.java
+++ b/java/org/apache/tomcat/util/digester/Digester.java
@@ -145,18 +145,6 @@ public class Digester extends DefaultHandler2 {
}
}
- /**
- * A {@link org.apache.tomcat.util.IntrospectionUtils.SecurePropertySource}
- * that uses environment variables to resolve expressions. Still available
- * for backwards compatibility.
- *
- * @deprecated Use {@link
org.apache.tomcat.util.digester.EnvironmentPropertySource}
- * This will be removed in Tomcat 10 onwards.
- */
- @Deprecated
- public static class EnvironmentPropertySource extends
org.apache.tomcat.util.digester.EnvironmentPropertySource {
- }
-
protected IntrospectionUtils.PropertySource source[] = new
IntrospectionUtils.PropertySource[] {
new SystemPropertySource() };
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c69d8d9..513420c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -71,8 +71,7 @@
Rename
<code>org.apache.tomcat.util.digester.Digester$EnvironmentPropertySource</code>
to
<code>org.apache.tomcat.util.digester.EnvironmentPropertySource</code>.
- The old class is still available but deprecated. Patch provided by
Bernd
- Bohmann. (markt)
+ Patch provided by Bernd Bohmann. (markt)
</scode>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
