Merge branch 'gunnarmorling-master'

Author: marc0der

README.md

@@ -72,7 +72,7 @@ When serving up a simple universal zip binary, we always set the `platform` fiel
 
 Migration scripts can be found under [changelogs](https://github.com/sdkman/sdkman-db-migrations/tree/master/src/main/scala/io/sdkman/changelogs) and are divided by candidate. Various helper functions have been provided at package scope to perform simple tasks such as adding a Version / Candidate or setting a new Default version.
 
-#### Adding a new Candidate migration class
+#### Adding a new Candidate migration change log
 
 Simply fork this repository and then add a db migration in the appropriate file (create a new class if your Candidate is not represented). Also ensure that the changelog order is set to the next value available among migration classes:
 

src/main/scala/io/sdkman/changelogs/ActiveMQMigrations.scala

@@ -2,6 +2,7 @@ package io.sdkman.changelogs
 
 import com.github.mongobee.changeset.{ChangeLog, ChangeSet}
 import com.mongodb.client.MongoDatabase
+import org.bson.Document
 
 @ChangeLog(order = "060")
 class ActiveMQMigrations {
@@ -10,14 +11,13 @@ class ActiveMQMigrations {
     id = "001-add_activemq_candidate",
     author = "xshyamx"
   )
-  def migration001(implicit db: MongoDatabase) = {
+  def migration001(implicit db: MongoDatabase): Candidate = {
     Candidate(
       candidate = "activemq",
       name = "Apache ActiveMQ (Classic)",
       description =
         "Apache ActiveMQ® is the most popular open source, multi-protocol, Java-based message broker. It supports industry standard protocols so users get the benefits of client choices across a broad range of languages and platforms. Connect from clients written in JavaScript, C, C++, Python, .Net, and more. Integrate your multi-platform applications using the ubiquitous AMQP protocol. Exchange messages between your web applications using STOMP over websockets. Manage your IoT devices using MQTT. Support your existing JMS infrastructure and beyond. ActiveMQ offers the power and flexibility to support any messaging use-case.",
-      websiteUrl = "https://activemq.apache.org/",
-      distribution = "UNIVERSAL"
+      websiteUrl = "https://activemq.apache.org/"
     ).insert()
   }
 
@@ -26,7 +26,7 @@ class ActiveMQMigrations {
     id = "002-add_correct_activemq_candidate_urls",
     author = "xshyamx"
   )
-  def migration002(implicit db: MongoDatabase) = {
+  def migration002(implicit db: MongoDatabase): Document = {
     List(
       "5.16.2",
       "5.16.1",
@@ -75,10 +75,9 @@ class ActiveMQMigrations {
             candidate = "activemq",
             version = version,
             url =
-              s"http://archive.apache.org/dist/activemq/$version/apache-activemq-$version-bin.zip"
+              s"https://archive.apache.org/dist/activemq/$version/apache-activemq-$version-bin.zip"
           )
       )
-      .validate()
       .insert()
     setCandidateDefault("activemq", "5.16.2")
   }

src/main/scala/io/sdkman/changelogs/AntMigration.scala

@@ -5,204 +5,6 @@ import com.mongodb.client.MongoDatabase
 
 @ChangeLog(order = "032")
 class AntMigration {
-  @ChangeSet(
-    order = "001",
-    id = "001-add_ant_1.9.10",
-    author = "andrebrait"
-  )
-  def migration001(implicit db: MongoDatabase): Unit = {
-    Version(
-      "ant",
-      "1.9.10",
-      "https://archive.apache.org/dist/ant/binaries/apache-ant-1.9.10-bin.zip"
-    ).validate()
-      .insert()
-  }
-
-  @ChangeSet(
-    order = "002",
-    id = "002-add_ant_1.9.11",
-    author = "andrebrait"
-  )
-  def migration002(implicit db: MongoDatabase): Unit = {
-    Version(
-      "ant",
-      "1.9.11",
-      "https://archive.apache.org/dist/ant/binaries/apache-ant-1.9.11-bin.zip"
-    ).validate()
-      .insert()
-  }
-
-  @ChangeSet(
-    order = "003",
-    id = "003-add_ant_1.9.12",
-    author = "andrebrait"
-  )
-  def migration003(implicit db: MongoDatabase): Unit = {
-    Version(
-      "ant",
-      "1.9.12",
-      "https://archive.apache.org/dist/ant/binaries/apache-ant-1.9.12-bin.zip"
-    ).validate()
-      .insert()
-  }
-
-  @ChangeSet(
-    order = "004",
-    id = "004-add_ant_1.9.13",
-    author = "andrebrait"
-  )
-  def migration004(implicit db: MongoDatabase): Unit = {
-    Version(
-      "ant",
-      "1.9.13",
-      "https://archive.apache.org/dist/ant/binaries/apache-ant-1.9.13-bin.zip"
-    ).validate()
-      .insert()
-  }
-
-  @ChangeSet(
-    order = "005",
-    id = "005-add_ant_1.9.14",
-    author = "andrebrait"
-  )
-  def migration005(implicit db: MongoDatabase): Unit = {
-    Version(
-      "ant",
-      "1.9.14",
-      "https://archive.apache.org/dist/ant/binaries/apache-ant-1.9.14-bin.zip"
-    ).validate()
-      .insert()
-  }
-
-  @ChangeSet(
-    order = "006",
-    id = "006-add_ant_1.9.15",
-    author = "andrebrait"
-  )
-  def migration006(implicit db: MongoDatabase): Unit = {
-    Version(
-      "ant",
-      "1.9.15",
-      "https://archive.apache.org/dist/ant/binaries/apache-ant-1.9.15-bin.zip"
-    ).validate()
-      .insert()
-  }
-
-  @ChangeSet(
-    order = "007",
-    id = "007-add_ant_1.10.2",
-    author = "andrebrait"
-  )
-  def migration007(implicit db: MongoDatabase): Unit = {
-    Version(
-      "ant",
-      "1.10.2",
-      "https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.2-bin.zip"
-    ).validate()
-      .insert()
-  }
-
-  @ChangeSet(
-    order = "008",
-    id = "008-add_ant_1.10.3",
-    author = "andrebrait"
-  )
-  def migration008(implicit db: MongoDatabase): Unit = {
-    Version(
-      "ant",
-      "1.10.3",
-      "https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.3-bin.zip"
-    ).validate()
-      .insert()
-  }
-
-  @ChangeSet(
-    order = "009",
-    id = "009-add_ant_1.10.4",
-    author = "andrebrait"
-  )
-  def migration009(implicit db: MongoDatabase): Unit = {
-    Version(
-      "ant",
-      "1.10.4",
-      "https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.4-bin.zip"
-    ).validate()
-      .insert()
-  }
-
-  @ChangeSet(
-    order = "010",
-    id = "010-add_ant_1.10.5",
-    author = "andrebrait"
-  )
-  def migration010(implicit db: MongoDatabase): Unit = {
-    Version(
-      "ant",
-      "1.10.5",
-      "https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.5-bin.zip"
-    ).validate()
-      .insert()
-  }
-
-  @ChangeSet(
-    order = "011",
-    id = "011-add_ant_1.10.6",
-    author = "andrebrait"
-  )
-  def migration011(implicit db: MongoDatabase): Unit = {
-    Version(
-      "ant",
-      "1.10.6",
-      "https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.6-bin.zip"
-    ).validate()
-      .insert()
-  }
-
-  @ChangeSet(
-    order = "012",
-    id = "012-add_ant_1.10.7",
-    author = "andrebrait"
-  )
-  def migration012(implicit db: MongoDatabase): Unit = {
-    Version(
-      "ant",
-      "1.10.7",
-      "https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.7-bin.zip"
-    ).validate()
-      .insert()
-  }
-
-  @ChangeSet(
-    order = "013",
-    id = "013-add_ant_1.10.8",
-    author = "andrebrait"
-  )
-  def migration013(implicit db: MongoDatabase): Unit = {
-    Version(
-      "ant",
-      "1.10.8",
-      "https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.8-bin.zip"
-    ).validate()
-      .insert()
-      .asCandidateDefault()
-  }
-
-  @ChangeSet(
-    order = "014",
-    id = "014-add_ant_1.10.9",
-    author = "aalmiray"
-  )
-  def migration014(implicit db: MongoDatabase): Unit = {
-    Version(
-      "ant",
-      "1.10.9",
-      "https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.9-bin.zip"
-    ).validate()
-      .insert()
-      .asCandidateDefault()
-  }
-
   @ChangeSet(
     order = "015",
     id = "015-add_ant_1.10.10",

src/main/scala/io/sdkman/changelogs/AsciidoctorjMigrations.scala

@@ -7,7 +7,7 @@ import com.mongodb.client.MongoDatabase
 class CxfMigrations {
 
   @ChangeSet(order = "001", id = "001_add_cxf_3_2_4", author = "r0b0")
-  def migration001(implicit db: MongoDatabase) = {
+  def migration001(implicit db: MongoDatabase): Version = {
     Candidate(
       candidate = "cxf",
       name = "CXF",
@@ -23,26 +23,4 @@ class CxfMigrations {
       url = "http://apache.mirror.anlx.net/cxf/3.2.4/apache-cxf-3.2.4.zip"
     ).insert()
   }
-
-  @ChangeSet(order = "002", id = "002_add_cxf_3_2_4-3_2_5", author = "marc0der")
-  def migration002(implicit db: MongoDatabase) = {
-    removeVersion("cxf", "3.2.4")
-    Version(
-      "cxf",
-      "3.2.4",
-      "https://archive.apache.org/dist/cxf/3.2.4/apache-cxf-3.2.4.zip"
-    ).validate()
-      .insert()
-    Version(
-      "cxf",
-      "3.2.5",
-      "https://archive.apache.org/dist/cxf/3.2.5/apache-cxf-3.2.5.zip"
-    ).validate()
-      .insert()
-  }
-
-  @ChangeSet(order = "003", id = "003_make_3_2_5_default", author = "marc0der")
-  def migration003(implicit db: MongoDatabase) = {
-    setCandidateDefault("cxf", "3.2.5")
-  }
 }