Merge pull request #9 from eharris369/fixCheckForBranchVersion

eharris369 · web-flow · commit cfc9182b77cf · 2018-12-12T14:40:38.000-05:00
Fix check for branch version
diff --git a/dev/com.ibm.microclimate.core/src/com/ibm/microclimate/core/internal/connection/MicroclimateConnection.java b/dev/com.ibm.microclimate.core/src/com/ibm/microclimate/core/internal/connection/MicroclimateConnection.java
@@ -94,7 +94,7 @@ else if (!isSupportedVersion(version)) {
 					version, MCConstants.REQUIRED_MC_VERSION));
 		}
 
-		if (MCConstants.VERSION_LATEST.equals(version)) {
+		if (MCConstants.VERSION_LATEST.equals(version) || pattern.matcher(version).matches()) {
 			// There's not much we can do here but assume everything is supported.
 			this.mcVersion = Integer.MAX_VALUE;
 			MCLogger.log("Can't determine Microclimate version from dev build");			// $NON-NLS-1$

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ else if (!isSupportedVersion(version)) {`
`94`	`94`	`version, MCConstants.REQUIRED_MC_VERSION));`
`95`	`95`	`}`
`96`	`96`
`97`		`- if (MCConstants.VERSION_LATEST.equals(version)) {`
	`97`	`+ if (MCConstants.VERSION_LATEST.equals(version) \|\| pattern.matcher(version).matches()) {`
`98`	`98`	`// There's not much we can do here but assume everything is supported.`
`99`	`99`	`this.mcVersion = Integer.MAX_VALUE;`
`100`	`100`	`MCLogger.log("Can't determine Microclimate version from dev build"); // $NON-NLS-1$`