Merge branch 'main' into secops/202401/semgrep

apollographql · Jan 24, 2024 · 960521f · 960521f
2 parents ed2117f + 239898c
commit 960521f
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 12 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,7 +1,7 @@
 version: 2.1
 
 orbs:
-  secops: apollo/[email protected].6
+  secops: apollo/[email protected].7
 
 workflows:
   security-scans:

diff --git a/client/defer/apollo-client/package.json b/client/defer/apollo-client/package.json
@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@apollo/client": "3.8.9",
+    "@apollo/client": "3.8.10",
     "@testing-library/jest-dom": "5.17.0",
     "@testing-library/react": "13.4.0",
     "@testing-library/user-event": "14.5.2",

diff --git a/misc/local/docker-compose.router-no-code.yaml b/misc/local/docker-compose.router-no-code.yaml
@@ -7,7 +7,7 @@ version: '3.9'
 services:
   apollo-router:
     container_name: apollo-router
-    image: ghcr.io/apollographql/router:v1.37.0
+    image: ghcr.io/apollographql/router:v1.38.0
     volumes:
       - ./supergraph/schema/docker.graphql:/dist/schema/supergraph.graphql
       - ./supergraph/router.yaml:/dist/config/router.yaml

diff --git a/misc/local/docker-compose.router-no-otel.yaml b/misc/local/docker-compose.router-no-otel.yaml
@@ -7,7 +7,7 @@ version: '3.9'
 services:
   apollo-router:
     container_name: apollo-router
-    image: ghcr.io/apollographql/router:v1.37.0
+    image: ghcr.io/apollographql/router:v1.38.0
     volumes:
       - ./supergraph/schema/docker.graphql:/dist/schema/supergraph.graphql
     command: [ "--dev", "-s", "schema/supergraph.graphql", "--log", "info" ]

diff --git a/misc/studio/docker-compose.router-no-code.yaml b/misc/studio/docker-compose.router-no-code.yaml
@@ -7,7 +7,7 @@ version: '3.9'
 services:
   apollo-router:
     container_name: apollo-router
-    image: ghcr.io/apollographql/router:v1.37.0
+    image: ghcr.io/apollographql/router:v1.38.0
     volumes:
       - ./supergraph/router.yaml:/dist/config/router.yaml
     command: [ "--dev", "-c", "config/router.yaml", "--log", "info" ]

diff --git a/opentelemetry/docker-compose.otel.yaml b/opentelemetry/docker-compose.otel.yaml
@@ -51,7 +51,7 @@ services:
 
   prometheus:
     container_name: prometheus
-    image: prom/prometheus:v2.48.1
+    image: prom/prometheus:v2.49.1
     volumes:
       - ./opentelemetry/prometheus.yml:/etc/prometheus/prometheus.yml
     ports:

diff --git a/subgraphs/inventory/app/build.gradle.kts b/subgraphs/inventory/app/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-  id("org.springframework.boot") version "3.2.1"
+  id("org.springframework.boot") version "3.2.2"
   id("org.jetbrains.kotlin.jvm") version "1.9.22"
   id("org.jetbrains.kotlin.plugin.spring") version "1.9.22"
 }
@@ -12,7 +12,7 @@ repositories {
 java.sourceCompatibility = JavaVersion.VERSION_17
 
 dependencies {
-  implementation(platform("org.springframework.boot:spring-boot-dependencies:3.2.1"))
+  implementation(platform("org.springframework.boot:spring-boot-dependencies:3.2.2"))
   implementation("com.apollographql.federation:federation-graphql-java-support:4.3.0")
   implementation("org.jetbrains.kotlin:kotlin-reflect")
   implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")

diff --git a/subgraphs/products/package.json b/subgraphs/products/package.json
@@ -7,7 +7,7 @@
     "start": "node products.js"
   },
   "dependencies": {
-    "@apollo/subgraph": "2.6.2",
+    "@apollo/subgraph": "2.7.0",
     "apollo-server": "3.13.0",
     "supergraph-demo-opentelemetry": "0.2.4",
     "graphql": "16.8.1"

diff --git a/subgraphs/users/package.json b/subgraphs/users/package.json
@@ -7,7 +7,7 @@
     "start": "node users.js"
   },
   "dependencies": {
-    "@apollo/subgraph": "2.6.2",
+    "@apollo/subgraph": "2.7.0",
     "apollo-server": "3.13.0",
     "supergraph-demo-opentelemetry": "0.2.4",
     "graphql": "16.8.1"

diff --git a/supergraph/gateway/package.json b/supergraph/gateway/package.json
@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "@apollo/server": "4.10.0",
-    "@apollo/gateway": "2.6.2",
+    "@apollo/gateway": "2.7.0",
     "supergraph-demo-opentelemetry": "0.2.4",
     "graphql": "16.8.1"
   },

diff --git a/supergraph/router-rust-plugin/Cargo.toml b/supergraph/router-rust-plugin/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 anyhow = "1.0.79"
-apollo-router = "1.37.0"
+apollo-router = "1.38.0"
 async-trait = "0.1.77"
 futures = "0.3.30"
 http = "0.2.11"