Commit 117efaee authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable

parents b3275519 f385b0ff

pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
	<modelVersion>4.0.0</modelVersion>

	<groupId>com.inteligr8.alfresco</groupId>

	<artifactId>acs-public-rest-api</artifactId>

	<version>1.1.3</version>

	<version>1.1.4</version>

	<name>Alfresco Content Services ReST API Client for Java</name>



	<properties>

src/main/java/com/inteligr8/alfresco/acs/model/v0/ConstraintInfo.java

+3 −3
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ public class ConstraintInfo { 
	private String type;

	

	@JsonProperty

	private List<Map<String, String>> parameters;

	private List<Map<String, Object>> parameters;

	

	public String getType() {

		return type;
@@ -23,11 +23,11 @@ public class ConstraintInfo { 
		this.type = type;

	}

	

	public List<Map<String, String>> getParameters() {

	public List<Map<String, Object>> getParameters() {

		return parameters;

	}

	

	public void setParameters(List<Map<String, String>> parameters) {

	public void setParameters(List<Map<String, Object>> parameters) {

		this.parameters = parameters;

	}