Prepare release

Author: To-om

CHANGELOG.md

@@ -1,14 +1,16 @@
-import Common.{betaVersion, snapshotVersion, stableVersion}
+import Common.{betaVersion, snapshotVersion, stableVersion, versionUsage}
 
 linuxPackageMappings in Debian += packageMapping(file("LICENSE") -> "/usr/share/doc/cortex/copyright").withPerms("644")
 version in Debian := {
   version.value match {
-    case stableVersion(_, _)   => version.value
-    case betaVersion(v1, v2)   => v1 + "-0.1RC" + v2
-    case snapshotVersion(_, _) => version.value + "-SNAPSHOT"
-    case _                     => sys.error("Invalid version: " + version.value)
+    case stableVersion(_, _)                      => version.value
+    case betaVersion(v1, v2, v3)                  => v1 + "-0." + v3 + "RC" + v2
+    case snapshotVersion(stableVersion(v1, v2))   => v1 + "-" + v2 + "-SNAPSHOT"
+    case snapshotVersion(betaVersion(v1, v2, v3)) => v1 + "-0." + v3 + "RC" + v2 + "-SNAPSHOT"
+    case _                                        => versionUsage(version.value)
   }
 }
+
 debianPackageRecommends := Seq("elasticsearch")
 debianPackageDependencies += "java8-runtime | java8-runtime-headless"
 maintainerScripts in Debian := maintainerScriptsFromDirectory(

debian.sbt

@@ -1,12 +1,13 @@
-import Common.{betaVersion, snapshotVersion, stableVersion}
+import Common.{betaVersion, snapshotVersion, stableVersion, versionUsage}
 import com.typesafe.sbt.packager.docker.{Cmd, ExecCmd}
 
 version in Docker := {
   version.value match {
-    case stableVersion(_, _)   => version.value
-    case betaVersion(v1, v2)   => v1 + "-0.1RC" + v2
-    case snapshotVersion(_, _) => version.value + "-SNAPSHOT"
-    case _                     => sys.error("Invalid version: " + version.value)
+    case stableVersion(_, _)                      => version.value
+    case betaVersion(v1, v2, v3)                  => v1 + "-0." + v3 + "RC" + v2
+    case snapshotVersion(stableVersion(v1, v2))   => v1 + "-" + v2 + "-SNAPSHOT"
+    case snapshotVersion(betaVersion(v1, v2, v3)) => v1 + "-0." + v3 + "RC" + v2 + "-SNAPSHOT"
+    case _                                        => versionUsage(version.value)
   }
 }
 defaultLinuxInstallLocation in Docker := "/opt/cortex"

docker.sbt

@@ -37,12 +37,22 @@ object Common {
   )
 
   val stableVersion: Regex = "(\\d+\\.\\d+\\.\\d+)-(\\d+)".r
-  val betaVersion: Regex   = "(\\d+\\.\\d+\\.\\d+)-[Rr][Cc](\\d+)".r
+  val betaVersion: Regex   = "(\\d+\\.\\d+\\.\\d+)-[Rr][Cc](\\d+)-(\\d+)".r
+
   object snapshotVersion {
-    def unapplySeq(version: String): Option[List[String]] =
-      if (version.endsWith("-SNAPSHOT")) {
-        val v = version.dropRight(9)
-        stableVersion.unapplySeq(v) orElse betaVersion.unapplySeq(v)
-      } else None
+
+    def unapply(version: String): Option[String] =
+      if (version.endsWith("-SNAPSHOT")) Some(version.dropRight(9))
+      else None
   }
+
+  def versionUsage(version: String): Nothing =
+    sys.error(
+      s"Invalid version: $version\n" +
+        "The accepted formats for version are:\n" +
+        " - 1.2.3-4\n" +
+        " - 1.2.3-RC4-5\n" +
+        " - 1.2.3-4-SNAPSHOT\n" +
+        " - 1.2.3-RC4-5-SNAPSHOT"
+    )
 }

project/Common.scala

@@ -1,21 +1,24 @@
-import Common.{betaVersion, snapshotVersion, stableVersion}
+import Common.{betaVersion, snapshotVersion, stableVersion, versionUsage}
 
 version in Rpm := {
   version.value match {
-    case stableVersion(v1, v2)   => v1
-    case betaVersion(v1, v2)     => v1
-    case snapshotVersion(v1, v2) => v1
-    case _                       => sys.error("Invalid version: " + version.value)
+    case stableVersion(v1, _)                   => v1
+    case betaVersion(v1, _, _)                  => v1
+    case snapshotVersion(stableVersion(v1, _))  => v1
+    case snapshotVersion(betaVersion(v1, _, _)) => v1
+    case _                                      => versionUsage(version.value)
   }
 }
 rpmRelease := {
   version.value match {
-    case stableVersion(_, v2)    => v2
-    case betaVersion(v1, v2)     => "0.1RC" + v2
-    case snapshotVersion(v1, v2) => v2 + "-SNAPSHOT"
-    case _                       => sys.error("Invalid version: " + version.value)
+    case stableVersion(_, v2)                    => v2
+    case betaVersion(_, v2, v3)                  => "0." + v3 + "RC" + v2
+    case snapshotVersion(stableVersion(_, v2))   => v2 + "-SNAPSHOT"
+    case snapshotVersion(betaVersion(_, v2, v3)) => "0." + v3 + "RC" + v2 + "-SNAPSHOT"
+    case _                                       => versionUsage(version.value)
   }
 }
+
 rpmVendor := organizationName.value
 rpmUrl := organizationHomepage.value.map(_.toString)
 rpmLicense := Some("AGPL")

rpm.sbt

@@ -1 +1 @@
-version in ThisBuild := "3.0.0-1"
+version in ThisBuild := "3.1.0-RC1-1"

version.sbt

@@ -1,6 +1,6 @@
 {
   "name": "cortex",
-  "version": "3.0.1",
+  "version": "3.1.0-RC1",
   "description": "A powerfull observable analysis engine",
   "license": "AGPL-3.0-or-later",
   "homepage": "https://github.com/TheHive-Project/Cortex",