@since 1.5 is now @since 2.0

git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1324841 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java
index 3a06e1a8138e4c7a41fafb522482ee85e08c66eb..6aca7a9ec332208989140fc49143d4f4ab3fd265 100644 (file)
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java
@@ -49,7 +49,7 @@ import java.util.Properties;
 
 /**
  * @author Olivier Lamy
- * @since 1.5
+ * @since 2.0
  */
 @Service( "AdminAutoCreateCheck" )
 public class AdminAutoCreateCheck

diff --git a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/ApplicationRoles.java b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/ApplicationRoles.java
index 8c4985b97812aac5059cb3834ac4aff00386b0f5..794b53745b320d2d86d4426f1ff5faf4ea629644 100644 (file)
--- a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/ApplicationRoles.java
+++ b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/ApplicationRoles.java
@@ -25,7 +25,7 @@ import java.util.Collection;
 
 /**
  * @author Olivier Lamy
- * @since 1.5
+ * @since 2.0
  */
 @XmlRootElement( name = "applicationRole" )
 public class ApplicationRoles

diff --git a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/RoleTemplate.java b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/RoleTemplate.java
index 78131a021eec9aa312ea65c0f3172c6089d17960..72965b191b3a3967589fc674f9d6f38181dc9d08 100644 (file)
--- a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/RoleTemplate.java
+++ b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/RoleTemplate.java
@@ -24,7 +24,7 @@ import java.util.List;
 
 /**
  * @author Olivier Lamy
- * @since 1.5
+ * @since 2.0
  */
 @XmlRootElement( name = "roleTemplate" )
 public class RoleTemplate

diff --git a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/User.java b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/User.java
index e560efe8015822ed2fa06b39b01426080c3192a2..2ce545f16da183e098e5197f42fed78bd7b4d41b 100644 (file)
--- a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/User.java
+++ b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/User.java
@@ -64,7 +64,7 @@ public class User
     /**
      * for roles update only <b>not return on user read</b>
      *
-     * @since 1.5
+     * @since 2.0
      */
     private List<String> assignedRoles;
 

diff --git a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/RoleManagementService.java b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/RoleManagementService.java
index 0a48f2212b7b800a211bd3afbb19a5288d8d66f4..8cea4fd83bdafae5b805d9243661b068f60ea420 100644 (file)
--- a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/RoleManagementService.java
+++ b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/RoleManagementService.java
@@ -224,7 +224,7 @@ public interface RoleManagementService
     @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN } )
     @RedbackAuthorization( permissions = RedbackRoleConstants.USER_MANAGEMENT_RBAC_ADMIN_OPERATION )
     /**
-     * @since 1.5
+     * @since 2.0
      */
     List<Role> getAllRoles()
         throws RedbackServiceException;
@@ -234,7 +234,7 @@ public interface RoleManagementService
     @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN } )
     @RedbackAuthorization( permissions = RedbackRoleConstants.USER_MANAGEMENT_RBAC_ADMIN_OPERATION )
     /**
-     * @since 1.5
+     * @since 2.0
      */
     List<Role> getDetailedAllRoles()
         throws RedbackServiceException;
@@ -245,7 +245,7 @@ public interface RoleManagementService
     @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN } )
     @RedbackAuthorization( permissions = RedbackRoleConstants.USER_MANAGEMENT_RBAC_ADMIN_OPERATION )
     /**
-     * @since 1.5
+     * @since 2.0
      */
     List<Application> getApplications( @PathParam( "username" ) String username )
         throws RedbackServiceException;
@@ -256,7 +256,7 @@ public interface RoleManagementService
     @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN } )
     @RedbackAuthorization( permissions = RedbackRoleConstants.USER_MANAGEMENT_RBAC_ADMIN_OPERATION )
     /**
-     * @since 1.5
+     * @since 2.0
      */
     Role getRole( @PathParam( "roleName" ) String roleName )
         throws RedbackServiceException;
