Release/2.1.0

.github/workflows/deploy.yml

@@ -28,9 +28,9 @@ jobs:
 
     - name: Publish collector locally
       run: |
-        git clone --branch 2.8.1 --depth 1 https://github.com/snowplow/stream-collector.git
+        git clone --branch 3.2.0 --depth 1 https://github.com/snowplow/stream-collector.git
         cd stream-collector
-        sbt publishLocal
+        sbt +publishLocal
 
     - name: Run sbt
       run: sbt test

.github/workflows/test.yml

@@ -18,9 +18,9 @@ jobs:
 
     - name: Publish collector locally
       run: |
-        git clone --branch 2.8.1 --depth 1 https://github.com/snowplow/stream-collector.git
+        git clone --branch 3.2.0 --depth 1 https://github.com/snowplow/stream-collector.git
         cd stream-collector
-        sbt publishLocal
+        sbt +publishLocal
 
     - name: Run sbt
       run: sbt test

CHANGELOG

@@ -1,3 +1,8 @@
+Version 2.1.0 (2024-04-08)
+--------------------------
+Update the license to Snowplow Limited Use License Agreement 1.0
+Upgrade collector to 3.2.0 and enrich to 4.2.0
+
 Version 2.0.0 (2023-08-24)
 --------------------------
 Add a UI

LICENSE.md

@@ -1,30 +1,36 @@
-# Snowplow Community License Agreement
+# Snowplow Limited Use License Agreement
 
-_Version 1.0, January 2023_
+_Version 1.0, January 2024_
 
-This Snowplow Community License Agreement, Version 1.0 (the “Agreement”) sets forth the terms on which Snowplow Analytics, Ltd. (“Snowplow”) makes available certain software made available by Snowplow under this Agreement (the “Software”). BY INSTALLING, DOWNLOADING, ACCESSING, OR USING ANY OF THE SOFTWARE, YOU AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE TO SUCH TERMS AND CONDITIONS, YOU MUST NOT USE THE SOFTWARE. IF YOU ARE RECEIVING THE SOFTWARE ON BEHALF OF A LEGAL ENTITY, YOU REPRESENT AND WARRANT THAT YOU HAVE THE ACTUAL AUTHORITY TO AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT ON BEHALF OF SUCH ENTITY. “Licensee” means you, an individual, or the entity on whose behalf you are receiving the Software.
+This Snowplow Limited Use License Agreement, Version 1.0 (the “Agreement”) sets forth the terms on which Snowplow Analytics, Ltd. (“Snowplow”) makes available certain software (the “Software”). BY INSTALLING, DOWNLOADING, ACCESSING, OR USING ANY OF THE SOFTWARE, YOU AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE TO SUCH TERMS AND CONDITIONS, YOU MUST NOT USE THE SOFTWARE. IF YOU ARE RECEIVING THE SOFTWARE ON BEHALF OF A LEGAL ENTITY, YOU REPRESENT AND WARRANT THAT YOU HAVE THE ACTUAL AUTHORITY TO AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT ON BEHALF OF SUCH ENTITY. “Licensee” means you, an individual, or the entity on whose behalf you are receiving the Software.
 
 ## LICENSE GRANT AND CONDITIONS
 
-**1.1 License.** Subject to the terms and conditions of this Agreement, Snowplow hereby grants to Licensee a non-exclusive, royalty-free, worldwide, non-transferable, non-sublicenseable license during the term of this Agreement to: (a) use the Software; (b) prepare modifications and derivative works of the Software; and (c) reproduce copies of the Software (the “License”). No right to distribute or make available the Software is granted under this License. Licensee is not granted the right to, and Licensee shall not, exercise the License for an Excluded Purpose. For purposes of this Agreement, “Excluded Purpose” means making available any on-premises or distributed software product, software-as-a-service, platform-as-a-service, infrastructure-as-a-service, or other similar online service, that competes with any products or services that Snowplow or any of its affiliates provides using the Software.
+**1.1 License.** Subject to the terms and conditions of this Agreement, Snowplow hereby grants to Licensee a non-exclusive, royalty-free, worldwide, non-transferable, non-sublicensable license during the term of this Agreement to: (a) use the Software; (b) prepare modifications and derivative works of the Software; and (c) reproduce copies of the Software (the “License”). No right to distribute or make available the Software is granted under this License. Licensee is not granted the right to, and Licensee shall not, exercise the License for any Excluded Purpose.
 
