Merge branch 'main' into renovate-fix/org.apache.xmlgraphics-batik-co…

…dec-1.x
solita · Nov 4, 2024 · 334418e · 334418e
2 parents 3690dbf + ebd186e
commit 334418e
Show file tree

Hide file tree

Showing 5 changed files with 208 additions and 212 deletions.
diff --git a/.github/workflows/ci-e2e-cypress.yml b/.github/workflows/ci-e2e-cypress.yml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v4
       # Buildx supports GH Actions cache. Build images using it, and load the images to host for docker compose to use
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.6.1
+        uses: docker/setup-buildx-action@v3.7.1
       - name: Build backend
         uses: docker/[email protected]
         with:

diff --git a/.github/workflows/ci-frontend.yml b/.github/workflows/ci-frontend.yml
@@ -114,7 +114,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.6.1
+        uses: docker/setup-buildx-action@v3.7.1
       - name: Build storybook-test-image
         uses: docker/[email protected]
         with:

diff --git a/etp-core/etp-backend/deps.edn b/etp-core/etp-backend/deps.edn
@@ -56,7 +56,7 @@
               :exclusions  [org.apache.xmlgraphics/batik-transcoder
                             org.apache.xmlgraphics/batik-codec
                             org.apache.xmlgraphics/batik-ext]}
-             org.apache.xmlgraphics/batik-transcoder   {:mvn/version "1.17"}
+             org.apache.xmlgraphics/batik-transcoder   {:mvn/version "1.18"}
              org.apache.xmlgraphics/batik-codec        {:mvn/version "1.18"}
              org.apache.xmlgraphics/batik-ext          {:mvn/version "1.18"}
 
@@ -80,7 +80,7 @@
  :aliases   {:dev      {:extra-paths ["src/test/clj"
                                       "src/test/resources"
                                       "src/dev/clj"]
-                        :extra-deps  {integrant/repl                 {:mvn/version "0.3.3"}
+                        :extra-deps  {integrant/repl                 {:mvn/version "0.4.0"}
                                       eftest/eftest                  {:mvn/version "0.6.0"}
                                       prismatic/schema-generators    {:mvn/version "0.1.5"}
                                       ring/ring-mock                 {:mvn/version "0.4.0"}