From 1244c6704be07026c3ff5d0986933aa2a13a8388 Mon Sep 17 00:00:00 2001 From: kelvinqian00 Date: Thu, 29 Feb 2024 11:27:50 -0500 Subject: [PATCH 1/3] Update Pedestal to 0.6.3 --- deps.edn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deps.edn b/deps.edn index a3ea1cfe..5dd12a56 100644 --- a/deps.edn +++ b/deps.edn @@ -32,8 +32,8 @@ :run-cli {:main-opts ["-m" "com.yetanalytics.datasim.cli"]} :server {:extra-paths ["src/server"] :extra-deps - {io.pedestal/pedestal.jetty {:mvn/version "0.6.2"} - io.pedestal/pedestal.service {:mvn/version "0.6.2"} + {io.pedestal/pedestal.jetty {:mvn/version "0.6.3"} + io.pedestal/pedestal.service {:mvn/version "0.6.3"} org.slf4j/slf4j-simple {:mvn/version "1.7.28"} clj-http/clj-http {:mvn/version "3.12.3"} environ/environ {:mvn/version "1.1.0"} From de2f000ec477471c73e6c00ba774ab91a255e4ab Mon Sep 17 00:00:00 2001 From: kelvinqian00 Date: Thu, 29 Feb 2024 11:33:13 -0500 Subject: [PATCH 2/3] Update jetty http2-server to 9.4.54.x version --- deps.edn | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/deps.edn b/deps.edn index 5dd12a56..03cdc3eb 100644 --- a/deps.edn +++ b/deps.edn @@ -32,8 +32,10 @@ :run-cli {:main-opts ["-m" "com.yetanalytics.datasim.cli"]} :server {:extra-paths ["src/server"] :extra-deps - {io.pedestal/pedestal.jetty {:mvn/version "0.6.3"} + {io.pedestal/pedestal.jetty {:mvn/version "0.6.3" + :exclusions [org.eclipse.jetty.http2/http2-server]} io.pedestal/pedestal.service {:mvn/version "0.6.3"} + org.eclipse.jetty.http2/http2-server {:mvn/version "9.4.54.v20240208"} org.slf4j/slf4j-simple {:mvn/version "1.7.28"} clj-http/clj-http {:mvn/version "3.12.3"} environ/environ {:mvn/version "1.1.0"} From 476cf885e15231ad8d5904dcc476eabc9e1c7f63 Mon Sep 17 00:00:00 2001 From: kelvinqian00 Date: Thu, 29 Feb 2024 11:38:01 -0500 Subject: [PATCH 3/3] Update to new version number --- CHANGELOG.md | 4 ++++ Makefile | 2 +- README.md | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e198506..12b271cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log +## [0.4.2] - 2024-02-29 +- Update Pedestal dependency to 0.6.3. +- Update Jetty http2-server dependency to 9.4.54 to address CVEs. + ## [0.4.1] - 2024-01-25 - Fix a number of bugs associated with Statement generation: - Fix places where `:definition` was used when `:activityDefinition` was supposed to be used in the code, causing Activities not to be associated with their respective Activity Types. diff --git a/Makefile b/Makefile index dc5fb1bf..d107e8fc 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ GROUP_ID ?= com.yetanalytics ARTIFACT_ID ?= datasim -VERSION ?= 0.4.1 +VERSION ?= 0.4.2 clean: rm -rf target diff --git a/README.md b/README.md index a01a4a45..fecb3131 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ DATASIM is funded by the Advanced Distributed Learning Initiative at US DoD. To use the core DATASIM library in your project, use the following dependency in your `deps.edn` file: ```clojure -com.yetanalytics/datasim {:mvn/version "0.4.1"} +com.yetanalytics/datasim {:mvn/version "0.4.2"} ``` If you wish to install DATASIM as an application with features such as CLI or the webserver, perform the following steps: