Merge branch 'master' into feature/kotlin-contract-support

specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/Contract.java

@@ -89,6 +89,12 @@ public class Contract {
 	 */
 	private boolean ignored;
 
+	/**
+	 * Whether the contract is in progress. It's not ignored, but the feature is not yet
+	 * finished. Used together with the {@code generateStubs} option.
+	 */
+	private boolean inProgress;
+
 	public Contract() {
 
 	}
@@ -259,6 +265,17 @@ public class Contract {
 		this.ignored = true;
 	}
 
+	/**
+	 * Whether the contract is in progress or not.
+	 */
+	public void inProgress() {
+		this.inProgress = true;
+	}
+
+	public boolean isInProgress() {
+		return this.inProgress;
+	}
+
 	public Integer getPriority() {
 		return priority;
 	}
@@ -335,6 +352,10 @@ public class Contract {
 		this.ignored = ignored;
 	}
 
+	public void setInProgress(boolean inProgress) {
+		this.inProgress = inProgress;
+	}
+
 	@Override
 	public boolean equals(Object o) {
 		if (this == o) {

specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/RegexCreatingProperty.java

@@ -21,6 +21,7 @@ package org.springframework.cloud.contract.spec.internal;
  */
 interface RegexCreatingProperty<T extends DslProperty> {
 
+	// tag::regex_creating_props[]
 	T anyAlphaUnicode();
 
 	T anyAlphaNumeric();
@@ -62,5 +63,6 @@ interface RegexCreatingProperty<T extends DslProperty> {
 	T anyNonEmptyString();
 
 	T anyOf(String... values);
+	// end::regex_creating_props[]
 
 }