Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/maven/apps/backend/commons-io-com…
Browse files Browse the repository at this point in the history
…mons-io-2.15.0
  • Loading branch information
RoyGrini authored Nov 28, 2023
2 parents b954189 + c1a3897 commit e85ea4a
Show file tree
Hide file tree
Showing 23 changed files with 761 additions and 968 deletions.
82 changes: 0 additions & 82 deletions .github/workflows/deploy-ingress-redirect.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
nodejs 18.8.0
nodejs 20.9.0
java adoptopenjdk-17.0.4+101
12 changes: 6 additions & 6 deletions apps/backend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@
<lucene.version>9.8.0</lucene.version>
<shedlock.version>5.9.1</shedlock.version>
<commons-collections4.version>4.4</commons-collections4.version>
<microsoft-graph.version>5.75.0</microsoft-graph.version>
<msal4j.version>1.13.10</msal4j.version>
<microsoft-graph.version>5.77.0</microsoft-graph.version>
<msal4j.version>1.14.0</msal4j.version>
<postgresql.version>42.6.0</postgresql.version>

<!-- transitive versions -->
<checker-qual.version>3.37.0</checker-qual.version>
<checker-qual.version>3.40.0</checker-qual.version>
<commons-compress.version>1.24.0</commons-compress.version>
<commons-io.version>2.15.0</commons-io.version>
<guava.version>32.1.2-jre</guava.version>
<guava.version>32.1.3-jre</guava.version>
<jna.version>5.13.0</jna.version>
<jetbrains.annotation.version>24.0.1</jetbrains.annotation.version>
<stax2-api.version>4.2.2</stax2-api.version>
Expand All @@ -45,10 +45,10 @@
<avro.version>1.11.3</avro.version> <!-- https://github.com/navikt/team-catalog/security/dependabot/109 -->

<!-- Test -->
<testcontainers.version>1.19.1</testcontainers.version>
<testcontainers.version>1.19.2</testcontainers.version>
<wiremock.version>3.2.0</wiremock.version>
<scala.version>2.13.12</scala.version>
<graphql-codegen.version>5.8.0</graphql-codegen.version>
<graphql-codegen.version>5.9.0</graphql-codegen.version>

<!-- maven plugin -->
<maven.dependency.plugin-version>3.6.1</maven.dependency.plugin-version>
Expand Down
2 changes: 1 addition & 1 deletion apps/frackend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/distroless/nodejs18-debian11:nonroot
FROM gcr.io/distroless/nodejs20-debian12:nonroot
COPY . /app

WORKDIR /app
Expand Down
Loading

0 comments on commit e85ea4a

Please sign in to comment.