diff --git a/containers/dev/docker-compose.yml b/containers/dev/docker-compose.yml index 3246df4228..6b517bc7e6 100644 --- a/containers/dev/docker-compose.yml +++ b/containers/dev/docker-compose.yml @@ -66,10 +66,10 @@ services: - ELASTICSEARCH_URL=http://localhost:9207 volumes: - ./riemann.config:/etc/riemann.config - docker-riemann-dash-dev: - image: include/docker-riemann-dash - ports: - - "4567:4567" + #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 4ab7227fab..ed8310c398 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 diff --git a/dependabot/dependency-tree.txt b/dependabot/dependency-tree.txt index b76f688789..93ea8f2411 100644 --- a/dependabot/dependency-tree.txt +++ b/dependabot/dependency-tree.txt @@ -37,7 +37,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 @@ -64,10 +64,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 @@ -82,16 +79,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 @@ -141,7 +141,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 @@ -246,11 +246,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.15.2:compile -+- com.fasterxml.jackson.dataformat:jackson-dataformat-smile:jar:2.15.2:compile -+- com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:jar:2.15.2:compile -+- com.fasterxml.jackson.core:jackson-databind:jar:2.15.2:compile -| \- com.fasterxml.jackson.core:jackson-annotations:jar:2.15.2: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 d865762450..c050266dfe 100644 --- a/dependabot/pom.xml +++ b/dependabot/pom.xml @@ -363,7 +363,7 @@ prismatic plumbing - 0.5.5 + 0.6.0 slf4j-nop @@ -593,7 +593,7 @@ metosin compojure-api - 1.1.13 + 1.1.15-20240617.154912-16 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.15.2 + 2.17.0 slf4j-nop @@ -1536,7 +1536,7 @@ com.fasterxml.jackson.dataformat jackson-dataformat-smile - 2.15.2 + 2.17.0 slf4j-nop @@ -1559,7 +1559,7 @@ com.fasterxml.jackson.dataformat jackson-dataformat-cbor - 2.15.2 + 2.17.0 slf4j-nop @@ -1582,7 +1582,7 @@ com.fasterxml.jackson.core jackson-databind - 2.15.2 + 2.17.0 slf4j-nop diff --git a/project.clj b/project.clj index 32aa118e1d..f25688010a 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.3") -(def jackson-version "2.15.2") -(def jackson-databind-version "2.15.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 @@ -95,7 +95,7 @@ [com.arohner/uri "0.1.2"] ;; Web server - [metosin/compojure-api "1.1.13" ] + [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 diff --git a/src/ctia/http/handler.clj b/src/ctia/http/handler.clj index f8cd82852d..c02b2e2061 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"