This is an automated email from the ASF dual-hosted git repository. martin_s pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/archiva.git
commit 7b1574857ced6b4e893c718e71fbb6ee79997006 Author: Martin Stockhammer <[email protected]> AuthorDate: Sun Jan 10 16:04:31 2021 +0100 Removing ldap properties as they are env properties for ldap context --- .../runtime/DefaultRedbackRuntimeConfigurationAdmin.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java index 256865e..86cad9e 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java @@ -424,16 +424,6 @@ public class DefaultRedbackRuntimeConfigurationAdmin Map<String, String> properties = redbackRuntimeConfiguration.getConfigurationProperties(); LdapConfiguration ldapConf = redbackRuntimeConfiguration.getLdapConfiguration( ); LDAP_MAPPER.getAllAttributes( ).stream( ).forEach( att -> properties.remove( att ) ); - List<String> prefixRemove = new ArrayList<>( ); - for ( String key : properties.keySet()) { - boolean prefixMapping = LDAP_MAPPER.isPrefixMapping( key ); - if (prefixMapping) { - prefixRemove.add( key ); - } else if ( key.startsWith( "ldap" ) && !LDAP_MAPPER.isMapping( key ) ) { - ldapConf.getExtraProperties( ).put( key, properties.get( key ) ); - } - } - prefixRemove.stream( ).forEach( att -> properties.remove( att ) ); } private org.apache.archiva.configuration.RedbackRuntimeConfiguration build(
