Skip to content

Commit f8f16e5

Browse files
authored
Merge branch 'main' into dependabot/maven/aws-serverless-jersey-archetype/org.apache.maven.plugins-maven-archetype-plugin-3.4.0
2 parents 7d1b723 + 177f9db commit f8f16e5

File tree

13 files changed

+21
-21
lines changed

13 files changed

+21
-21
lines changed

aws-serverless-java-container-spring/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</parent>
1717

1818
<properties>
19-
<spring.version>6.2.6</spring.version>
19+
<spring.version>6.2.8</spring.version>
2020
<spring-security.version>6.4.5</spring-security.version>
2121
</properties>
2222

aws-serverless-java-container-springboot3/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<version>2.1.4-SNAPSHOT</version>
1616

1717
<properties>
18-
<spring.version>6.2.6</spring.version>
18+
<spring.version>6.2.8</spring.version>
1919
<springboot.version>3.4.5</springboot.version>
2020
<springsecurity.version>6.4.5</springsecurity.version>
2121
</properties>

aws-serverless-jersey-archetype/src/main/resources/archetype-resources/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ repositories {
88
dependencies {
99
implementation (
1010
'com.amazonaws.serverless:aws-serverless-java-container-jersey:[2.0-SNAPSHOT,)',
11-
'com.fasterxml.jackson.core:jackson-databind:2.18.3',
11+
'com.fasterxml.jackson.core:jackson-databind:2.19.1',
1212
)
1313

1414
implementation("org.glassfish.jersey.media:jersey-media-json-jackson:3.1.10") {
@@ -22,8 +22,8 @@ dependencies {
2222
}
2323

2424
testImplementation("com.amazonaws.serverless:aws-serverless-java-container-core:[2.0-SNAPSHOT,):tests")
25-
testImplementation("org.apache.httpcomponents.client5:httpclient5:5.4.3")
26-
testImplementation(platform("org.junit:junit-bom:5.12.1"))
25+
testImplementation("org.apache.httpcomponents.client5:httpclient5:5.5")
26+
testImplementation(platform("org.junit:junit-bom:5.13.1"))
2727
testImplementation("org.junit.jupiter:junit-jupiter")
2828
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
2929
}

aws-serverless-spring-archetype/src/main/resources/archetype-resources/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ repositories {
77

88
dependencies {
99
implementation (
10-
'org.springframework:spring-webmvc:6.2.6',
11-
'org.springframework:spring-context:6.2.6',
10+
'org.springframework:spring-webmvc:6.2.8',
11+
'org.springframework:spring-context:6.2.8',
1212
'com.amazonaws.serverless:aws-serverless-java-container-spring:[2.0-SNAPSHOT,)',
1313
'org.apache.logging.log4j:log4j-core:2.24.3',
1414
'org.apache.logging.log4j:log4j-api:2.24.3',
1515
'org.apache.logging.log4j:log4j-slf4j-impl:2.24.3',
16-
'com.fasterxml.jackson.core:jackson-databind:2.18.3',
16+
'com.fasterxml.jackson.core:jackson-databind:2.19.1',
1717
'com.amazonaws:aws-lambda-java-log4j2:1.6.0',
1818
)
1919

2020
testImplementation("com.amazonaws.serverless:aws-serverless-java-container-core:[2.0-SNAPSHOT,):tests")
21-
testImplementation("org.apache.httpcomponents.client5:httpclient5:5.4.3")
21+
testImplementation("org.apache.httpcomponents.client5:httpclient5:5.5")
2222
testImplementation(platform("org.junit:junit-bom:5.12.2"))
2323
testImplementation("org.junit.jupiter:junit-jupiter")
2424
testRuntimeOnly("org.junit.platform:junit-platform-launcher")

aws-serverless-springboot3-archetype/src/main/resources/archetype-resources/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dependencies {
1414
)
1515

1616
testImplementation("com.amazonaws.serverless:aws-serverless-java-container-core:[2.0-SNAPSHOT,):tests")
17-
testImplementation("org.apache.httpcomponents.client5:httpclient5:5.4.3")
17+
testImplementation("org.apache.httpcomponents.client5:httpclient5:5.5")
1818
testImplementation(platform("org.junit:junit-bom:5.12.1"))
1919
testImplementation("org.junit.jupiter:junit-jupiter")
2020
testRuntimeOnly("org.junit.platform:junit-platform-launcher")

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
<properties>
7979
<jacoco.minCoverage>0.7</jacoco.minCoverage>
8080
<dependencyCheck.version>12.1.1</dependencyCheck.version>
81-
<jackson.version>2.18.3</jackson.version>
81+
<jackson.version>2.19.1</jackson.version>
8282
<slf4j.version>2.0.17</slf4j.version>
8383
<junit.version>5.12.2</junit.version>
8484
<mockito.version>5.17.0</mockito.version>
@@ -119,7 +119,7 @@
119119
<dependency>
120120
<groupId>org.apache.httpcomponents.client5</groupId>
121121
<artifactId>httpclient5</artifactId>
122-
<version>5.4.3</version>
122+
<version>5.5</version>
123123
<scope>test</scope>
124124
</dependency>
125125

samples/jersey/pet-store/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ repositories {
88
dependencies {
99
implementation (
1010
'com.amazonaws.serverless:aws-serverless-java-container-jersey:[2.0-SNAPSHOT,)',
11-
'com.fasterxml.jackson.core:jackson-databind:2.18.3',
11+
'com.fasterxml.jackson.core:jackson-databind:2.19.1',
1212
)
1313

1414
implementation("org.glassfish.jersey.media:jersey-media-json-jackson:3.1.10") {

samples/jersey/pet-store/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<maven.compiler.source>1.8</maven.compiler.source>
2828
<maven.compiler.target>1.8</maven.compiler.target>
2929
<jersey.version>3.1.10</jersey.version>
30-
<jackson.version>2.18.3</jackson.version>
30+
<jackson.version>2.19.1</jackson.version>
3131
</properties>
3232

3333
<dependencies>

samples/spring/pet-store/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ repositories {
77

88
dependencies {
99
implementation (
10-
'org.springframework:spring-webmvc:6.2.6',
11-
'org.springframework:spring-context:6.2.6',
10+
'org.springframework:spring-webmvc:6.2.8',
11+
'org.springframework:spring-context:6.2.8',
1212
'com.amazonaws.serverless:aws-serverless-java-container-spring:[2.0-SNAPSHOT,)',
1313
'org.apache.logging.log4j:log4j-core:2.24.3',
1414
'org.apache.logging.log4j:log4j-api:2.24.3',
1515
'org.apache.logging.log4j:log4j-slf4j-impl:2.24.3',
16-
'com.fasterxml.jackson.core:jackson-databind:2.18.3',
16+
'com.fasterxml.jackson.core:jackson-databind:2.19.1',
1717
'com.amazonaws:aws-lambda-java-log4j2:1.6.0',
1818
)
1919
}

samples/spring/pet-store/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</licenses>
2525

2626
<properties>
27-
<spring.version>6.2.6</spring.version>
27+
<spring.version>6.2.8</spring.version>
2828
<log4j.version>2.24.3</log4j.version>
2929
<maven.compiler.source>17</maven.compiler.source>
3030
<maven.compiler.target>17</maven.compiler.target>

samples/springboot3/alt-pet-store/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>org.springframework.boot</groupId>
1515
<artifactId>spring-boot-starter-parent</artifactId>
16-
<version>3.4.5</version>
16+
<version>3.5.0</version>
1717
</parent>
1818

1919
<licenses>

samples/springboot3/graphql-pet-store/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>org.springframework.boot</groupId>
1515
<artifactId>spring-boot-starter-parent</artifactId>
16-
<version>3.4.5</version>
16+
<version>3.5.0</version>
1717
</parent>
1818

1919
<licenses>

samples/springboot3/pet-store/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>org.springframework.boot</groupId>
1515
<artifactId>spring-boot-starter-parent</artifactId>
16-
<version>3.4.5</version>
16+
<version>3.5.0</version>
1717
</parent>
1818

1919
<licenses>

0 commit comments

Comments
 (0)