-**1.2 Conditions.** In consideration of the License, Licensee’s distribution of the Software is subject to the following conditions:
+**1.2** For purposes of this Agreement, an “Excluded Purpose” is any use that is either a Competing Use or a Highly-Available Production Use, or both of them.
+
+* **1.2.1** A “Competing Use” is making available any on-premises or distributed software product, or any software-as-a-service, platform-as-a-service, infrastructure-as-a-service, or other similar online service, that competes with any products or services that Snowplow or any of its affiliates provides using the Software.
+
+* **1.2.2** Highly-Available Production Use is any highly-available use, including without limitation any use where multiple instances of any Software component run concurrently to avoid a single point of failure, in a production environment, where production means use on live data.
+
+**1.3 Conditions.** In consideration of the License, Licensee’s use of the Software is subject to the following conditions:
 
 * **a.** Licensee must cause any Software modified by Licensee to carry prominent notices stating that Licensee modified the Software.
 
 * **b.** On each Software copy, Licensee shall reproduce and not remove or alter all Snowplow or third party copyright or other proprietary notices contained in the Software, and Licensee must include the notice below on each copy.
 
   ```
   This software is made available by Snowplow Analytics, Ltd.,
-  under the terms of the Snowplow Community License Agreement, Version 1.0
-  located at https://docs.snowplow.io/community-license-1.0
-  BY INSTALLING, DOWNLOADING, ACCESSING, USING OR DISTRIBUTING ANY OF THE SOFTWARE,
-  YOU AGREE TO THE TERMS OF SUCH LICENSE AGREEMENT.
+  under the terms of the Snowplow Limited Use License Agreement, Version 1.0
+  located at https://docs.snowplow.io/limited-use-license-1.0
+  BY INSTALLING, DOWNLOADING, ACCESSING, USING OR DISTRIBUTING ANY PORTION
+  OF THE SOFTWARE, YOU AGREE TO THE TERMS OF SUCH LICENSE AGREEMENT.
   ```
 
-**1.3 Licensee Modifications.** Licensee may add its own copyright notices to modifications made by Licensee.
+**1.4 Licensee Modifications.** Licensee may add its own copyright notices to modifications made by Licensee.
 
-**1.4 No Sublicensing.** The License does not include the right to sublicense the Software, however, each recipient to which Licensee provides the Software may exercise the Licenses so long as such recipient agrees to the terms and conditions of this Agreement.
+**1.5 No Sublicensing.** The License does not include the right to sublicense the Software, however, each recipient to which Licensee provides the Software may exercise the Licenses so long as such recipient agrees to the terms and conditions of this Agreement.
 
 ## TERM AND TERMINATION
 
@@ -40,12 +46,12 @@ SNOWPLOW HEREBY DISCLAIMS ANY AND ALL WARRANTIES AND CONDITIONS, EXPRESS, IMPLIE
 
 ## LIMITATION OF LIABILITY
 