@@ -266,7 +266,7 @@ public interface RoleManagementService
     @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN } )
     @RedbackAuthorization( permissions = RedbackRoleConstants.USER_MANAGEMENT_RBAC_ADMIN_OPERATION )
     /**
-     * @since 1.5
+     * @since 2.0
      */
     Boolean updateRoleDescription( @QueryParam( "roleName" ) String roleName,
                                    @QueryParam( "roleDescription" ) String description )
@@ -279,7 +279,7 @@ public interface RoleManagementService
     @RedbackAuthorization( permissions = RedbackRoleConstants.USER_MANAGEMENT_RBAC_ADMIN_OPERATION )
     /**
      * update users assigned to a role
-     * @since 1.5
+     * @since 2.0
      */
     Boolean updateRoleUsers( Role role )
         throws RedbackServiceException;
@@ -289,7 +289,7 @@ public interface RoleManagementService
     @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } )
     @RedbackAuthorization( permissions = RedbackRoleConstants.USER_MANAGEMENT_RBAC_ADMIN_OPERATION )
     /**
-     * @since 1.5
+     * @since 2.0
      */
     List<ApplicationRoles> getApplicationRoles( @PathParam( "username" ) String username )
         throws RedbackServiceException;
@@ -301,7 +301,7 @@ public interface RoleManagementService
     @RedbackAuthorization( permissions = RedbackRoleConstants.USER_MANAGEMENT_RBAC_ADMIN_OPERATION )
     /**
      * update roles assigned to a user
-     * @since 1.5
+     * @since 2.0
      */
     Boolean updateUserRoles( User user )
         throws RedbackServiceException;

diff --git a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/UserService.java b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/UserService.java
index 239169f90ad2c1ebf20afaa381ef0e1ca96c1c7d..9c7cc06ac2a9a72391b489656d4a75b2982b1273 100644 (file)
--- a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/UserService.java
+++ b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/UserService.java
@@ -101,7 +101,7 @@ public interface UserService
     @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN } )
     @RedbackAuthorization( permissions = RedbackRoleConstants.USER_MANAGEMENT_USER_EDIT_OPERATION )
     /**
-     * @since 1.5
+     * @since 2.0
      */
     Boolean lockUser( @PathParam( "username" ) String username )
         throws RedbackServiceException;
@@ -111,7 +111,7 @@ public interface UserService
     @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN } )
     @RedbackAuthorization( permissions = RedbackRoleConstants.USER_MANAGEMENT_USER_EDIT_OPERATION )
     /**
-     * @since 1.5
+     * @since 2.0
      */
     Boolean unlockUser( @PathParam( "username" ) String username )
         throws RedbackServiceException;
@@ -122,7 +122,7 @@ public interface UserService
     @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN } )
     @RedbackAuthorization( permissions = RedbackRoleConstants.USER_MANAGEMENT_USER_EDIT_OPERATION )
     /**
-     * @since 1.5
+     * @since 2.0
      */
     Boolean passwordChangeRequired( @PathParam( "username" ) String username )
         throws RedbackServiceException;
@@ -132,7 +132,7 @@ public interface UserService
     @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN } )
     @RedbackAuthorization( permissions = RedbackRoleConstants.USER_MANAGEMENT_USER_EDIT_OPERATION )
     /**
-     * @since 1.5
+     * @since 2.0
      */
     Boolean passwordChangeNotRequired( @PathParam( "username" ) String username )
         throws RedbackServiceException;

diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/JacksonJsonConfigurator.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/JacksonJsonConfigurator.java
index 29a3584ac7954b17a38a43be8f66230dd5349cc2..bac0f7a2ce01baa56ec442e269c0abab0ebcf658 100644 (file)
--- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/JacksonJsonConfigurator.java
+++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/JacksonJsonConfigurator.java
@@ -30,7 +30,7 @@ import javax.inject.Inject;
  * to setup some ObjectMapper configuration
  *
  * @author Olivier Lamy
- * @since 1.5
+ * @since 2.0
  */
 @Service("redbackJacksonJsonConfigurator")
 public class JacksonJsonConfigurator