From 75f5290a51f46f1286311a7e33556f7999d81c3a Mon Sep 17 00:00:00 2001
From: Marc Delagrammatikas <delagrammatikas@gmail.com>
Date: Tue, 30 Aug 2022 14:39:25 -0700
Subject: [PATCH 1/2] bump analytics client to 3.3.1 to fix a CVE
---
project.clj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/project.clj b/project.clj
index c4ff495..ab48ed7 100644
--- a/project.clj
+++ b/project.clj
@@ -4,7 +4,7 @@
:license {:name "Eclipse Public License"
:url "http://www.eclipse.org/legal/epl-v10.html"}
:dependencies [[org.clojure/clojure "1.8.0"]
- [com.segment.analytics.java/analytics "3.1.3"]]
+ [com.segment.analytics.java/analytics "3.3.1"]]
:profiles {:dev {:dependencies [[bond "0.2.6"]]}}
:plugins [[lein-ancient "0.6.15"]
[lein-codox "0.10.7"]]
From 6a753fd367f3c8934d387c4065ceaf1d1ca6ac7f Mon Sep 17 00:00:00 2001
From: Marc Delagrammatikas <delagrammatikas@gmail.com>
Date: Fri, 2 Sep 2022 13:30:09 -0700
Subject: [PATCH 2/2] bump version to 0.8.1
---
CHANGELOG.md | 5 +++++
README.md | 2 +-
docs/circleci.analytics-clj.core.html | 2 +-
docs/index.html | 2 +-
project.clj | 2 +-
src/circleci/analytics_clj/common.clj | 2 +-
6 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 085e2dc..497046a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+Version 0.8.1 (September 1, 2022)
+================================
+
+* [FIXED](https://github.com/circleci/analytics-clj/pull/19): Update com.segment.analytics.java/analytics to version 3.3.1
+
Version 0.8.0 (January 27, 2019)
================================
diff --git a/README.md b/README.md
index 8266c69..cbc24d9 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ For full documentation on the Segment.io 2.x Java client, see [analytics-java](h
## Installation
-`[circleci/analytics-clj "0.8.0"]`
+`[circleci/analytics-clj "0.8.1"]`
## Usage
diff --git a/docs/circleci.analytics-clj.core.html b/docs/circleci.analytics-clj.core.html
index ba8defa..44e9fda 100644
--- a/docs/circleci.analytics-clj.core.html
+++ b/docs/circleci.analytics-clj.core.html
@@ -1,6 +1,6 @@
<!DOCTYPE html PUBLIC ""
"">
-<html><head><meta charset="UTF-8" /><title>circleci.analytics-clj.core documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="css/highlight.css" /><script type="text/javascript" src="js/highlight.min.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a></h2><h1><a href="index.html"><span class="project-title"><span class="project-name">Analytics-clj</span> <span class="project-version">0.8.0</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1 current"><a href="circleci.analytics-clj.core.html"><div class="inner"><span>circleci.analytics-clj.core</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="circleci.analytics-clj.core.html#var-alias"><div class="inner"><span>alias</span></div></a></li><li class="depth-1"><a href="circleci.analytics-clj.core.html#var-enqueue"><div class="inner"><span>enqueue</span></div></a></li><li class="depth-1"><a href="circleci.analytics-clj.core.html#var-flush"><div class="inner"><span>flush</span></div></a></li><li class="depth-1"><a href="circleci.analytics-clj.core.html#var-group"><div class="inner"><span>group</span></div></a></li><li class="depth-1"><a href="circleci.analytics-clj.core.html#var-identify"><div class="inner"><span>identify</span></div></a></li><li class="depth-1"><a href="circleci.analytics-clj.core.html#var-initialize"><div class="inner"><span>initialize</span></div></a></li><li class="depth-1"><a href="circleci.analytics-clj.core.html#var-page"><div class="inner"><span>page</span></div></a></li><li class="depth-1"><a href="circleci.analytics-clj.core.html#var-screen"><div class="inner"><span>screen</span></div></a></li><li class="depth-1"><a href="circleci.analytics-clj.core.html#var-shutdown"><div class="inner"><span>shutdown</span></div></a></li><li class="depth-1"><a href="circleci.analytics-clj.core.html#var-track"><div class="inner"><span>track</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">circleci.analytics-clj.core</h1><div class="doc"><pre class="plaintext"></pre></div><div class="public anchor" id="var-alias"><h3>alias</h3><h4 class="added">added in 0.4.0</h4><div class="usage"><code>(alias analytics previous-id user-id)</code><code>(alias analytics previous-id user-id options)</code></div><div class="doc"><pre class="plaintext">`alias` is how you associate one identity with another.
+<html><head><meta charset="UTF-8" /><title>circleci.analytics-clj.core documentation</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="css/highlight.css" /><script type="text/javascript" src="js/highlight.min.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a></h2><h1><a href="index.html"><span class="project-title"><span class="project-name">Analytics-clj</span> <span class="project-version">0.8.1</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 "><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1 current"><a href="circleci.analytics-clj.core.html"><div class="inner"><span>circleci.analytics-clj.core</span></div></a></li></ul></div><div class="sidebar secondary"><h3><a href="#top"><span class="inner">Public Vars</span></a></h3><ul><li class="depth-1"><a href="circleci.analytics-clj.core.html#var-alias"><div class="inner"><span>alias</span></div></a></li><li class="depth-1"><a href="circleci.analytics-clj.core.html#var-enqueue"><div class="inner"><span>enqueue</span></div></a></li><li class="depth-1"><a href="circleci.analytics-clj.core.html#var-flush"><div class="inner"><span>flush</span></div></a></li><li class="depth-1"><a href="circleci.analytics-clj.core.html#var-group"><div class="inner"><span>group</span></div></a></li><li class="depth-1"><a href="circleci.analytics-clj.core.html#var-identify"><div class="inner"><span>identify</span></div></a></li><li class="depth-1"><a href="circleci.analytics-clj.core.html#var-initialize"><div class="inner"><span>initialize</span></div></a></li><li class="depth-1"><a href="circleci.analytics-clj.core.html#var-page"><div class="inner"><span>page</span></div></a></li><li class="depth-1"><a href="circleci.analytics-clj.core.html#var-screen"><div class="inner"><span>screen</span></div></a></li><li class="depth-1"><a href="circleci.analytics-clj.core.html#var-shutdown"><div class="inner"><span>shutdown</span></div></a></li><li class="depth-1"><a href="circleci.analytics-clj.core.html#var-track"><div class="inner"><span>track</span></div></a></li></ul></div><div class="namespace-docs" id="content"><h1 class="anchor" id="top">circleci.analytics-clj.core</h1><div class="doc"><pre class="plaintext"></pre></div><div class="public anchor" id="var-alias"><h3>alias</h3><h4 class="added">added in 0.4.0</h4><div class="usage"><code>(alias analytics previous-id user-id)</code><code>(alias analytics previous-id user-id options)</code></div><div class="doc"><pre class="plaintext">`alias` is how you associate one identity with another.
This is an advanced method, but it is required to manage
user identities successfully in some of our integrations.</pre></div></div><div class="public anchor" id="var-enqueue"><h3>enqueue</h3><h4 class="added">added in 0.4.0</h4><div class="usage"><code>(enqueue analytics message-builder)</code></div><div class="doc"><pre class="plaintext">Top-level `enqueue` function to allow for extensibility in the future.
</pre></div></div><div class="public anchor" id="var-flush"><h3>flush</h3><h4 class="added">added in 0.4.0</h4><div class="usage"><code>(flush analytics)</code></div><div class="doc"><pre class="plaintext">Flush events in the message queue.
diff --git a/docs/index.html b/docs/index.html
index e5520da..254ac53 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -1,3 +1,3 @@
<!DOCTYPE html PUBLIC ""
"">
-<html><head><meta charset="UTF-8" /><title>Analytics-clj 0.8.0</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="css/highlight.css" /><script type="text/javascript" src="js/highlight.min.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a></h2><h1><a href="index.html"><span class="project-title"><span class="project-name">Analytics-clj</span> <span class="project-version">0.8.0</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 current"><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1 "><a href="circleci.analytics-clj.core.html"><div class="inner"><span>circleci.analytics-clj.core</span></div></a></li></ul></div><div class="namespace-index" id="content"><h1><span class="project-title"><span class="project-name">Analytics-clj</span> <span class="project-version">0.8.0</span></span></h1><h5 class="license">Released under the <a href="http://www.eclipse.org/legal/epl-v10.html">Eclipse Public License</a></h5><div class="doc"><p>Idiomatic Clojure wrapper for the Segment.io 2.x Java client.</p></div><h2>Installation</h2><p>To install, add the following dependency to your project or build file:</p><pre class="deps">[circleci/analytics-clj "0.8.0"]</pre><h2>Namespaces</h2><div class="namespace"><h3><a href="circleci.analytics-clj.core.html">circleci.analytics-clj.core</a></h3><div class="doc"><pre class="plaintext"></pre></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="circleci.analytics-clj.core.html#var-alias">alias</a> </li><li> <a href="circleci.analytics-clj.core.html#var-enqueue">enqueue</a> </li><li> <a href="circleci.analytics-clj.core.html#var-flush">flush</a> </li><li> <a href="circleci.analytics-clj.core.html#var-group">group</a> </li><li> <a href="circleci.analytics-clj.core.html#var-identify">identify</a> </li><li> <a href="circleci.analytics-clj.core.html#var-initialize">initialize</a> </li><li> <a href="circleci.analytics-clj.core.html#var-page">page</a> </li><li> <a href="circleci.analytics-clj.core.html#var-screen">screen</a> </li><li> <a href="circleci.analytics-clj.core.html#var-shutdown">shutdown</a> </li><li> <a href="circleci.analytics-clj.core.html#var-track">track</a> </li></ul></div></div></div></body></html>
\ No newline at end of file
+<html><head><meta charset="UTF-8" /><title>Analytics-clj 0.8.1</title><link rel="stylesheet" type="text/css" href="css/default.css" /><link rel="stylesheet" type="text/css" href="css/highlight.css" /><script type="text/javascript" src="js/highlight.min.js"></script><script type="text/javascript" src="js/jquery.min.js"></script><script type="text/javascript" src="js/page_effects.js"></script><script>hljs.initHighlightingOnLoad();</script></head><body><div id="header"><h2>Generated by <a href="https://github.com/weavejester/codox">Codox</a></h2><h1><a href="index.html"><span class="project-title"><span class="project-name">Analytics-clj</span> <span class="project-version">0.8.1</span></span></a></h1></div><div class="sidebar primary"><h3 class="no-link"><span class="inner">Project</span></h3><ul class="index-link"><li class="depth-1 current"><a href="index.html"><div class="inner">Index</div></a></li></ul><h3 class="no-link"><span class="inner">Namespaces</span></h3><ul><li class="depth-1 "><a href="circleci.analytics-clj.core.html"><div class="inner"><span>circleci.analytics-clj.core</span></div></a></li></ul></div><div class="namespace-index" id="content"><h1><span class="project-title"><span class="project-name">Analytics-clj</span> <span class="project-version">0.8.1</span></span></h1><h5 class="license">Released under the <a href="http://www.eclipse.org/legal/epl-v10.html">Eclipse Public License</a></h5><div class="doc"><p>Idiomatic Clojure wrapper for the Segment.io 2.x Java client.</p></div><h2>Installation</h2><p>To install, add the following dependency to your project or build file:</p><pre class="deps">[circleci/analytics-clj "0.8.1"]</pre><h2>Namespaces</h2><div class="namespace"><h3><a href="circleci.analytics-clj.core.html">circleci.analytics-clj.core</a></h3><div class="doc"><pre class="plaintext"></pre></div><div class="index"><p>Public variables and functions:</p><ul><li> <a href="circleci.analytics-clj.core.html#var-alias">alias</a> </li><li> <a href="circleci.analytics-clj.core.html#var-enqueue">enqueue</a> </li><li> <a href="circleci.analytics-clj.core.html#var-flush">flush</a> </li><li> <a href="circleci.analytics-clj.core.html#var-group">group</a> </li><li> <a href="circleci.analytics-clj.core.html#var-identify">identify</a> </li><li> <a href="circleci.analytics-clj.core.html#var-initialize">initialize</a> </li><li> <a href="circleci.analytics-clj.core.html#var-page">page</a> </li><li> <a href="circleci.analytics-clj.core.html#var-screen">screen</a> </li><li> <a href="circleci.analytics-clj.core.html#var-shutdown">shutdown</a> </li><li> <a href="circleci.analytics-clj.core.html#var-track">track</a> </li></ul></div></div></div></body></html>
\ No newline at end of file
diff --git a/project.clj b/project.clj
index ab48ed7..c13bd48 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject circleci/analytics-clj "0.8.0"
+(defproject circleci/analytics-clj "0.8.1"
:description "Idiomatic Clojure wrapper for the Segment.io 2.x Java client"
:url "https://github.com/circleci/analytics-clj"
:license {:name "Eclipse Public License"
diff --git a/src/circleci/analytics_clj/common.clj b/src/circleci/analytics_clj/common.clj
index a91eed2..bf8180b 100644
--- a/src/circleci/analytics_clj/common.clj
+++ b/src/circleci/analytics_clj/common.clj
@@ -3,7 +3,7 @@
[circleci.analytics-clj.utils :refer [string-keys]]))
(def ^:private ctx {"library" {"name" "analytics-clj"
- "version" "0.8.0"}})
+ "version" "0.8.1"}})
(defn common-fields
"The `MessageBuilder` interface has a set of fields common to all messages.