[maven-release-plugin] prepare release application-blocks-1.3.2

CHANGELOG.md

 # Changelog
 
+## 1.3.2 Release
+
+- 0a1ff49 Updated OAuth service
+- 7c42917 BUGFIX: Added getter for JSP EL access
+- 29cfa93 BUGFIX: Handle case where OAuth client secret is null
+- 0cac90e Encrypt OAuth client secrets in the database
+- 69da33d Update last login date on successful login
+- c3fd313 Moved Spring Security annotations to service implementation
+- 8c98d11 First delete issue
+- 3b1a22f Utility method to make entities publicly readable
+- 1ae92a7 Default user roles can be provided as a collection and are not persisted to the database
+- c690ddd Throw LockedException in AccountLockoutManager
+- 32191fc Added JsonView.Minimal < JsonView.Public
+- c42edc8 FIX: SidPermissions are properly converted for authority (role) SIDs
+- 1b0006b CustomAclService allowed for multiple entries per SID for object identity
+- 3c5d531 Better autocomplete for OAuthClients
+- 4c069b8 ACL management made easier
+- 4f24951 Include class short name in JSON-serialized entities extending BasicModel
+- 56db528 Updated ACL service and model serialization
+- b74449f User repository can't be @Autowired
+- 9b2ccaf VersionedModelWithoutId should have 1 as first persisted version
+- 8d3cf21 Require SYSTEM_ADMIN account
+
 ## 1.3.1 Release
 
 - 3e5b11d `BasicUserService#setAccountType` added

README.md

@@ -21,7 +21,7 @@ The **core** provides common data models: `BasicModel`, `VersionedModel`, `Audit
 <dependency>
     <groupId>org.genesys-pgr</groupId>
     <artifactId>application-blocks-core</artifactId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.3.2</version>
 </dependency>
 ```
 
@@ -33,7 +33,7 @@ The **security** module provides generic `User` declaration, ACL model and servi
 <dependency>
   <groupId>org.genesys-pgr</groupId>
   <artifactId>application-blocks-security</artifactId>
-  <version>1.4-SNAPSHOT</version>
+  <version>1.3.2</version>
 </dependency>
 ```
 
@@ -45,6 +45,6 @@ The **auditlog** provides the model and services to capture changes to JPA entit
 <dependency>
     <groupId>org.genesys-pgr</groupId>
     <artifactId>application-blocks-auditlog</artifactId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.3.2</version>
 </dependency>
 ```

auditlog/pom.xml

@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>org.genesys-pgr</groupId>
 		<artifactId>application-blocks-parent</artifactId>
-		<version>1.4-SNAPSHOT</version>
+		<version>1.3.2</version>
 		<relativePath>../parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>application-blocks-auditlog</artifactId>
@@ -79,13 +79,13 @@
 		<dependency>
 			<groupId>org.genesys-pgr</groupId>
 			<artifactId>application-blocks-security</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>1.3.2</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.genesys-pgr</groupId>
 			<artifactId>application-blocks-core</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>1.3.2</version>
 		</dependency>
 
 		<dependency>

core/pom.xml

@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>org.genesys-pgr</groupId>
 		<artifactId>application-blocks-parent</artifactId>
-		<version>1.4-SNAPSHOT</version>
+		<version>1.3.2</version>
 		<relativePath>../parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>application-blocks-core</artifactId>

parent/pom.xml

@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>org.genesys-pgr</groupId>
 		<artifactId>application-blocks</artifactId>
-		<version>1.4-SNAPSHOT</version>
+		<version>1.3.2</version>
 	</parent>
 	<artifactId>application-blocks-parent</artifactId>
 	<packaging>pom</packaging>

pom.xml

@@ -18,7 +18,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.genesys-pgr</groupId>
 	<artifactId>application-blocks</artifactId>
-	<version>1.4-SNAPSHOT</version>
+	<version>1.3.2</version>
 	<packaging>pom</packaging>
 	<name>Application Building Blocks</name>
 	<description>This is the shared project pom.</description>
@@ -49,7 +49,7 @@
 		<connection>scm:https://gitlab.croptrust.org/genesys-pgr/application-blocks</connection>
 		<developerConnection>scm:git:git@gitlab.croptrust.org:genesys-pgr/application-blocks.git</developerConnection>
 		<url>git@gitlab.croptrust.org:genesys-pgr/application-blocks.git</url>
-		<tag>HEAD</tag>
+		<tag>application-blocks-1.3.2</tag>
 	</scm>
 
 	<issueManagement>

security/pom.xml

