From d4a9409d6de0deb8c429cae88dbfc97bde5635ce Mon Sep 17 00:00:00 2001 From: Ambrose Bonnaire-Sergeant Date: Tue, 14 May 2024 17:21:38 -0500 Subject: [PATCH 1/7] wip --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index 608a6f181..d1ba9fb01 100644 --- a/project.clj +++ b/project.clj @@ -95,7 +95,7 @@ [com.arohner/uri "0.1.2"] ;; Web server - [metosin/compojure-api "1.1.13" ] + [metosin/compojure-api "1.1.15-SNAPSHOT"] [ring-middleware-format "0.7.4"] ;; optional ring-middleware-format dep (Note: ring-middleware-format is also a transitive dep for compojure-api) ;; see: https://github.com/ngrunwald/ring-middleware-format/issues/74 From b7e473b20f88772d3984a8e01ccb790a26ccd487 Mon Sep 17 00:00:00 2001 From: Ambrose Bonnaire-Sergeant Date: Tue, 14 May 2024 17:24:23 -0500 Subject: [PATCH 2/7] dep --- dependabot/dependency-tree.txt | 28 ++++++++++++++-------------- dependabot/pom.xml | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dependabot/dependency-tree.txt b/dependabot/dependency-tree.txt index 0e359f8b9..078bc2204 100644 --- a/dependabot/dependency-tree.txt +++ b/dependabot/dependency-tree.txt @@ -66,10 +66,7 @@ ctia:ctia:jar:1.1.1-SNAPSHOT +- com.arohner:uri:jar:0.1.2:compile | \- pathetic:pathetic:jar:0.5.0:compile | \- com.cemerick:clojurescript.test:jar:0.0.4:compile -+- metosin:compojure-api:jar:1.1.13:compile -| +- potemkin:potemkin:jar:0.4.5:compile -| | +- clj-tuple:clj-tuple:jar:0.2.2:compile -| | \- riddley:riddley:jar:0.1.12:compile ++- metosin:compojure-api:jar:1.1.15-SNAPSHOT:compile | +- compojure:compojure:jar:1.6.1:compile | | \- medley:medley:jar:1.0.0:compile | +- org.tobereplaced:lettercase:jar:1.0.0:compile @@ -84,16 +81,19 @@ ctia:ctia:jar:1.1.1-SNAPSHOT | \- javax.xml.bind:jaxb-api:jar:2.3.0:compile +- com.ibm.icu:icu4j:jar:65.1:compile +- metosin:ring-swagger:jar:1.0.0:compile -| \- metosin:scjsv:jar:0.5.0:compile -| \- com.github.java-json-tools:json-schema-validator:jar:2.2.10:compile -| +- com.github.java-json-tools:json-schema-core:jar:1.2.10:compile -| | +- com.github.java-json-tools:jackson-coreutils:jar:1.9:compile -| | | \- com.github.fge:msg-simple:jar:1.1:compile -| | | \- com.github.fge:btf:jar:1.2:compile -| | \- com.github.fge:uri-template:jar:0.9:compile -| +- javax.mail:mailapi:jar:1.4.3:compile -| | \- javax.activation:activation:jar:1.1:compile -| \- com.googlecode.libphonenumber:libphonenumber:jar:8.0.0:compile +| +- metosin:scjsv:jar:0.5.0:compile +| | \- com.github.java-json-tools:json-schema-validator:jar:2.2.10:compile +| | +- com.github.java-json-tools:json-schema-core:jar:1.2.10:compile +| | | +- com.github.java-json-tools:jackson-coreutils:jar:1.9:compile +| | | | \- com.github.fge:msg-simple:jar:1.1:compile +| | | | \- com.github.fge:btf:jar:1.2:compile +| | | \- com.github.fge:uri-template:jar:0.9:compile +| | +- javax.mail:mailapi:jar:1.4.3:compile +| | | \- javax.activation:activation:jar:1.1:compile +| | \- com.googlecode.libphonenumber:libphonenumber:jar:8.0.0:compile +| \- potemkin:potemkin:jar:0.4.5:compile +| +- clj-tuple:clj-tuple:jar:0.2.2:compile +| \- riddley:riddley:jar:0.1.12:compile +- metosin:ring-swagger-ui:jar:3.24.3:compile +- ring:ring-core:jar:1.9.5:compile | +- commons-io:commons-io:jar:2.10.0:compile diff --git a/dependabot/pom.xml b/dependabot/pom.xml index fcc970f86..8920840ef 100644 --- a/dependabot/pom.xml +++ b/dependabot/pom.xml @@ -593,7 +593,7 @@ metosin compojure-api - 1.1.13 + 1.1.15-SNAPSHOT slf4j-nop From a0604adfb8dfbf066ed8a968823b3acdeeb04279 Mon Sep 17 00:00:00 2001 From: Ambrose Bonnaire-Sergeant Date: Tue, 14 May 2024 17:36:40 -0500 Subject: [PATCH 3/7] deps --- dependabot/dependency-tree.txt | 15 ++++++++------- dependabot/pom.xml | 12 ++++++------ project.clj | 8 ++++---- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dependabot/dependency-tree.txt b/dependabot/dependency-tree.txt index 078bc2204..bade2d883 100644 --- a/dependabot/dependency-tree.txt +++ b/dependabot/dependency-tree.txt @@ -39,7 +39,7 @@ ctia:ctia:jar:1.1.1-SNAPSHOT | +- org.ini4j:ini4j:jar:0.5.2:compile | +- org.tcrawley:dynapath:jar:0.2.5:compile | \- digest:digest:jar:1.4.3:compile -+- prismatic:plumbing:jar:0.5.5:compile ++- prismatic:plumbing:jar:0.6.0:compile | \- de.kotka:lazymap:jar:3.1.0:compile +- clj-commons:clj-yaml:jar:1.0.26:compile | +- org.yaml:snakeyaml:jar:1.33:compile @@ -143,7 +143,7 @@ ctia:ctia:jar:1.1.1-SNAPSHOT | | +- org.iq80.snappy:snappy:jar:0.4:compile | | \- net.jpountz.lz4:lz4:jar:1.3:compile | \- org.apache.commons:commons-pool2:jar:2.4.2:compile -+- cheshire:cheshire:jar:5.10.2:compile ++- cheshire:cheshire:jar:5.13.0:compile | \- tigris:tigris:jar:0.1.2:compile +- metrics-clojure:metrics-clojure:jar:2.10.0:compile | \- io.dropwizard.metrics:metrics-core:jar:3.2.2:compile @@ -249,11 +249,12 @@ ctia:ctia:jar:1.1.1-SNAPSHOT | \- org.apache.kafka:kafka-clients:jar:1.0.0:compile | +- org.lz4:lz4-java:jar:1.4:compile | \- org.xerial.snappy:snappy-java:jar:1.1.4:compile -+- com.fasterxml.jackson.core:jackson-core:jar:2.13.4:compile -+- com.fasterxml.jackson.dataformat:jackson-dataformat-smile:jar:2.13.4:compile -+- com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:jar:2.13.4:compile -+- com.fasterxml.jackson.core:jackson-databind:jar:2.13.4.2:compile -| \- com.fasterxml.jackson.core:jackson-annotations:jar:2.13.4:compile ++- com.fasterxml.jackson.core:jackson-core:jar:2.17.0:compile ++- com.fasterxml.jackson.dataformat:jackson-dataformat-smile:jar:2.17.0:compile ++- com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:jar:2.17.0:compile ++- com.fasterxml.jackson.core:jackson-databind:jar:2.17.0:compile +| +- com.fasterxml.jackson.core:jackson-annotations:jar:2.17.0:compile +| \- net.bytebuddy:byte-buddy:jar:1.14.9:compile +- zookeeper-clj:zookeeper-clj:jar:0.9.4:compile +- software.amazon.awssdk:firehose:jar:2.17.232:compile | +- software.amazon.awssdk:aws-json-protocol:jar:2.17.232:compile diff --git a/dependabot/pom.xml b/dependabot/pom.xml index 8920840ef..605036b4c 100644 --- a/dependabot/pom.xml +++ b/dependabot/pom.xml @@ -363,7 +363,7 @@ prismatic plumbing - 0.5.5 + 0.6.0 slf4j-nop @@ -1030,7 +1030,7 @@ cheshire cheshire - 5.10.2 + 5.13.0 slf4j-nop @@ -1513,7 +1513,7 @@ com.fasterxml.jackson.core jackson-core - 2.13.4 + 2.17.0 slf4j-nop @@ -1536,7 +1536,7 @@ com.fasterxml.jackson.dataformat jackson-dataformat-smile - 2.13.4 + 2.17.0 slf4j-nop @@ -1559,7 +1559,7 @@ com.fasterxml.jackson.dataformat jackson-dataformat-cbor - 2.13.4 + 2.17.0 slf4j-nop @@ -1582,7 +1582,7 @@ com.fasterxml.jackson.core jackson-databind - 2.13.4.2 + 2.17.0 slf4j-nop diff --git a/project.clj b/project.clj index d1ba9fb01..378d0dc2e 100644 --- a/project.clj +++ b/project.clj @@ -1,8 +1,8 @@ -(def cheshire-version "5.10.2") +(def cheshire-version "5.13.0") (def clj-http-fake-version "1.0.3") (def clj-version "1.11.2") -(def jackson-version "2.13.4") -(def jackson-databind-version "2.13.4.2") +(def jackson-version "2.17.0") +(def jackson-databind-version jackson-version) (def metrics-clojure-version "2.10.0") (def netty-version "4.1.75.Final") (def perforate-version "0.3.4") @@ -80,7 +80,7 @@ ;; Trapperkeeper [puppetlabs/trapperkeeper ~trapperkeeper-version] [puppetlabs/kitchensink ~trapperkeeper-version] - [prismatic/plumbing "0.5.5"] ;; upgrade puppetlabs/trapperkeeper + [prismatic/plumbing "0.6.0"] ;; upgrade puppetlabs/trapperkeeper [clj-commons/clj-yaml "1.0.26"] ;; upgrade snakeyaml dep ;; Schemas From ede70666ee0c9b0ca5172ae479ea1db4e82b6170 Mon Sep 17 00:00:00 2001 From: Ambrose Bonnaire-Sergeant Date: Mon, 17 Jun 2024 10:54:14 -0500 Subject: [PATCH 4/7] try --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index 378d0dc2e..c526b4743 100644 --- a/project.clj +++ b/project.clj @@ -95,7 +95,7 @@ [com.arohner/uri "0.1.2"] ;; Web server - [metosin/compojure-api "1.1.15-SNAPSHOT"] + [metosin/compojure-api "1.1.15-20240617.154912-16"] [ring-middleware-format "0.7.4"] ;; optional ring-middleware-format dep (Note: ring-middleware-format is also a transitive dep for compojure-api) ;; see: https://github.com/ngrunwald/ring-middleware-format/issues/74 From 4322236f48db57e78c76f23b02356d4d7baad898 Mon Sep 17 00:00:00 2001 From: Ambrose Bonnaire-Sergeant Date: Mon, 17 Jun 2024 10:54:45 -0500 Subject: [PATCH 5/7] wip --- src/ctia/http/handler.clj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ctia/http/handler.clj b/src/ctia/http/handler.clj index f8cd82852..c02b2e206 100644 --- a/src/ctia/http/handler.clj +++ b/src/ctia/http/handler.clj @@ -32,7 +32,7 @@ [ring.middleware.not-modified :refer [wrap-not-modified]] [ring.util.http-response :refer [ok]] [schema.core :as s] - [compojure.api.middleware :refer [->mime-types api-middleware-defaults]] + [compojure.api.middleware :refer [->mime-types api-middleware-defaults-v1]] [ring.middleware.format-response :refer [make-encoder]])) (def api-description @@ -203,7 +203,7 @@ "text/plain")) (def default-formats - (get-in api-middleware-defaults [:format :formats])) + (get-in api-middleware-defaults-v1 [:format :formats])) (defn ->format-options "Options for ring-middleware-format" From 2d1c1470287daca1a4b2e6000ac656e2891f9190 Mon Sep 17 00:00:00 2001 From: Ambrose Bonnaire-Sergeant Date: Mon, 17 Jun 2024 13:40:59 -0500 Subject: [PATCH 6/7] rm --- containers/dev/docker-compose.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/containers/dev/docker-compose.yml b/containers/dev/docker-compose.yml index 3246df422..78536f588 100644 --- a/containers/dev/docker-compose.yml +++ b/containers/dev/docker-compose.yml @@ -55,21 +55,6 @@ services: - ${PWD}/containers/dev/truststore/kafka.truststore.jks:/etc/kafka/secrets/kafka.truststore.jks:ro - ${PWD}/containers/dev/credentials:/etc/kafka/secrets/credentials:ro - /var/run/docker.sock:/var/run/docker.sock - docker-riemann-dev: - image: riemannio/riemann:0.3.5 - ports: - - "5555:5555" - - "5555:5555/udp" - - "5556:5556" - - "5557:5557" # nREPL - environment: - - ELASTICSEARCH_URL=http://localhost:9207 - volumes: - - ./riemann.config:/etc/riemann.config - docker-riemann-dash-dev: - image: include/docker-riemann-dash - ports: - - "4567:4567" aws: image: localstack/localstack:1.0.0 ports: From 2a0c93f943276f63f91f86f7d077cc9f2d3b75f5 Mon Sep 17 00:00:00 2001 From: Ambrose Bonnaire-Sergeant Date: Tue, 18 Jun 2024 11:32:48 -0500 Subject: [PATCH 7/7] disable docker-riemann-dash-dev --- containers/dev/docker-compose.yml | 15 +++++++++++++++ containers/dev/m1-docker-compose.yml | 4 ++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/containers/dev/docker-compose.yml b/containers/dev/docker-compose.yml index 78536f588..6b517bc7e 100644 --- a/containers/dev/docker-compose.yml +++ b/containers/dev/docker-compose.yml @@ -55,6 +55,21 @@ services: - ${PWD}/containers/dev/truststore/kafka.truststore.jks:/etc/kafka/secrets/kafka.truststore.jks:ro - ${PWD}/containers/dev/credentials:/etc/kafka/secrets/credentials:ro - /var/run/docker.sock:/var/run/docker.sock + docker-riemann-dev: + image: riemannio/riemann:0.3.5 + ports: + - "5555:5555" + - "5555:5555/udp" + - "5556:5556" + - "5557:5557" # nREPL + environment: + - ELASTICSEARCH_URL=http://localhost:9207 + volumes: + - ./riemann.config:/etc/riemann.config + #docker-riemann-dash-dev: + # image: include/docker-riemann-dash + # ports: + # - "4567:4567" aws: image: localstack/localstack:1.0.0 ports: diff --git a/containers/dev/m1-docker-compose.yml b/containers/dev/m1-docker-compose.yml index 4ab7227fa..ed8310c39 100644 --- a/containers/dev/m1-docker-compose.yml +++ b/containers/dev/m1-docker-compose.yml @@ -20,5 +20,5 @@ services: args: - RIEMANN_VERSION=0.3.5 - docker-riemann-dash-dev: - build: ./m1-images/riemann-dash + #docker-riemann-dash-dev: + # build: ./m1-images/riemann-dash