Merge pull request #112 from tom-foyle/main

Remove String check to support semantic-release version numbers

src/main/kotlin/com/ibm/cics/cbgp/BuildBundleTask.kt

@@ -110,11 +110,9 @@ open class BuildBundleTask : DefaultTask() {
 
 	private fun getProjectVersionNumber(): VersionNumber {
 		val pv = project.version
-		if (pv is String) {
-			val versionNumber = VersionNumber.parse(pv.toString())
-			if (!VersionNumber.UNKNOWN.equals(versionNumber)) {
-				return versionNumber
-			}
+		val versionNumber = VersionNumber.parse(pv.toString())
+		if (!VersionNumber.UNKNOWN.equals(versionNumber)) {
+			return versionNumber
 		}
 		throw GradleException("Project version number '$pv' could not be parsed into MAJOR.MINOR.MICRO.PATCH format")
 	}

src/test/groovy/com/ibm/cics/cbgp/GoldenPathTests.groovy

@@ -49,6 +49,21 @@ class GoldenPathTests extends AbstractTest {
 		checkBundleArchiveFile()
 	}
 
+	def "Test version number"() {
+
+		given:
+		rootProjectName = bundleProjectName = "version"
+		projectVersion = "1.2.3"
+
+		copyTestProject()
+
+		when:
+		runGradleAndSucceed([BundlePlugin.DEPLOY_TASK_NAME])
+
+		then:
+		checkBundleArchiveFile()
+	}
+
 	@Unroll
 	def "Test standalone #type project"(String type) {
 

src/test/resources/version/build.gradle

@@ -0,0 +1,25 @@
+plugins {
+	id 'com.ibm.cics.bundle'
+}
+
+version  = new org.gradle.util.VersionNumber(1, 2, 3, null)
+
+repositories {
+    mavenCentral()
+}
+
+cicsBundle {
+    build {
+        defaultJVMServer = project.jvmsWlp
+    }
+    deploy {
+        url = project.url
+        cicsplex = project.cicsplex
+        region = project.region
+        bunddef = 'GRADLEV'
+        csdgroup = project.csdgroup
+        username = project.username
+        password = project.password
+        insecure = project.insecure
+    }
+}

src/test/resources/version/settings.gradle

@@ -0,0 +1 @@
+rootProject.name = 'version'