Skip to content

Commit 1a2e331

Browse files
committed
Merge remote-tracking branch 'origin/master' into RBT-928-pass-through-jakarta-annotations-try-2
# Conflicts: # graphql-builder/pom.xml
2 parents aa6b1cb + 0e2f365 commit 1a2e331

File tree

6 files changed

+11
-11
lines changed
  • graphql-builder
  • graphql-database-dynmodb-history-lambda
  • graphql-database-manager-core
  • graphql-database-manager-dynamo
  • graphql-database-manager-memory
  • graphql-database-manager-test

6 files changed

+11
-11
lines changed

graphql-builder/pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525

2626
<artifactId>graphql-builder</artifactId>
2727

28-
<properties>
29-
<junit.jupiter.version>5.12.2</junit.jupiter.version>
30-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
31-
<jackson.version>2.19.0</jackson.version>
32-
<graphql.version>22.0</graphql.version>
33-
</properties>
28+
<properties>
29+
<junit.jupiter.version>5.13.0</junit.jupiter.version>
30+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
31+
<jackson.version>2.19.0</jackson.version>
32+
<graphql.version>24.1</graphql.version>
33+
</properties>
3434

3535
<licenses>
3636
<license>

graphql-database-dynmodb-history-lambda/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<dependency>
6565
<groupId>com.amazonaws</groupId>
6666
<artifactId>aws-lambda-java-core</artifactId>
67-
<version>1.2.3</version>
67+
<version>1.3.0</version>
6868
</dependency>
6969
</dependencies>
7070

graphql-database-manager-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<artifactId>graphql-database-manager-core</artifactId>
2525

2626
<properties>
27-
<junit.jupiter.version>5.12.2</junit.jupiter.version>
27+
<junit.jupiter.version>5.13.0</junit.jupiter.version>
2828
</properties>
2929

3030

graphql-database-manager-dynamo/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<artifactId>graphql-database-manager-dynamo</artifactId>
2525

2626
<properties>
27-
<junit.jupiter.version>5.12.2</junit.jupiter.version>
27+
<junit.jupiter.version>5.13.0</junit.jupiter.version>
2828
</properties>
2929

3030
<licenses>

graphql-database-manager-memory/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<artifactId>graphql-database-manager-memory</artifactId>
2727

2828
<properties>
29-
<junit.jupiter.version>5.12.2</junit.jupiter.version>
29+
<junit.jupiter.version>5.13.0</junit.jupiter.version>
3030
</properties>
3131

3232

graphql-database-manager-test/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<artifactId>graphql-database-manager-test</artifactId>
2525

2626
<properties>
27-
<junit.jupiter.version>5.12.2</junit.jupiter.version>
27+
<junit.jupiter.version>5.13.0</junit.jupiter.version>
2828
</properties>
2929

3030
<dependencies>

0 commit comments

Comments
 (0)