You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2017/04/27 22:32:52 UTC
[1/2] archiva git commit: Adding retry parameter for pom
Repository: archiva
Updated Branches:
refs/heads/master 822af43a4 -> 9d60ac383
Adding retry parameter for pom
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/122f5a6d
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/122f5a6d
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/122f5a6d
Branch: refs/heads/master
Commit: 122f5a6d51c14c94a3910ac283cc86de560f408c
Parents: 822af43
Author: Martin Stockhammer <ma...@apache.org>
Authored: Fri Apr 28 00:31:57 2017 +0200
Committer: Martin Stockhammer <ma...@apache.org>
Committed: Fri Apr 28 00:31:57 2017 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/122f5a6d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6846d3a..4cf72d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1796,7 +1796,7 @@
<autoVersionSubmodules>true</autoVersionSubmodules>
<goals>deploy</goals>
<preparationGoals>${release.preparationGoals}</preparationGoals>
- <arguments>-Prelease</arguments>
+ <arguments>-Prelease -DretryFailedDeploymentCount=5</arguments>
</configuration>
</plugin>
<plugin>
[2/2] archiva git commit: Fixing redback runtime configuration of
list properties
Posted by ma...@apache.org.
Fixing redback runtime configuration of list properties
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/9d60ac38
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/9d60ac38
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/9d60ac38
Branch: refs/heads/master
Commit: 9d60ac38326e177b6d078da79270705a9168531a
Parents: 122f5a6
Author: Martin Stockhammer <ma...@apache.org>
Authored: Fri Apr 28 00:32:24 2017 +0200
Committer: Martin Stockhammer <ma...@apache.org>
Committed: Fri Apr 28 00:32:24 2017 +0200
----------------------------------------------------------------------
.../runtime/DefaultRedbackRuntimeConfigurationAdmin.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/9d60ac38/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
----------------------------------------------------------------------
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 3da5a37..3ce727c 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
@@ -42,6 +42,7 @@ import javax.annotation.PostConstruct;
import javax.inject.Inject;
import javax.inject.Named;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
@@ -389,6 +390,7 @@ public class DefaultRedbackRuntimeConfigurationAdmin
properties.remove( UserConfigurationKeys.LDAP_AUTHENTICATION_METHOD );
properties.remove( UserConfigurationKeys.LDAP_WRITABLE );
properties.remove( UserConfigurationKeys.LDAP_GROUPS_USE_ROLENAME );
+
// cleanup groups <-> role mapping
/**for ( Map.Entry<String, String> entry : new HashMap<String, String>( properties ).entrySet() )
{
@@ -690,10 +692,13 @@ public class DefaultRedbackRuntimeConfigurationAdmin
@Override
public List<String> getList( String key )
{
+ RedbackRuntimeConfiguration conf = getRedbackRuntimeConfiguration();
+ if (conf.getConfigurationProperties().containsKey(key)) {
+ return Arrays.asList(conf.getConfigurationProperties().get(key).split(","));
+ }
+
List<String> value = userConfiguration.getList( key );
- RedbackRuntimeConfiguration conf = getRedbackRuntimeConfiguration();
- // TODO concat values
conf.getConfigurationProperties().put( key, "" );
try
{