-SNOWPLOW WILL NOT BE LIABLE FOR ANY DAMAGES OF ANY KIND, INCLUDING BUT NOT LIMITED TO, LOST PROFITS OR ANY CONSEQUENTIAL, SPECIAL, INCIDENTAL, INDIRECT, OR DIRECT DAMAGES, HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, ARISING OUT OF THIS AGREEMENT. THE FOREGOING SHALL APPLY TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+SNOWPLOW WILL NOT BE LIABLE FOR ANY DAMAGES OF ANY KIND, INCLUDING BUT NOT LIMITED TO LOST PROFITS OR ANY CONSEQUENTIAL, SPECIAL, INCIDENTAL, INDIRECT, OR DIRECT DAMAGES, HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, ARISING OUT OF THIS AGREEMENT. THE FOREGOING SHALL APPLY TO THE EXTENT PERMITTED BY APPLICABLE LAW.
 
 ## GENERAL
 
 **6.1 Governing Law.** This Agreement will be governed by and interpreted in accordance with the laws of the state of Delaware, without reference to its conflict of laws principles. If Licensee is located within the United States, all disputes arising out of this Agreement are subject to the exclusive jurisdiction of courts located in Delaware, USA. If Licensee is located outside of the United States, any dispute, controversy or claim arising out of or relating to this Agreement will be referred to and finally determined by arbitration in accordance with the JAMS International Arbitration Rules. The tribunal will consist of one arbitrator. The place of arbitration will be in the State of Delaware, USA. The language to be used in the arbitral proceedings will be English. Judgment upon the award rendered by the arbitrator may be entered in any court having jurisdiction thereof.
 
 **6.2. Assignment.** Licensee is not authorized to assign its rights under this Agreement to any third party. Snowplow may freely assign its rights under this Agreement to any third party.
 
-**6.3. Other.** This Agreement is the entire agreement between the parties regarding the subject matter hereof. No amendment or modification of this Agreement will be valid or binding upon the parties unless made in writing and signed by the duly authorized representatives of both parties. In the event that any provision, including without limitation any condition, of this Agreement is held to be unenforceable, this Agreement and all licenses and rights granted hereunder will immediately terminate. Waiver by Snowplow of a breach of any provision of this Agreement or the failure by Snowplow to exercise any right hereunder will not be construed as a waiver of any subsequent breach of that right or as a waiver of any other right.
+**6.3. Other.** This Agreement is the entire agreement between the parties regarding the subject matter hereof. No amendment or modification of this Agreement will be valid or binding upon the parties unless made in writing and signed by the duly authorized representatives of both parties. In the event that any provision, including without limitation any condition, of this Agreement is held to be unenforceable, this Agreement and all licenses and rights granted hereunder will immediately terminate. Waiver by Snowplow of a breach of any provision of this Agreement or the failure by Snowplow to exercise any right hereunder will not be construed as a waiver of any subsequent breach of that right or as a waiver of any other right.

README.md

@@ -23,9 +23,9 @@ Assuming [Git][git] and [sbt][sbt]:
 git clone git@github.com:snowplow-incubator/snowplow-micro.git
 cd snowplow-micro
 
-git clone --branch 2.8.1 --depth 1 git@github.com:snowplow/stream-collector.git
+git clone --branch 3.2.0 --depth 1 git@github.com:snowplow/stream-collector.git
 cd stream-collector