@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>org.genesys-pgr</groupId>
 		<artifactId>application-blocks-parent</artifactId>
-		<version>1.4-SNAPSHOT</version>
+		<version>1.3.2</version>
 		<relativePath>../parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>application-blocks-security</artifactId>
@@ -80,7 +80,7 @@
 		<dependency>
 			<groupId>org.genesys-pgr</groupId>
 			<artifactId>application-blocks-core</artifactId>
-			<version>1.4-SNAPSHOT</version>
+			<version>1.3.2</version>
 		</dependency>
 
 		<dependency>

security/src/main/java/org/genesys/blocks/security/service/BasicUserService.java

 /*
- * Copyright 2017 Global Crop Diversity Trust
+ * Copyright 2018 Global Crop Diversity Trust
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,6 +36,7 @@ import org.springframework.security.core.userdetails.UserDetailsService;
  */
 public interface BasicUserService<R extends GrantedAuthority, T extends BasicUser<R>> extends UserDetailsService {
 
+	/** The system admin. */
 	public String SYSTEM_ADMIN = "SYSTEM_ADMIN";
 
 	/**
@@ -158,9 +159,9 @@ public interface BasicUserService<R extends GrantedAuthority, T extends BasicUse
 	T setAccountType(T user, AccountType accountType);
 
 	/**
-	 * Update user's last login date
-	 * 
-	 * @param userName
+	 * Update user's last login date.
+	 *
+	 * @param userName the user name
 	 * @throws NoUserFoundException if username not found in the system
 	 */
 	void updateLastLogin(String userName) throws NoUserFoundException;

security/src/main/java/org/genesys/blocks/security/service/CustomAclService.java

 /*
- * Copyright 2017 Global Crop Diversity Trust
+ * Copyright 2018 Global Crop Diversity Trust
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,15 +39,15 @@ public interface CustomAclService {
 	Permission[] getAvailablePermissions(String className);
 
 	/**
-	 * Get SID by ID
-	 * 
+	 * Get SID by ID.
+	 *
 	 * @param id -- ID of an AclSid entity
 	 * @return persisted AclSid entity with specified id
 	 */
 	AclSid getSid(Long id);
 
 	/**
-	 * Gets the sid of the specified authority
+	 * Gets the sid of the specified authority.
 	 *
 	 * @param authority the authority (must start with "ROLE_")
 	 * @return the authority sid
@@ -83,15 +83,15 @@ public interface CustomAclService {
 	void removePermissionsFor(AclSid sid);
 
 	/**
-	 * Get object identity by internal id
-	 * 
+	 * Get object identity by internal id.
+	 *
 	 * @param id AclObjectIdentity id
-	 * @return
+	 * @return the object identity
 	 */
 	AclObjectIdentity getObjectIdentity(long id);
 
 	/**
-	 * Gets the object identity for object of type className with specified id
+	 * Gets the object identity for object of type className with specified id.
 	 *
 	 * @param id the id
 	 * @param className the clazz
@@ -100,7 +100,7 @@ public interface CustomAclService {
 	AclObjectIdentity getObjectIdentity(long id, String className);
 
 	/**
-	 * Gets the object identity of the entity
+	 * Gets the object identity of the entity.
 	 *
 	 * @param entity the entity
 	 * @return the object identity
@@ -137,8 +137,8 @@ public interface CustomAclService {
 	 *
 	 * @param entity the entity
 	 * @param sid the sid
-	 * @param permissionMap the permission map
-	 * @return
+	 * @param permissions the permissions
+	 * @return the acl object identity
 	 */
 	AclObjectIdentity setPermissions(AclAwareModel entity, AclSid sid, final Permissions permissions);
 
@@ -147,8 +147,8 @@ public interface CustomAclService {
 	 *
 	 * @param objectIdentity the object identity
 	 * @param sid the sid
-	 * @param permissionMap the permission map
-	 * @return
+	 * @param permissions the permissions
+	 * @return the acl object identity
 	 */
 	AclObjectIdentity setPermissions(AclObjectIdentity objectIdentity, AclSid sid, final Permissions permissions);
 
@@ -198,8 +198,8 @@ public interface CustomAclService {
 	List<Long> listObjectIdentityIdsForSid(Class<? extends AclAwareModel> clazz, AclSid sid, Permission permission);
 
 	/**
-	 * Make entity publicly readable (or not)
-	 * 
+	 * Make entity publicly readable (or not).
+	 *
 	 * @param aclAwareModel The entity
 	 * @param publiclyReadable true or false?
 	 * @since 1.4