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 2020/01/25 19:08:49 UTC
[archiva-redback-core] branch redback-2.6.x created (now 4a98784)
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a change to branch redback-2.6.x
in repository https://gitbox.apache.org/repos/asf/archiva-redback-core.git.
at 4a98784 [MRM-2008] Fix for group names with slashes
This branch includes the following new commits:
new cd9334c Switching to SNAPSHOT version 2.6.1-SNAPSHOT
new 4a98784 [MRM-2008] Fix for group names with slashes
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[archiva-redback-core] 02/02: [MRM-2008] Fix for group names with
slashes
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch redback-2.6.x
in repository https://gitbox.apache.org/repos/asf/archiva-redback-core.git
commit 4a9878403158aa1d16817bf78fc56e5e8a26e8cd
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Fri Jan 24 21:58:09 2020 +0100
[MRM-2008] Fix for group names with slashes
Changing the group name retrieval to attribute read. Using CompositeName and
LdapName to retrieve the result. Slashes are treated special in JNDI.
---
.../archiva/redback/common/ldap/LdapUtils.java | 43 +++
.../common/ldap/role/DefaultLdapRoleMapper.java | 374 +++++++++++----------
.../common/ldap/role/TestLdapRoleMapper.java | 30 +-
.../src/test/security.properties | 3 +-
.../configuration/UserConfigurationKeys.java | 4 +
5 files changed, 275 insertions(+), 179 deletions(-)
diff --git a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUtils.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUtils.java
index 1131cee..529a2d9 100644
--- a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUtils.java
+++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUtils.java
@@ -19,10 +19,14 @@ package org.apache.archiva.redback.common.ldap;
* under the License.
*/
+import javax.naming.CompositeName;
+import javax.naming.InvalidNameException;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
import javax.naming.directory.Attribute;
import javax.naming.directory.Attributes;
+import javax.naming.ldap.LdapName;
+import javax.naming.ldap.Rdn;
/**
*
@@ -129,4 +133,43 @@ public final class LdapUtils
return null;
}
+
+ /**
+ * Returns a LDAP name from a given RDN string. The <code>name</code> parameter must be a string
+ * representation of a composite name (as returned by ldapsearch result getName())
+ * @param name The string of the RDN (may be escaped)
+ * @return The LdapName that corresponds to this string
+ * @throws InvalidNameException If the string cannot be parsed as LDAP name
+ */
+ public static LdapName getLdapNameFromString(final String name) throws InvalidNameException
+ {
+ CompositeName coName = new CompositeName( name );
+ LdapName ldapName = new LdapName( "" );
+ ldapName.addAll( coName );
+ return ldapName;
+ }
+
+ /**
+ * Returns the first RDN value that matches the given type.
+ * E.g. for the RDN ou=People,dc=test,dc=de, and type dc it will return 'test'.
+ *
+ * @param name the ldap name
+ * @param type the type of the RDN entry
+ * @return
+ */
+ public static String findFirstRdnValue(LdapName name, String type) {
+ for ( Rdn rdn : name.getRdns() )
+ {
+ if ( rdn.getType( ).equals( type ) )
+ {
+ Object val = rdn.getValue( );
+ if (val!=null) {
+ return val.toString( );
+ } else {
+ return "";
+ }
+ }
+ }
+ return "";
+ }
}
diff --git a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java
index a8348f9..761daee 100644
--- a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java
+++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java
@@ -48,6 +48,7 @@ import javax.naming.directory.DirContext;
import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
+import javax.naming.ldap.LdapName;
import javax.naming.ldap.Rdn;
import java.util.ArrayList;
import java.util.Collection;
@@ -66,7 +67,7 @@ public class DefaultLdapRoleMapper
implements LdapRoleMapper
{
- private Logger log = LoggerFactory.getLogger( getClass() );
+ private Logger log = LoggerFactory.getLogger( getClass( ) );
@Inject
@Named( value = "ldapConnectionFactory#configurable" )
@@ -96,7 +97,7 @@ public class DefaultLdapRoleMapper
private String baseDn;
- private String ldapGroupMember = "uniqueMember";
+ private String ldapGroupMemberAttribute = "uniqueMember";
private boolean useDefaultRoleName = false;
@@ -106,13 +107,28 @@ public class DefaultLdapRoleMapper
* possible to user cn=beer or uid=beer or sn=beer etc
* so make it configurable
*/
- private String userIdAttribute = "uid";
+ public static String DEFAULT_USER_ID_ATTRIBUTE = "uid";
+ private String userIdAttribute = DEFAULT_USER_ID_ATTRIBUTE;
+
+ public static String DEFAULT_GROUP_NAME_ATTRIBUTE = "cn";
+ private String groupNameAttribute = DEFAULT_GROUP_NAME_ATTRIBUTE;
+
+ // True, if the member attribute stores the DN, otherwise the userkey is used as entry value
+ private boolean useDnAsMemberValue = true;
+
+ private static final String POSIX_GROUP = "posixGroup";
@PostConstruct
- public void initialize()
+ public void initialize( )
{
this.ldapGroupClass = userConf.getString( UserConfigurationKeys.LDAP_GROUPS_CLASS, this.ldapGroupClass );
+ if (StringUtils.equalsIgnoreCase( POSIX_GROUP, this.ldapGroupClass )) {
+ this.useDnAsMemberValue = false;
+ }
+
+ this.useDnAsMemberValue = userConf.getBoolean( UserConfigurationKeys.LDAP_GROUPS_USE_DN_AS_MEMBER_VALUE, this.useDnAsMemberValue );
+
this.baseDn = userConf.getConcatenatedList( UserConfigurationKeys.LDAP_BASEDN, this.baseDn );
this.groupsDn = userConf.getConcatenatedList( UserConfigurationKeys.LDAP_GROUPS_BASEDN, this.groupsDn );
@@ -127,11 +143,30 @@ public class DefaultLdapRoleMapper
this.useDefaultRoleName =
userConf.getBoolean( UserConfigurationKeys.LDAP_GROUPS_USE_ROLENAME, this.useDefaultRoleName );
- this.userIdAttribute = userConf.getString( UserConfigurationKeys.LDAP_USER_ID_ATTRIBUTE, this.userIdAttribute );
+ this.userIdAttribute = userConf.getString( UserConfigurationKeys.LDAP_USER_ID_ATTRIBUTE, DEFAULT_USER_ID_ATTRIBUTE );
- this.ldapGroupMember = userConf.getString( UserConfigurationKeys.LDAP_GROUPS_MEMBER, this.ldapGroupMember );
+ this.ldapGroupMemberAttribute = userConf.getString( UserConfigurationKeys.LDAP_GROUPS_MEMBER, this.ldapGroupMemberAttribute );
this.dnAttr = userConf.getString( UserConfigurationKeys.LDAP_DN_ATTRIBUTE, this.dnAttr );
+
+ this.groupNameAttribute = userConf.getString( UserConfigurationKeys.LDAP_GROUP_NAME_ATTRIBUTE, DEFAULT_GROUP_NAME_ATTRIBUTE );
+ }
+
+
+ private String getGroupNameFromResult( SearchResult searchResult ) throws NamingException
+ {
+ Attribute gNameAtt = searchResult.getAttributes( ).get( groupNameAttribute );
+ if ( gNameAtt != null )
+ {
+ return gNameAtt.get( ).toString( );
+ }
+ else
+ {
+ log.error( "Could not get group name from attribute {}. Group DN: {}", groupNameAttribute, searchResult.getNameInNamespace( ) );
+ return "";
+ }
+
+
}
public List<String> getAllGroups( DirContext context )
@@ -142,45 +177,43 @@ public class DefaultLdapRoleMapper
try
{
- SearchControls searchControls = new SearchControls();
+ SearchControls searchControls = new SearchControls( );
searchControls.setDerefLinkFlag( true );
searchControls.setSearchScope( SearchControls.SUBTREE_SCOPE );
+ searchControls.setReturningAttributes( new String[]{ this.getLdapDnAttribute(), "objectClass", groupNameAttribute} );
- String filter = "objectClass=" + getLdapGroupClass();
+ String filter = "objectClass=" + getLdapGroupClass( );
if ( !StringUtils.isEmpty( this.groupFilter ) )
{
filter = "(&(" + filter + ")(" + this.groupFilter + "))";
}
- namingEnumeration = context.search( getGroupsDn(), filter, searchControls );
+ namingEnumeration = context.search( getGroupsDn( ), filter, searchControls );
- List<String> allGroups = new ArrayList<String>();
+ List<String> allGroups = new ArrayList<String>( );
- while ( namingEnumeration.hasMore() )
+ while ( namingEnumeration.hasMore( ) )
{
- SearchResult searchResult = namingEnumeration.next();
-
- String groupName = searchResult.getName();
- // cn=blabla we only want bla bla
- groupName = StringUtils.substringAfter( groupName, "=" );
-
- log.debug( "found groupName: '{}", groupName );
-
- allGroups.add( groupName );
-
+ SearchResult searchResult = namingEnumeration.next( );
+ String groupName = getGroupNameFromResult( searchResult );
+ if ( StringUtils.isNotEmpty( groupName ) )
+ {
+ log.debug( "Found groupName: '{}", groupName );
+ allGroups.add( groupName );
+ }
}
return allGroups;
}
catch ( LdapException e )
{
- throw new MappingException( e.getMessage(), e );
+ throw new MappingException( e.getMessage( ), e );
}
catch ( NamingException e )
{
- throw new MappingException( e.getMessage(), e );
+ throw new MappingException( e.getMessage( ), e );
}
finally
@@ -195,7 +228,7 @@ public class DefaultLdapRoleMapper
{
try
{
- namingEnumeration.close();
+ namingEnumeration.close( );
}
catch ( NamingException e )
{
@@ -225,16 +258,16 @@ public class DefaultLdapRoleMapper
try
{
- SearchControls searchControls = new SearchControls();
+ SearchControls searchControls = new SearchControls( );
searchControls.setDerefLinkFlag( true );
searchControls.setSearchScope( SearchControls.SUBTREE_SCOPE );
- String filter = "objectClass=" + getLdapGroupClass();
+ String filter = "objectClass=" + getLdapGroupClass( );
- namingEnumeration = context.search( "cn=" + groupName + "," + getGroupsDn(), filter, searchControls );
+ namingEnumeration = context.search( groupNameAttribute + "=" + groupName + "," + getGroupsDn( ), filter, searchControls );
- return namingEnumeration.hasMore();
+ return namingEnumeration.hasMore( );
}
catch ( NameNotFoundException e )
{
@@ -243,11 +276,11 @@ public class DefaultLdapRoleMapper
}
catch ( LdapException e )
{
- throw new MappingException( e.getMessage(), e );
+ throw new MappingException( e.getMessage( ), e );
}
catch ( NamingException e )
{
- throw new MappingException( e.getMessage(), e );
+ throw new MappingException( e.getMessage( ), e );
}
finally
@@ -261,14 +294,14 @@ public class DefaultLdapRoleMapper
{
List<String> groups = getAllGroups( context );
- if ( groups.isEmpty() )
+ if ( groups.isEmpty( ) )
{
- return Collections.emptyList();
+ return Collections.emptyList( );
}
- Set<String> roles = new HashSet<String>( groups.size() );
+ Set<String> roles = new HashSet<String>( groups.size( ) );
- Map<String, Collection<String>> mapping = ldapRoleMapperConfiguration.getLdapGroupMappings();
+ Map<String, Collection<String>> mapping = ldapRoleMapperConfiguration.getLdapGroupMappings( );
for ( String group : groups )
{
@@ -293,30 +326,29 @@ public class DefaultLdapRoleMapper
try
{
- SearchControls searchControls = new SearchControls();
+ SearchControls searchControls = new SearchControls( );
searchControls.setDerefLinkFlag( true );
searchControls.setSearchScope( SearchControls.SUBTREE_SCOPE );
- String filter = "objectClass=" + getLdapGroupClass();
+ String filter = "objectClass=" + getLdapGroupClass( );
- namingEnumeration = context.search( "cn=" + group + "," + getGroupsDn(), filter, searchControls );
+ namingEnumeration = context.search( groupNameAttribute + "=" + group + "," + getGroupsDn( ), filter, searchControls );
- List<String> allMembers = new ArrayList<String>();
+ List<String> allMembers = new ArrayList<String>( );
- while ( namingEnumeration.hasMore() )
+ while ( namingEnumeration.hasMore( ) )
{
- SearchResult searchResult = namingEnumeration.next();
+ SearchResult searchResult = namingEnumeration.next( );
- Attribute uniqueMemberAttr = searchResult.getAttributes().get( getLdapGroupMember() );
+ Attribute uniqueMemberAttr = searchResult.getAttributes( ).get( getLdapGroupMemberAttribute( ) );
if ( uniqueMemberAttr != null )
{
- NamingEnumeration<String> allMembersEnum = (NamingEnumeration<String>) uniqueMemberAttr.getAll();
- while ( allMembersEnum.hasMore() )
+ NamingEnumeration<?> allMembersEnum = uniqueMemberAttr.getAll( );
+ while ( allMembersEnum.hasMore( ) )
{
- String userName = allMembersEnum.next();
- // uid=blabla we only want bla bla
+ String userName = allMembersEnum.next( ).toString( );
userName = StringUtils.substringAfter( userName, "=" );
userName = StringUtils.substringBefore( userName, "," );
log.debug( "found userName for group {}: '{}", group, userName );
@@ -333,11 +365,11 @@ public class DefaultLdapRoleMapper
}
catch ( LdapException e )
{
- throw new MappingException( e.getMessage(), e );
+ throw new MappingException( e.getMessage( ), e );
}
catch ( NamingException e )
{
- throw new MappingException( e.getMessage(), e );
+ throw new MappingException( e.getMessage( ), e );
}
finally
@@ -346,32 +378,39 @@ public class DefaultLdapRoleMapper
}
}
+ private String getUserDnFromId(String userKey) {
+ return new StringBuilder().append( this.userIdAttribute ).append( "=" ).append( userKey ).append( "," ).append(
+ getBaseDn( ) ).toString();
+ }
+
public List<String> getGroups( String username, DirContext context )
throws MappingException
{
- List<String> userGroups = new ArrayList<String>();
+ Set<String> userGroups = new HashSet<String>( );
NamingEnumeration<SearchResult> namingEnumeration = null;
try
{
- SearchControls searchControls = new SearchControls();
+ SearchControls searchControls = new SearchControls( );
searchControls.setDerefLinkFlag( true );
searchControls.setSearchScope( SearchControls.SUBTREE_SCOPE );
+
+
String groupEntry = null;
try
{
//try to look the user up
User user = userManager.findUser( username );
- if ( user instanceof LdapUser )
+ if ( user != null && user instanceof LdapUser )
{
- LdapUser ldapUser = LdapUser.class.cast( user );
- Attribute dnAttribute = ldapUser.getOriginalAttributes().get( getLdapDnAttribute() );
+ LdapUser ldapUser = (LdapUser) user ;
+ Attribute dnAttribute = ldapUser.getOriginalAttributes( ).get( getLdapDnAttribute( ) );
if ( dnAttribute != null )
{
- groupEntry = String.class.cast( dnAttribute.get() );
+ groupEntry = dnAttribute.get( ).toString();
}
}
@@ -387,82 +426,47 @@ public class DefaultLdapRoleMapper
if ( groupEntry == null )
{
//failed to look up the user's groupEntry directly
- StringBuilder builder = new StringBuilder();
- String posixGroup = "posixGroup";
- if ( posixGroup.equals( getLdapGroupClass() ) )
+
+ if ( this.useDnAsMemberValue )
{
- builder.append( username );
+ groupEntry = getUserDnFromId( username );
}
else
{
- builder.append( this.userIdAttribute ).append( "=" ).append( username ).append( "," ).append(
- getBaseDn() );
+ groupEntry = username;
}
- groupEntry = builder.toString();
}
String filter =
- new StringBuilder().append( "(&" ).append( "(objectClass=" + getLdapGroupClass() + ")" ).append(
- "(" ).append( getLdapGroupMember() ).append( "=" ).append( Rdn.escapeValue(groupEntry) ).append( ")" ).append(
- ")" ).toString();
+ new StringBuilder( ).append( "(&" ).append( "(objectClass=" + getLdapGroupClass( ) + ")" ).append(
+ "(" ).append( getLdapGroupMemberAttribute( ) ).append( "=" ).append( Rdn.escapeValue( groupEntry ) ).append( ")" ).append(
+ ")" ).toString( );
log.debug( "filter: {}", filter );
- namingEnumeration = context.search( getGroupsDn(), filter, searchControls );
+ namingEnumeration = context.search( getGroupsDn( ), filter, searchControls );
- while ( namingEnumeration.hasMore() )
+ while ( namingEnumeration.hasMore( ) )
{
- SearchResult searchResult = namingEnumeration.next();
-
- List<String> allMembers = new ArrayList<String>();
-
- Attribute uniqueMemberAttr = searchResult.getAttributes().get( getLdapGroupMember() );
-
- if ( uniqueMemberAttr != null )
- {
- NamingEnumeration<String> allMembersEnum = (NamingEnumeration<String>) uniqueMemberAttr.getAll();
- while ( allMembersEnum.hasMore() )
- {
-
- String userName = allMembersEnum.next();
- //the original dn
- allMembers.add( userName );
- // uid=blabla we only want bla bla
- userName = StringUtils.substringAfter( userName, "=" );
- userName = StringUtils.substringBefore( userName, "," );
- allMembers.add( userName );
- }
- close( allMembersEnum );
- }
-
- if ( allMembers.contains( username ) )
- {
- String groupName = searchResult.getName();
- // cn=blabla we only want bla bla
- groupName = StringUtils.substringAfter( groupName, "=" );
- userGroups.add( groupName );
+ SearchResult groupSearchResult = namingEnumeration.next( );
+ String groupName = getGroupNameFromResult( groupSearchResult );
- }
- else if ( allMembers.contains( groupEntry ) )
- {
- String groupName = searchResult.getName();
- // cn=blabla we only want bla bla
- groupName = StringUtils.substringAfter( groupName, "=" );
+ if (StringUtils.isNotEmpty( groupName )) {
userGroups.add( groupName );
}
}
- return userGroups;
+ return new ArrayList( userGroups );
}
catch ( LdapException e )
{
- throw new MappingException( e.getMessage(), e );
+ throw new MappingException( e.getMessage( ), e );
}
catch ( NamingException e )
{
- throw new MappingException( e.getMessage(), e );
+ throw new MappingException( e.getMessage( ), e );
}
finally
{
@@ -475,9 +479,9 @@ public class DefaultLdapRoleMapper
{
List<String> groups = getGroups( username, context );
- Map<String, Collection<String>> rolesMapping = ldapRoleMapperConfiguration.getLdapGroupMappings();
+ Map<String, Collection<String>> rolesMapping = ldapRoleMapperConfiguration.getLdapGroupMappings( );
- Set<String> roles = new HashSet<String>( groups.size() );
+ Set<String> roles = new HashSet<String>( groups.size( ) );
for ( String group : groups )
{
@@ -504,26 +508,26 @@ public class DefaultLdapRoleMapper
{
try
{
- namingEnumeration.close();
+ namingEnumeration.close( );
}
catch ( NamingException e )
{
- log.warn( "fail to close namingEnumeration: {}", e.getMessage() );
+ log.warn( "fail to close namingEnumeration: {}", e.getMessage( ) );
}
}
}
- public String getGroupsDn()
+ public String getGroupsDn( )
{
return this.groupsDn;
}
- public String getLdapGroupClass()
+ public String getLdapGroupClass( )
{
return this.ldapGroupClass;
}
- public String getLdapDnAttribute()
+ public String getLdapDnAttribute( )
{
return this.dnAttr;
}
@@ -564,16 +568,16 @@ public class DefaultLdapRoleMapper
objectClass.add( "top" );
objectClass.add( "groupOfUniqueNames" );
attributes.put( objectClass );
- attributes.put( "cn", groupName );
+ attributes.put( this.groupNameAttribute, groupName );
// attribute mandatory when created a group so add admin as default member
- BasicAttribute basicAttribute = new BasicAttribute( getLdapGroupMember() );
- basicAttribute.add( this.userIdAttribute + "=admin," + getBaseDn() );
+ BasicAttribute basicAttribute = new BasicAttribute( getLdapGroupMemberAttribute( ) );
+ basicAttribute.add( this.userIdAttribute + "=admin," + getBaseDn( ) );
attributes.put( basicAttribute );
try
{
- String dn = "cn=" + groupName + "," + this.groupsDn;
+ String dn = this.groupNameAttribute + "=" + groupName + "," + this.groupsDn;
context.createSubcontext( dn, attributes );
@@ -588,12 +592,12 @@ public class DefaultLdapRoleMapper
}
catch ( LdapException e )
{
- throw new MappingException( e.getMessage(), e );
+ throw new MappingException( e.getMessage( ), e );
}
catch ( NamingException e )
{
- throw new MappingException( e.getMessage(), e );
+ throw new MappingException( e.getMessage( ), e );
}
}
@@ -612,31 +616,31 @@ public class DefaultLdapRoleMapper
NamingEnumeration<SearchResult> namingEnumeration = null;
try
{
- SearchControls searchControls = new SearchControls();
+ SearchControls searchControls = new SearchControls( );
searchControls.setDerefLinkFlag( true );
searchControls.setSearchScope( SearchControls.SUBTREE_SCOPE );
- String filter = "objectClass=" + getLdapGroupClass();
+ String filter = "objectClass=" + getLdapGroupClass( );
- namingEnumeration = context.search( "cn=" + groupName + "," + getGroupsDn(), filter, searchControls );
+ namingEnumeration = context.search( this.groupNameAttribute + "=" + groupName + "," + getGroupsDn( ), filter, searchControls );
- while ( namingEnumeration.hasMore() )
+ if ( namingEnumeration.hasMore() )
{
- SearchResult searchResult = namingEnumeration.next();
- Attribute attribute = searchResult.getAttributes().get( getLdapGroupMember() );
+ SearchResult searchResult = namingEnumeration.next( );
+ Attribute attribute = searchResult.getAttributes( ).get( getLdapGroupMemberAttribute( ) );
if ( attribute == null )
{
- BasicAttribute basicAttribute = new BasicAttribute( getLdapGroupMember() );
- basicAttribute.add( this.userIdAttribute + "=" + username + "," + getBaseDn() );
- context.modifyAttributes( "cn=" + groupName + "," + getGroupsDn(), new ModificationItem[]{
- new ModificationItem( DirContext.ADD_ATTRIBUTE, basicAttribute ) } );
+ BasicAttribute basicAttribute = new BasicAttribute( getLdapGroupMemberAttribute( ) );
+ basicAttribute.add( this.userIdAttribute + "=" + username + "," + getBaseDn( ) );
+ context.modifyAttributes( this.groupNameAttribute + "=" + groupName + "," + getGroupsDn( ), new ModificationItem[]{
+ new ModificationItem( DirContext.ADD_ATTRIBUTE, basicAttribute )} );
}
else
{
- attribute.add( this.userIdAttribute + "=" + username + "," + getBaseDn() );
- context.modifyAttributes( "cn=" + groupName + "," + getGroupsDn(), new ModificationItem[]{
- new ModificationItem( DirContext.REPLACE_ATTRIBUTE, attribute ) } );
+ attribute.add( this.userIdAttribute + "=" + username + "," + getBaseDn( ) );
+ context.modifyAttributes( this.groupNameAttribute + "=" + groupName + "," + getGroupsDn( ), new ModificationItem[]{
+ new ModificationItem( DirContext.REPLACE_ATTRIBUTE, attribute )} );
}
return true;
}
@@ -645,11 +649,11 @@ public class DefaultLdapRoleMapper
}
catch ( LdapException e )
{
- throw new MappingException( e.getMessage(), e );
+ throw new MappingException( e.getMessage( ), e );
}
catch ( NamingException e )
{
- throw new MappingException( e.getMessage(), e );
+ throw new MappingException( e.getMessage( ), e );
}
finally
@@ -658,7 +662,7 @@ public class DefaultLdapRoleMapper
{
try
{
- namingEnumeration.close();
+ namingEnumeration.close( );
}
catch ( NamingException e )
{
@@ -683,25 +687,25 @@ public class DefaultLdapRoleMapper
try
{
- SearchControls searchControls = new SearchControls();
+ SearchControls searchControls = new SearchControls( );
searchControls.setDerefLinkFlag( true );
searchControls.setSearchScope( SearchControls.SUBTREE_SCOPE );
- String filter = "objectClass=" + getLdapGroupClass();
+ String filter = "objectClass=" + getLdapGroupClass( );
- namingEnumeration = context.search( "cn=" + groupName + "," + getGroupsDn(), filter, searchControls );
+ namingEnumeration = context.search( groupNameAttribute + "=" + groupName + "," + getGroupsDn( ), filter, searchControls );
- while ( namingEnumeration.hasMore() )
+ if ( namingEnumeration.hasMore() )
{
- SearchResult searchResult = namingEnumeration.next();
- Attribute attribute = searchResult.getAttributes().get( getLdapGroupMember() );
+ SearchResult searchResult = namingEnumeration.next( );
+ Attribute attribute = searchResult.getAttributes( ).get( getLdapGroupMemberAttribute( ) );
if ( attribute != null )
{
- BasicAttribute basicAttribute = new BasicAttribute( getLdapGroupMember() );
- basicAttribute.add( this.userIdAttribute + "=" + username + "," + getGroupsDn() );
- context.modifyAttributes( "cn=" + groupName + "," + getGroupsDn(), new ModificationItem[]{
- new ModificationItem( DirContext.REMOVE_ATTRIBUTE, basicAttribute ) } );
+ BasicAttribute basicAttribute = new BasicAttribute( getLdapGroupMemberAttribute( ) );
+ basicAttribute.add( this.userIdAttribute + "=" + username + "," + getGroupsDn( ) );
+ context.modifyAttributes( groupNameAttribute + "=" + groupName + "," + getGroupsDn( ), new ModificationItem[]{
+ new ModificationItem( DirContext.REMOVE_ATTRIBUTE, basicAttribute )} );
}
return true;
}
@@ -710,11 +714,11 @@ public class DefaultLdapRoleMapper
}
catch ( LdapException e )
{
- throw new MappingException( e.getMessage(), e );
+ throw new MappingException( e.getMessage( ), e );
}
catch ( NamingException e )
{
- throw new MappingException( e.getMessage(), e );
+ throw new MappingException( e.getMessage( ), e );
}
finally
@@ -723,7 +727,7 @@ public class DefaultLdapRoleMapper
{
try
{
- namingEnumeration.close();
+ namingEnumeration.close( );
}
catch ( NamingException e )
{
@@ -733,33 +737,58 @@ public class DefaultLdapRoleMapper
}
}
+
+
public void removeAllRoles( DirContext context )
throws MappingException
{
//all mapped roles
- Collection<String> groups = ldapRoleMapperConfiguration.getLdapGroupMappings().keySet();
+ Collection<String> groups = ldapRoleMapperConfiguration.getLdapGroupMappings( ).keySet( );
try
{
for ( String groupName : groups )
{
-
- String dn = "cn=" + groupName + "," + this.groupsDn;
-
- context.unbind( dn );
-
- log.debug( "deleted group with dn:'{}", dn );
+ removeGroupByName( context, groupName );
}
}
catch ( LdapException e )
{
- throw new MappingException( e.getMessage(), e );
+ throw new MappingException( e.getMessage( ), e );
}
catch ( NamingException e )
{
- throw new MappingException( e.getMessage(), e );
+ throw new MappingException( e.getMessage( ), e );
+ }
+ }
+
+ private void removeGroupByName( DirContext context, String groupName ) throws NamingException
+ {
+ NamingEnumeration<SearchResult> namingEnumeration = null;
+ try
+ {
+ SearchControls searchControls = new SearchControls( );
+
+ searchControls.setDerefLinkFlag( true );
+ searchControls.setSearchScope( SearchControls.SUBTREE_SCOPE );
+ String filter = "(&(objectClass=" + getLdapGroupClass( ) + ")(" + groupNameAttribute + "=" + Rdn.escapeValue( groupName ) + "))";
+ // String filter = "(&(objectClass=" + getLdapGroupClass( ) + "))";
+ namingEnumeration = context.search( getGroupsDn( ), filter, searchControls );
+
+ // We delete only the first found group
+ if ( namingEnumeration != null && namingEnumeration.hasMore( ) )
+ {
+ SearchResult result = namingEnumeration.next( );
+ String dn = result.getNameInNamespace( );
+ context.unbind( new LdapName( dn ) );
+ log.debug( "Deleted group with dn:'{}", dn );
+ }
+ }
+ finally
+ {
+ closeNamingEnumeration( namingEnumeration );
}
}
@@ -768,25 +797,24 @@ public class DefaultLdapRoleMapper
{
String groupName = findGroupName( roleName );
-
+ if (StringUtils.isEmpty( groupName )) {
+ log.warn( "No group for the given role found: role={}", roleName );
+ return;
+ }
try
{
- String dn = "cn=" + groupName + "," + this.groupsDn;
-
- context.unbind( dn );
-
- log.info( "deleted group with dn:'{}", dn );
+ removeGroupByName( context, groupName );
}
catch ( LdapException e )
{
- throw new MappingException( e.getMessage(), e );
+ throw new MappingException( e.getMessage( ), e );
}
catch ( NamingException e )
{
- throw new MappingException( e.getMessage(), e );
+ throw new MappingException( e.getMessage( ), e );
}
}
@@ -819,7 +847,7 @@ public class DefaultLdapRoleMapper
this.ldapConnectionFactory = ldapConnectionFactory;
}
- public String getBaseDn()
+ public String getBaseDn( )
{
return baseDn;
}
@@ -829,14 +857,14 @@ public class DefaultLdapRoleMapper
this.baseDn = baseDn;
}
- public String getLdapGroupMember()
+ public String getLdapGroupMemberAttribute( )
{
- return ldapGroupMember;
+ return ldapGroupMemberAttribute;
}
- public void setLdapGroupMember( String ldapGroupMember )
+ public void setLdapGroupMemberAttribute( String ldapGroupMemberAttribute )
{
- this.ldapGroupMember = ldapGroupMember;
+ this.ldapGroupMemberAttribute = ldapGroupMemberAttribute;
}
//-------------------
@@ -846,20 +874,20 @@ public class DefaultLdapRoleMapper
protected String findGroupName( String role )
throws MappingException
{
- Map<String, Collection<String>> mapping = ldapRoleMapperConfiguration.getLdapGroupMappings();
+ Map<String, Collection<String>> mapping = ldapRoleMapperConfiguration.getLdapGroupMappings( );
- for ( Map.Entry<String, Collection<String>> entry : mapping.entrySet() )
+ for ( Map.Entry<String, Collection<String>> entry : mapping.entrySet( ) )
{
- if ( entry.getValue().contains( role ) )
+ if ( entry.getValue( ).contains( role ) )
{
- return entry.getKey();
+ return entry.getKey( );
}
}
return null;
}
- public String getUserIdAttribute()
+ public String getUserIdAttribute( )
{
return userIdAttribute;
}
@@ -869,7 +897,7 @@ public class DefaultLdapRoleMapper
this.userIdAttribute = userIdAttribute;
}
- public boolean isUseDefaultRoleName()
+ public boolean isUseDefaultRoleName( )
{
return useDefaultRoleName;
}
diff --git a/redback-common/redback-common-ldap/src/test/java/org/apache/archiva/redback/common/ldap/role/TestLdapRoleMapper.java b/redback-common/redback-common-ldap/src/test/java/org/apache/archiva/redback/common/ldap/role/TestLdapRoleMapper.java
index a0e55ad..2a101aa 100644
--- a/redback-common/redback-common-ldap/src/test/java/org/apache/archiva/redback/common/ldap/role/TestLdapRoleMapper.java
+++ b/redback-common/redback-common-ldap/src/test/java/org/apache/archiva/redback/common/ldap/role/TestLdapRoleMapper.java
@@ -88,7 +88,7 @@ public class TestLdapRoleMapper
LdapConnectionFactory ldapConnectionFactory;
List<String> roleNames =
- Arrays.asList( "Archiva System Administrator", "Internal Repo Manager", "Internal Repo Observer" );
+ Arrays.asList( "Archiva System Administrator", "Internal Repo Manager", "Internal Repo Observer", "Ldap Group Test Role" );
LdapConnection ldapConnection;
@@ -109,6 +109,7 @@ public class TestLdapRoleMapper
usersPerGroup.put( "internal-repo-manager", Arrays.asList( "admin", "user.9" ) );
usersPerGroup.put( "internal-repo-observer", Arrays.asList( "admin", "user.7", "user.8" ) );
usersPerGroup.put( "archiva-admin", Arrays.asList( "admin", "user.7" ) );
+ usersPerGroup.put( "archiva/group-with-slash", Arrays.asList( "user.8", "user.9" ) );
users = new ArrayList<String>( 4 );
users.add( "admin" );
@@ -161,7 +162,12 @@ public class TestLdapRoleMapper
for ( Map.Entry<String, List<String>> group : usersPerGroup.entrySet() )
{
- context.unbind( createGroupDn( group.getKey() ) );
+ try
+ {
+ context.unbind( createGroupDn( group.getKey( ) ) );
+ } catch (Exception ex) {
+ // Ignore
+ }
}
context.unbind( suffix );
@@ -298,7 +304,7 @@ public class TestLdapRoleMapper
log.info( "allGroups: {}", allGroups );
- assertThat( allGroups ).isNotNull().isNotEmpty().contains( "archiva-admin",
+ assertThat( allGroups ).isNotNull().isNotEmpty().contains( "archiva/group-with-slash", "archiva-admin",
"internal-repo-manager" );
}
@@ -331,7 +337,7 @@ public class TestLdapRoleMapper
groups = ldapRoleMapper.getGroups( "user.8", getDirContext() );
- assertThat( groups ).isNotNull().isNotEmpty().hasSize( 1 ).contains( "internal-repo-observer" );
+ assertThat( groups ).isNotNull().isNotEmpty().hasSize( 2 ).contains( "internal-repo-observer", "archiva/group-with-slash" );
groups = ldapRoleMapper.getGroups( "user.7", getDirContext() );
@@ -362,7 +368,7 @@ public class TestLdapRoleMapper
log.info( "roles for user.8: {}", roles );
- assertThat( roles ).isNotNull().isNotEmpty().hasSize( 1 ).contains( "Internal Repo Observer" );
+ assertThat( roles ).isNotNull().isNotEmpty().hasSize( 2 ).contains( "Internal Repo Observer" );
}
@@ -380,5 +386,19 @@ public class TestLdapRoleMapper
assertFalse( ldapRoleMapper.hasRole( getDirContext(), "Australian wine is good but not as French! " ) );
}
+ @Test
+ public void removeRole() throws Exception
+ {
+ assertTrue( ldapRoleMapper.getAllGroups( getDirContext( ) ).contains( "archiva-admin" ) );
+ ldapRoleMapper.removeRole( "Archiva System Administrator", getDirContext() );
+ assertFalse( ldapRoleMapper.getAllGroups( getDirContext( ) ).contains( "archiva-admin" ) );
+ }
+ @Test
+ public void removeAllRoles() throws Exception
+ {
+ assertEquals( 4, ldapRoleMapper.getAllGroups( getDirContext( ) ).size() );
+ ldapRoleMapper.removeAllRoles( getDirContext() );
+ assertEquals( 0, ldapRoleMapper.getAllGroups( getDirContext( ) ).size() );
+ }
}
diff --git a/redback-common/redback-common-ldap/src/test/security.properties b/redback-common/redback-common-ldap/src/test/security.properties
index 1df8892..eb46b1f 100644
--- a/redback-common/redback-common-ldap/src/test/security.properties
+++ b/redback-common/redback-common-ldap/src/test/security.properties
@@ -16,4 +16,5 @@
# under the License.
ldap.config.groups.role.archiva-admin=Archiva System Administrator
ldap.config.groups.role.internal-repo-manager=Internal Repo Manager
-ldap.config.groups.role.internal-repo-observer=Internal Repo Observer
\ No newline at end of file
+ldap.config.groups.role.internal-repo-observer=Internal Repo Observer
+ldap.config.groups.role.archiva/group-with-slash=Ldap Group Test Role
\ No newline at end of file
diff --git a/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfigurationKeys.java b/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfigurationKeys.java
index 5bdde91..95141ed 100644
--- a/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfigurationKeys.java
+++ b/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfigurationKeys.java
@@ -92,10 +92,14 @@ public interface UserConfigurationKeys
String LDAP_GROUPS_USE_ROLENAME = "ldap.config.groups.use.rolename";
+ String LDAP_GROUPS_USE_DN_AS_MEMBER_VALUE = "ldap.config.groups.useDnAsMemberValue";
+
String LDAP_WRITABLE = "ldap.config.writable";
String LDAP_USER_ID_ATTRIBUTE = "ldap.config.user.attribute";
+ String LDAP_GROUP_NAME_ATTRIBUTE = "ldap.config.groups.name.attribute";
+
String APPLICATION_URL = "application.url";
String EMAIL_URL_PATH = "email.url.path";
[archiva-redback-core] 01/02: Switching to SNAPSHOT version
2.6.1-SNAPSHOT
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch redback-2.6.x
in repository https://gitbox.apache.org/repos/asf/archiva-redback-core.git
commit cd9334ce7482c6a3c8505133ac3750d19a99b6e5
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Sat Jan 25 18:56:33 2020 +0100
Switching to SNAPSHOT version 2.6.1-SNAPSHOT
---
pom.xml | 2 +-
redback-authentication/pom.xml | 2 +-
redback-authentication/redback-authentication-api/pom.xml | 2 +-
redback-authentication/redback-authentication-providers/pom.xml | 2 +-
.../redback-authentication-ldap/pom.xml | 2 +-
.../redback-authentication-memory/pom.xml | 2 +-
.../redback-authentication-open/pom.xml | 2 +-
.../redback-authentication-users/pom.xml | 2 +-
redback-authorization/pom.xml | 2 +-
redback-authorization/redback-authorization-api/pom.xml | 2 +-
redback-authorization/redback-authorization-providers/pom.xml | 2 +-
.../redback-authorization-providers/redback-authorization-open/pom.xml | 2 +-
.../redback-authorization-providers/redback-authorization-rbac/pom.xml | 2 +-
redback-common/pom.xml | 2 +-
redback-common/redback-common-jdo/pom.xml | 2 +-
redback-common/redback-common-ldap/pom.xml | 2 +-
redback-common/redback-common-test-resources/pom.xml | 2 +-
redback-configuration/pom.xml | 2 +-
redback-data-management/pom.xml | 2 +-
redback-features/pom.xml | 2 +-
redback-integrations/pom.xml | 2 +-
redback-integrations/redback-common-integrations/pom.xml | 2 +-
redback-integrations/redback-integrations-security/pom.xml | 2 +-
redback-integrations/redback-rest/pom.xml | 2 +-
redback-integrations/redback-rest/redback-rest-api/pom.xml | 2 +-
redback-integrations/redback-rest/redback-rest-services/pom.xml | 2 +-
redback-keys/pom.xml | 2 +-
redback-keys/redback-authentication-keys/pom.xml | 2 +-
redback-keys/redback-keys-api/pom.xml | 2 +-
redback-keys/redback-keys-providers/pom.xml | 2 +-
redback-keys/redback-keys-providers/redback-keys-cached/pom.xml | 2 +-
redback-keys/redback-keys-providers/redback-keys-jdo/pom.xml | 2 +-
redback-keys/redback-keys-providers/redback-keys-memory/pom.xml | 2 +-
redback-keys/redback-keys-tests/pom.xml | 2 +-
redback-policy/pom.xml | 2 +-
redback-rbac/pom.xml | 2 +-
redback-rbac/redback-rbac-model/pom.xml | 2 +-
redback-rbac/redback-rbac-providers/pom.xml | 2 +-
redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml | 2 +-
redback-rbac/redback-rbac-providers/redback-rbac-jdo/pom.xml | 2 +-
redback-rbac/redback-rbac-providers/redback-rbac-ldap/pom.xml | 2 +-
redback-rbac/redback-rbac-providers/redback-rbac-memory/pom.xml | 2 +-
redback-rbac/redback-rbac-role-manager/pom.xml | 2 +-
redback-rbac/redback-rbac-tests/pom.xml | 2 +-
redback-system/pom.xml | 2 +-
redback-users/pom.xml | 2 +-
redback-users/redback-users-api/pom.xml | 2 +-
redback-users/redback-users-providers/pom.xml | 2 +-
redback-users/redback-users-providers/redback-users-cached/pom.xml | 2 +-
.../redback-users-providers/redback-users-configurable/pom.xml | 2 +-
redback-users/redback-users-providers/redback-users-jdo/pom.xml | 2 +-
redback-users/redback-users-providers/redback-users-ldap/pom.xml | 2 +-
redback-users/redback-users-providers/redback-users-memory/pom.xml | 2 +-
redback-users/redback-users-tests/pom.xml | 2 +-
54 files changed, 54 insertions(+), 54 deletions(-)
diff --git a/pom.xml b/pom.xml
index 741b14b..a707297 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Archiva Redback</name>
diff --git a/redback-authentication/pom.xml b/redback-authentication/pom.xml
index 30170c5..b431416 100644
--- a/redback-authentication/pom.xml
+++ b/redback-authentication/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-authentication</artifactId>
<name>Redback :: Authentication</name>
diff --git a/redback-authentication/redback-authentication-api/pom.xml b/redback-authentication/redback-authentication-api/pom.xml
index 5647523..904e0da 100644
--- a/redback-authentication/redback-authentication-api/pom.xml
+++ b/redback-authentication/redback-authentication-api/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-authentication</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-authentication-api</artifactId>
diff --git a/redback-authentication/redback-authentication-providers/pom.xml b/redback-authentication/redback-authentication-providers/pom.xml
index 1f53280..5cdf7d6 100644
--- a/redback-authentication/redback-authentication-providers/pom.xml
+++ b/redback-authentication/redback-authentication-providers/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-authentication</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-authentication-providers</artifactId>
<name>Redback :: Authentication Providers</name>
diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/pom.xml b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/pom.xml
index 6afb215..93c14b6 100644
--- a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/pom.xml
+++ b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-authentication-providers</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-authentication-ldap</artifactId>
diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-memory/pom.xml b/redback-authentication/redback-authentication-providers/redback-authentication-memory/pom.xml
index 5d4d8af..e5201c8 100644
--- a/redback-authentication/redback-authentication-providers/redback-authentication-memory/pom.xml
+++ b/redback-authentication/redback-authentication-providers/redback-authentication-memory/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-authentication-providers</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-authentication-memory</artifactId>
diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-open/pom.xml b/redback-authentication/redback-authentication-providers/redback-authentication-open/pom.xml
index 6ab2bc5..56904dc 100644
--- a/redback-authentication/redback-authentication-providers/redback-authentication-open/pom.xml
+++ b/redback-authentication/redback-authentication-providers/redback-authentication-open/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-authentication-providers</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-authentication-open</artifactId>
diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-users/pom.xml b/redback-authentication/redback-authentication-providers/redback-authentication-users/pom.xml
index 90ee8d8..c47555d 100644
--- a/redback-authentication/redback-authentication-providers/redback-authentication-users/pom.xml
+++ b/redback-authentication/redback-authentication-providers/redback-authentication-users/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-authentication-providers</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-authentication-users</artifactId>
diff --git a/redback-authorization/pom.xml b/redback-authorization/pom.xml
index f07006e..fd3e053 100644
--- a/redback-authorization/pom.xml
+++ b/redback-authorization/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-authorization</artifactId>
<name>Redback :: Authorization</name>
diff --git a/redback-authorization/redback-authorization-api/pom.xml b/redback-authorization/redback-authorization-api/pom.xml
index 2c41cec..358d6c7 100644
--- a/redback-authorization/redback-authorization-api/pom.xml
+++ b/redback-authorization/redback-authorization-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-authorization</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-authorization-api</artifactId>
diff --git a/redback-authorization/redback-authorization-providers/pom.xml b/redback-authorization/redback-authorization-providers/pom.xml
index 9fa0c5b..780ab80 100644
--- a/redback-authorization/redback-authorization-providers/pom.xml
+++ b/redback-authorization/redback-authorization-providers/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-authorization</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-authorization-providers</artifactId>
<name>Redback :: Authorization Providers</name>
diff --git a/redback-authorization/redback-authorization-providers/redback-authorization-open/pom.xml b/redback-authorization/redback-authorization-providers/redback-authorization-open/pom.xml
index 8c2ca81..8f39506 100644
--- a/redback-authorization/redback-authorization-providers/redback-authorization-open/pom.xml
+++ b/redback-authorization/redback-authorization-providers/redback-authorization-open/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-authorization-providers</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-authorization-open</artifactId>
diff --git a/redback-authorization/redback-authorization-providers/redback-authorization-rbac/pom.xml b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/pom.xml
index dfe4b35..ea08d72 100644
--- a/redback-authorization/redback-authorization-providers/redback-authorization-rbac/pom.xml
+++ b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-authorization-providers</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-authorization-rbac</artifactId>
diff --git a/redback-common/pom.xml b/redback-common/pom.xml
index 3521814..5e376e4 100644
--- a/redback-common/pom.xml
+++ b/redback-common/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-common</artifactId>
<name>Redback :: Commons</name>
diff --git a/redback-common/redback-common-jdo/pom.xml b/redback-common/redback-common-jdo/pom.xml
index ce600a5..adc3d31 100644
--- a/redback-common/redback-common-jdo/pom.xml
+++ b/redback-common/redback-common-jdo/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-common</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-common-jdo</artifactId>
diff --git a/redback-common/redback-common-ldap/pom.xml b/redback-common/redback-common-ldap/pom.xml
index 4e582ca..00109c3 100644
--- a/redback-common/redback-common-ldap/pom.xml
+++ b/redback-common/redback-common-ldap/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-common</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-common-ldap</artifactId>
diff --git a/redback-common/redback-common-test-resources/pom.xml b/redback-common/redback-common-test-resources/pom.xml
index f7e5ece..f7893d4 100644
--- a/redback-common/redback-common-test-resources/pom.xml
+++ b/redback-common/redback-common-test-resources/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-common</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-common-test-resources</artifactId>
diff --git a/redback-configuration/pom.xml b/redback-configuration/pom.xml
index b1c7ac0..3ce507f 100644
--- a/redback-configuration/pom.xml
+++ b/redback-configuration/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-configuration</artifactId>
diff --git a/redback-data-management/pom.xml b/redback-data-management/pom.xml
index df193c2..e0f260c 100644
--- a/redback-data-management/pom.xml
+++ b/redback-data-management/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>redback</artifactId>
<groupId>org.apache.archiva.redback</groupId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-data-management</artifactId>
diff --git a/redback-features/pom.xml b/redback-features/pom.xml
index ba8b82d..f415644 100644
--- a/redback-features/pom.xml
+++ b/redback-features/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-features</artifactId>
diff --git a/redback-integrations/pom.xml b/redback-integrations/pom.xml
index 02dc65d..144dad7 100644
--- a/redback-integrations/pom.xml
+++ b/redback-integrations/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-integrations</artifactId>
<name>Redback :: Integrations</name>
diff --git a/redback-integrations/redback-common-integrations/pom.xml b/redback-integrations/redback-common-integrations/pom.xml
index 413c563..4a13dc6 100644
--- a/redback-integrations/redback-common-integrations/pom.xml
+++ b/redback-integrations/redback-common-integrations/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-integrations</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-common-integrations</artifactId>
diff --git a/redback-integrations/redback-integrations-security/pom.xml b/redback-integrations/redback-integrations-security/pom.xml
index 1852b7b..a6c6621 100644
--- a/redback-integrations/redback-integrations-security/pom.xml
+++ b/redback-integrations/redback-integrations-security/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>redback-integrations</artifactId>
<groupId>org.apache.archiva.redback</groupId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-integrations-security</artifactId>
diff --git a/redback-integrations/redback-rest/pom.xml b/redback-integrations/redback-rest/pom.xml
index 99bbb00..031f204 100644
--- a/redback-integrations/redback-rest/pom.xml
+++ b/redback-integrations/redback-rest/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-integrations</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/redback-integrations/redback-rest/redback-rest-api/pom.xml b/redback-integrations/redback-rest/redback-rest-api/pom.xml
index 3e28c7b..2379842 100644
--- a/redback-integrations/redback-rest/redback-rest-api/pom.xml
+++ b/redback-integrations/redback-rest/redback-rest-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>redback-rest</artifactId>
<groupId>org.apache.archiva.redback</groupId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-rest-api</artifactId>
diff --git a/redback-integrations/redback-rest/redback-rest-services/pom.xml b/redback-integrations/redback-rest/redback-rest-services/pom.xml
index f29622d..a2e63ae 100644
--- a/redback-integrations/redback-rest/redback-rest-services/pom.xml
+++ b/redback-integrations/redback-rest/redback-rest-services/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>redback-rest</artifactId>
<groupId>org.apache.archiva.redback</groupId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-rest-services</artifactId>
diff --git a/redback-keys/pom.xml b/redback-keys/pom.xml
index 561d541..a418b8b 100644
--- a/redback-keys/pom.xml
+++ b/redback-keys/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-keys</artifactId>
<name>Redback :: Key Management</name>
diff --git a/redback-keys/redback-authentication-keys/pom.xml b/redback-keys/redback-authentication-keys/pom.xml
index c463a51..ed994a7 100644
--- a/redback-keys/redback-authentication-keys/pom.xml
+++ b/redback-keys/redback-authentication-keys/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-authentication-providers</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
<relativePath>../../redback-authentication/redback-authentication-providers/pom.xml</relativePath>
</parent>
diff --git a/redback-keys/redback-keys-api/pom.xml b/redback-keys/redback-keys-api/pom.xml
index ec934b9..bed9887 100644
--- a/redback-keys/redback-keys-api/pom.xml
+++ b/redback-keys/redback-keys-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-keys</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-keys-api</artifactId>
diff --git a/redback-keys/redback-keys-providers/pom.xml b/redback-keys/redback-keys-providers/pom.xml
index 31931b9..d068be6 100644
--- a/redback-keys/redback-keys-providers/pom.xml
+++ b/redback-keys/redback-keys-providers/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-keys</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-keys-providers</artifactId>
<name>Redback :: Key Management Providers</name>
diff --git a/redback-keys/redback-keys-providers/redback-keys-cached/pom.xml b/redback-keys/redback-keys-providers/redback-keys-cached/pom.xml
index 0a80c70..a6d67c3 100644
--- a/redback-keys/redback-keys-providers/redback-keys-cached/pom.xml
+++ b/redback-keys/redback-keys-providers/redback-keys-cached/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-keys-providers</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-keys-cached</artifactId>
diff --git a/redback-keys/redback-keys-providers/redback-keys-jdo/pom.xml b/redback-keys/redback-keys-providers/redback-keys-jdo/pom.xml
index 840cb87..99998fa 100644
--- a/redback-keys/redback-keys-providers/redback-keys-jdo/pom.xml
+++ b/redback-keys/redback-keys-providers/redback-keys-jdo/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-keys-providers</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-keys-jdo</artifactId>
diff --git a/redback-keys/redback-keys-providers/redback-keys-memory/pom.xml b/redback-keys/redback-keys-providers/redback-keys-memory/pom.xml
index fea6c5e..41bb901 100644
--- a/redback-keys/redback-keys-providers/redback-keys-memory/pom.xml
+++ b/redback-keys/redback-keys-providers/redback-keys-memory/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-keys-providers</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-keys-memory</artifactId>
diff --git a/redback-keys/redback-keys-tests/pom.xml b/redback-keys/redback-keys-tests/pom.xml
index 35758c7..3722ca9 100644
--- a/redback-keys/redback-keys-tests/pom.xml
+++ b/redback-keys/redback-keys-tests/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-keys</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-keys-tests</artifactId>
<name>Redback :: Key Management Test Harness</name>
diff --git a/redback-policy/pom.xml b/redback-policy/pom.xml
index 3899e4d..15f12bb 100644
--- a/redback-policy/pom.xml
+++ b/redback-policy/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-policy</artifactId>
diff --git a/redback-rbac/pom.xml b/redback-rbac/pom.xml
index 840b2db..82fe2ea 100644
--- a/redback-rbac/pom.xml
+++ b/redback-rbac/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-rbac</artifactId>
<name>Redback :: Role Based Access Control</name>
diff --git a/redback-rbac/redback-rbac-model/pom.xml b/redback-rbac/redback-rbac-model/pom.xml
index 6c1198a..4c15d51 100644
--- a/redback-rbac/redback-rbac-model/pom.xml
+++ b/redback-rbac/redback-rbac-model/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-rbac</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-rbac-model</artifactId>
diff --git a/redback-rbac/redback-rbac-providers/pom.xml b/redback-rbac/redback-rbac-providers/pom.xml
index 59007fa..072abc4 100644
--- a/redback-rbac/redback-rbac-providers/pom.xml
+++ b/redback-rbac/redback-rbac-providers/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-rbac</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-rbac-providers</artifactId>
<name>Redback :: RBAC Providers</name>
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml b/redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml
index e597dda..7f50c5a 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-rbac-providers</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-rbac-cached</artifactId>
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-jdo/pom.xml b/redback-rbac/redback-rbac-providers/redback-rbac-jdo/pom.xml
index e752bad..b00bb77 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-jdo/pom.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-jdo/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-rbac-providers</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-rbac-jdo</artifactId>
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/pom.xml b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/pom.xml
index 463c621..77cf8bb 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/pom.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-rbac-providers</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-rbac-ldap</artifactId>
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-memory/pom.xml b/redback-rbac/redback-rbac-providers/redback-rbac-memory/pom.xml
index 6e8225c..885fe93 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-memory/pom.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-memory/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-rbac-providers</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-rbac-memory</artifactId>
diff --git a/redback-rbac/redback-rbac-role-manager/pom.xml b/redback-rbac/redback-rbac-role-manager/pom.xml
index afc5c86..09ef3e7 100644
--- a/redback-rbac/redback-rbac-role-manager/pom.xml
+++ b/redback-rbac/redback-rbac-role-manager/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-rbac</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-rbac-role-manager</artifactId>
diff --git a/redback-rbac/redback-rbac-tests/pom.xml b/redback-rbac/redback-rbac-tests/pom.xml
index 67f06f8..fa91570 100644
--- a/redback-rbac/redback-rbac-tests/pom.xml
+++ b/redback-rbac/redback-rbac-tests/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-rbac</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-rbac-tests</artifactId>
<name>Redback :: RBAC Test Framework</name>
diff --git a/redback-system/pom.xml b/redback-system/pom.xml
index 3b0d41e..93d02b0 100644
--- a/redback-system/pom.xml
+++ b/redback-system/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-system</artifactId>
diff --git a/redback-users/pom.xml b/redback-users/pom.xml
index abce778..350c644 100644
--- a/redback-users/pom.xml
+++ b/redback-users/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-users</artifactId>
<name>Redback :: User Management</name>
diff --git a/redback-users/redback-users-api/pom.xml b/redback-users/redback-users-api/pom.xml
index 50f4664..b468269 100644
--- a/redback-users/redback-users-api/pom.xml
+++ b/redback-users/redback-users-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-users</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-users-api</artifactId>
diff --git a/redback-users/redback-users-providers/pom.xml b/redback-users/redback-users-providers/pom.xml
index 77eabb4..99e5679 100644
--- a/redback-users/redback-users-providers/pom.xml
+++ b/redback-users/redback-users-providers/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-users</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-users-providers</artifactId>
<name>Redback :: Users Providers</name>
diff --git a/redback-users/redback-users-providers/redback-users-cached/pom.xml b/redback-users/redback-users-providers/redback-users-cached/pom.xml
index 2c55666..31c054f 100644
--- a/redback-users/redback-users-providers/redback-users-cached/pom.xml
+++ b/redback-users/redback-users-providers/redback-users-cached/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-users-providers</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-users-cached</artifactId>
diff --git a/redback-users/redback-users-providers/redback-users-configurable/pom.xml b/redback-users/redback-users-providers/redback-users-configurable/pom.xml
index a2c3e82..5d5ba85 100644
--- a/redback-users/redback-users-providers/redback-users-configurable/pom.xml
+++ b/redback-users/redback-users-providers/redback-users-configurable/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-users-providers</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-users-configurable</artifactId>
diff --git a/redback-users/redback-users-providers/redback-users-jdo/pom.xml b/redback-users/redback-users-providers/redback-users-jdo/pom.xml
index d041928..c4f5bc6 100644
--- a/redback-users/redback-users-providers/redback-users-jdo/pom.xml
+++ b/redback-users/redback-users-providers/redback-users-jdo/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-users-providers</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-users-jdo</artifactId>
diff --git a/redback-users/redback-users-providers/redback-users-ldap/pom.xml b/redback-users/redback-users-providers/redback-users-ldap/pom.xml
index fabec33..2b46994 100644
--- a/redback-users/redback-users-providers/redback-users-ldap/pom.xml
+++ b/redback-users/redback-users-providers/redback-users-ldap/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-users-providers</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-users-ldap</artifactId>
diff --git a/redback-users/redback-users-providers/redback-users-memory/pom.xml b/redback-users/redback-users-providers/redback-users-memory/pom.xml
index 2a90444..f7359a7 100644
--- a/redback-users/redback-users-providers/redback-users-memory/pom.xml
+++ b/redback-users/redback-users-providers/redback-users-memory/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-users-providers</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-users-memory</artifactId>
diff --git a/redback-users/redback-users-tests/pom.xml b/redback-users/redback-users-tests/pom.xml
index 398ef21..c9d0a74 100644
--- a/redback-users/redback-users-tests/pom.xml
+++ b/redback-users/redback-users-tests/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-users</artifactId>
- <version>2.6</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>redback-users-tests</artifactId>
<name>Redback :: User Tests</name>