-sbt publishLocal && cd ..
+sbt +publishLocal && cd ..
 
 sbt test
 ```
@@ -34,7 +34,7 @@ sbt test
 
 Copyright (c) 2019-present Snowplow Analytics Ltd. All rights reserved.
 
-Licensed under the [Snowplow Community License](https://docs.snowplow.io/community-license-1.0). _(If you are uncertain how it applies to your use case, check our answers to [frequently asked questions](https://docs.snowplow.io/docs/contributing/community-license-faq/).)_
+Licensed under the [Snowplow Limited Use License Agreement][license]. _(If you are uncertain how it applies to your use case, check our answers to [frequently asked questions][faq].)_
 
 [docker-micro]: https://hub.docker.com/r/snowplow/snowplow-micro
 [docker-image]: https://img.shields.io/docker/v/snowplow/snowplow-micro?sort=semver
@@ -45,8 +45,9 @@ Licensed under the [Snowplow Community License](https://docs.snowplow.io/communi
 [gh-actions-image]: https://github.com/snowplow-incubator/snowplow-micro/actions/workflows/test.yml/badge.svg?branch=master
 [gh-releases]: https://github.com/snowplow-incubator/snowplow-micro/releases
 
-[license]: https://docs.snowplow.io/docs/contributing/community-license-faq/
-[license-image]: https://img.shields.io/badge/license-Snowplow--Community-blue.svg?style=flat
+[license]: https://docs.snowplow.io/limited-use-license-1.0
+[license-image]: https://img.shields.io/badge/license-Snowplow--Limited--Use-blue.svg?style=flat
+[faq]: https://docs.snowplow.io/docs/contributing/limited-use-license-faq/
 
 [snowplow]: https://github.com/snowplow/snowplow
 [discourse]: https://discourse.snowplow.io

build.sbt

@@ -6,7 +6,9 @@
   * Copyright (c) 2019-2022 Snowplow Analytics Ltd. All rights reserved.
   */
 import com.typesafe.sbt.packager.MappingsHelper.directory
-import com.typesafe.sbt.packager.docker._
+import com.typesafe.sbt.packager.docker.*
+
+import scala.collection.Seq
 
 lazy val buildSettings = Seq(    
   name := "snowplow-micro",
@@ -20,40 +22,42 @@ lazy val buildSettings = Seq(
     baseDirectory.value / "ui" / "out"
   ),
   Compile / unmanagedResources += file("LICENSE.md"),
-  resolvers ++= Dependencies.resolvers
+  resolvers ++= Dependencies.resolvers,
+  Test / parallelExecution := false
 )
 
 lazy val dependencies = Seq(
   libraryDependencies ++= Seq(
     Dependencies.snowplowStreamCollector,
     Dependencies.snowplowCommonEnrich,
+    Dependencies.decline,
+    Dependencies.http4sCirce,
     Dependencies.circeJawn,
     Dependencies.circeGeneric,
     Dependencies.specs2,
+    Dependencies.specs2CE,
     Dependencies.badRows
   )
 )
 
-lazy val exclusions = Seq(
-  excludeDependencies ++= Dependencies.exclusions
-)
-
 lazy val buildInfoSettings = Seq(
-  buildInfoKeys := Seq[BuildInfoKey](organization, name, version, scalaVersion),
-  buildInfoPackage := "buildinfo"
+  buildInfoKeys := Seq[BuildInfoKey](name, moduleName, dockerAlias, version, "shortName" -> "micro-ssc"),
+  buildInfoPackage := "com.snowplowanalytics.snowplow.micro",
+  buildInfoOptions += BuildInfoOption.Traits("com.snowplowanalytics.snowplow.collector.core.AppInfo")
 )
 
+
 lazy val dynVerSettings = Seq(
   ThisBuild / dynverVTagPrefix := false, // Otherwise git tags required to have v-prefix
   ThisBuild / dynverSeparator := "-"     // to be compatible with docker
 )
 
 lazy val commonSettings = 
   dependencies ++
-  exclusions ++
   buildSettings ++
   buildInfoSettings ++
   dynVerSettings ++
+  Settings.licenseSettings ++
   Settings.dynverOptions ++
   Settings.assemblyOptions
 
@@ -64,7 +68,7 @@ lazy val dockerCommon = Seq(
   Docker / daemonUserUid := None,
   dockerPermissionStrategy := DockerPermissionStrategy.CopyChown,
   dockerRepository := Some("snowplow"),
-  Universal / mappings += file("LICENSE.md") -> "LICENSE.md"
+  Universal / mappings += file("LICENSE.md") -> "/SNOWPLOW-LICENSE.md"
 )
 
 lazy val microSettingsDistroless = dockerCommon ++ Seq(

project/Dependencies.scala

@@ -16,33 +16,36 @@ object Dependencies {
 
   object V {
     // Snowplow
-    val snowplowStreamCollector = "2.8.1"
-    val snowplowCommonEnrich    = "3.8.0"
+    val snowplowStreamCollector = "3.2.0"
+    val snowplowCommonEnrich    = "4.2.0"
+    val http4sCirce             = "0.23.23"
 
+    val decline          = "2.4.1"
+
     // circe
     val circe = "0.14.2"
 
     // specs2
     val specs2        = "4.12.2"
+    val specs2CE      = "1.5.0"
 
     // force versions of transitive dependencies
     val badRows   = "2.2.0"
   }
 
-  val exclusions = Seq(
-    "org.apache.tomcat.embed" % "tomcat-embed-core"
-  )
-
-  // Snowplow stream collector
-  val snowplowStreamCollector = "com.snowplowanalytics" %% "snowplow-stream-collector-core" % V.snowplowStreamCollector
-  val snowplowCommonEnrich    = "com.snowplowanalytics" %% "snowplow-common-enrich"         % V.snowplowCommonEnrich
+  val snowplowStreamCollector = "com.snowplowanalytics" %% "snowplow-stream-collector-http4s-core" % V.snowplowStreamCollector 
+  val snowplowCommonEnrich    = "com.snowplowanalytics" %% "snowplow-common-enrich"                % V.snowplowCommonEnrich 
+
+  val http4sCirce = "org.http4s"    %% "http4s-circe"   % V.http4sCirce 
+  val decline     = "com.monovore"  %% "decline-effect" % V.decline
 
   // circe
   val circeJawn    = "io.circe" %% "circe-jawn"    % V.circe
   val circeGeneric = "io.circe" %% "circe-generic" % V.circe
 
   // specs2
-  val specs2       = "org.specs2"    %% "specs2-core"   % V.specs2       % Test
+  val specs2       = "org.specs2"     %% "specs2-core"                % V.specs2    % Test
+  val specs2CE     = "org.typelevel"  %% "cats-effect-testing-specs2" % V.specs2CE  % Test
 
   // transitive
   val badRows          = "com.snowplowanalytics"           %% "snowplow-badrows"        % V.badRows

project/Settings.scala

@@ -20,8 +20,26 @@ import sbtassembly.AssemblyKeys._
 // SBT DynVer
 import sbtdynver.DynVerPlugin.autoImport._
 
+import de.heikoseeberger.sbtheader.HeaderPlugin.autoImport._
+
 object Settings {
 
+  lazy val licenseSettings = Seq(
+    licenses += ("Snowplow Limited Use License Agreement", url("https://docs.snowplow.io/limited-use-license-1.0")),
+    headerLicense := Some(HeaderLicense.Custom(
+      """|Copyright (c) 2019-present Snowplow Analytics Ltd. All rights reserved.
+         |
+         |This software is made available by Snowplow Analytics, Ltd.,
+         |under the terms of the Snowplow Limited Use License Agreement, Version 1.0
+         |located at https://docs.snowplow.io/limited-use-license-1.0
+         |BY INSTALLING, DOWNLOADING, ACCESSING, USING OR DISTRIBUTING ANY PORTION
+         |OF THE SOFTWARE, YOU AGREE TO THE TERMS OF SUCH LICENSE AGREEMENT.
+         |""".stripMargin
+    )),
+    headerMappings := headerMappings.value + (HeaderFileType.conf -> HeaderCommentStyle.hashLineComment),
+    Compile / unmanagedResources += file("LICENSE.md")
+  )
+
   lazy val compilerOptions = Seq(
     "-deprecation",
     "-encoding", "UTF-8",

project/plugins.sbt

@@ -1,7 +1,6 @@
-logLevel := Level.Warn
-
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.0.0")
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.8.2")
-addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.3")
-addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0")
-addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
+addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat"         % "0.4.2")
+addSbtPlugin("com.snowplowanalytics"     % "sbt-snowplow-release" % "0.3.1")
+addSbtPlugin("com.eed3si9n"              % "sbt-buildinfo"        % "0.11.0")
+addSbtPlugin("com.dwijnand"              % "sbt-dynver"           % "4.1.1")
+addSbtPlugin("com.eed3si9n"              % "sbt-assembly"         % "1.0.0")
+addSbtPlugin("de.heikoseeberger"         % "sbt-header"           % "5.10.0")