[java-identity-provider] branch main updated: Remove dead properties from configuration.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=4a2f13ea5ea26d5470aeb8c704118ef7f9f5f2e3

The following commit(s) were added to refs/heads/main by this push:
     new 4a2f13ea5 Remove dead properties from configuration.
4a2f13ea5 is described below

commit 4a2f13ea5ea26d5470aeb8c704118ef7f9f5f2e3
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon May 15 12:02:23 2023 -0400

    Remove dead properties from configuration.
---
 .../main/resources/net/shibboleth/idp/conf/global-system.xml   |  5 +++++
 .../net/shibboleth/idp/module/conf/services.properties         | 10 ----------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml
index 8e2498497..f3902dc53 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml
@@ -201,6 +201,11 @@
                 <value>idp.nameid.saml2.legacyGenerator</value>
                 <value>idp.service.attribute.registry.namingRegistry</value>
                 <value>idp.service.attribute.resolver.suppressDisplayInfo</value>
+                <value>idp.httpclient.memorycaching.maxCacheEntries</value>
+                <value>idp.httpclient.memorycaching.maxCacheEntrySize</value>
+                <value>idp.httpclient.filecaching.maxCacheEntries</value>
+                <value>idp.httpclient.filecaching.maxCacheEntrySize</value>
+                <value>idp.httpclient.filecaching.cacheDirectory</value>
             </list>
         </property>
     </bean>
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/services.properties b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/services.properties
index 8150d3a03..6e507a203 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/services.properties
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/services.properties
@@ -70,13 +70,3 @@ idp.service.managedBean.checkInterval = PT15M
 #idp.httpclient.socketTimeout = PT1M
 #idp.httpclient.maxConnectionsTotal = 100
 #idp.httpclient.maxConnectionsPerRoute = 100
-
-# These are deprecated properties that configure the old caching HttpClient
-# beans that are no longer supported. If you want to manually configure
-# the caching clients, you should define the beans yourself and if desired
-# rely on properties of your own devising.
-#idp.httpclient.memorycaching.maxCacheEntries = 50
-#idp.httpclient.memorycaching.maxCacheEntrySize = 1048576
-#idp.httpclient.filecaching.maxCacheEntries = 100
-#idp.httpclient.filecaching.maxCacheEntrySize = 10485760
-idp.httpclient.filecaching.cacheDirectory = %{idp.home}/tmp/httpClientCache
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.