This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new da3012ed27 Add a change log entry and do some minor clean-up
da3012ed27 is described below
commit da3012ed276fcb194dcbdbd18a5b8fc4a14df97d
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue May 10 17:37:06 2022 +0100
Add a change log entry and do some minor clean-up
---
.../tomcat/util/digester/ServiceBindingPropertySource.java | 13 +++++++------
webapps/docs/changelog.xml | 5 +++++
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git
a/java/org/apache/tomcat/util/digester/ServiceBindingPropertySource.java
b/java/org/apache/tomcat/util/digester/ServiceBindingPropertySource.java
index 526ad37a1e..c6b7b6ae12 100644
--- a/java/org/apache/tomcat/util/digester/ServiceBindingPropertySource.java
+++ b/java/org/apache/tomcat/util/digester/ServiceBindingPropertySource.java
@@ -16,15 +16,15 @@
*/
package org.apache.tomcat.util.digester;
-import java.security.Permission;
-
-import org.apache.tomcat.util.IntrospectionUtils;
-import org.apache.tomcat.util.security.PermissionCheck;
-import java.io.IOException;
import java.io.FilePermission;
+import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
+import java.security.Permission;
+
+import org.apache.tomcat.util.IntrospectionUtils;
+import org.apache.tomcat.util.security.PermissionCheck;
/**
* A {@link org.apache.tomcat.util.IntrospectionUtils.SecurePropertySource}
@@ -70,7 +70,8 @@ import java.nio.file.Paths;
*
* @see Digester
*
- * @see <a
href="https://tomcat.apache.org/tomcat-9.0-doc/config/systemprops.html#Property_replacements";>Tomcat
Configuration Reference System Properties</a>
+ * @see <a
href="https://tomcat.apache.org/tomcat-9.0-doc/config/systemprops.html#Property_replacements";>Tomcat
+ * Configuration Reference System Properties</a>
*/
public class ServiceBindingPropertySource implements
IntrospectionUtils.SecurePropertySource {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 47b75ef62e..99c8bd0bc4 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -129,6 +129,11 @@
mappings used by <code>ServletResponse.setLocale()</code> as it
caused regressions for applications using UTF-8. (markt)
</add>
+ <add>
+ Provide a property source that sources values from Kubernetes service
+ bindings. Pull request <pr>512</pr> provided by Sumit Kulhadia and
+ Gareth Evans. (markt)
+ </add>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
