Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .github/workflows/deploy-inventory-service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Set up Java 21 for x64
- name: Set up Java 25 for x64
uses: actions/setup-java@v4
with:
java-version: "21"
java-version: "25"
distribution: "corretto"
architecture: x64
- name: Configure AWS credentials
Expand Down Expand Up @@ -76,10 +76,10 @@ jobs:
uses: actions/checkout@v4
- name: Setup Terraform
uses: hashicorp/setup-terraform@v2
- name: Set up Java 21 for x64
- name: Set up Java 25 for x64
uses: actions/setup-java@v4
with:
java-version: "21"
java-version: "25"
distribution: "corretto"
architecture: x64
- name: Configure AWS credentials
Expand Down Expand Up @@ -199,10 +199,10 @@ jobs:
- name: Install CDK
run: |
npm install -g aws-cdk
- name: Set up Java 21 for x64
- name: Set up Java 25 for x64
uses: actions/setup-java@v4
with:
java-version: "21"
java-version: "25"
distribution: "corretto"
architecture: x64
- name: Configure AWS credentials
Expand Down Expand Up @@ -307,10 +307,10 @@ jobs:
- name: Install CDK
run: |
npm install -g aws-cdk
- name: Set up Java 21 for x64
- name: Set up Java 25 for x64
uses: actions/setup-java@v4
with:
java-version: "21"
java-version: "25"
distribution: "corretto"
architecture: x64
- name: Configure AWS credentials
Expand Down Expand Up @@ -368,10 +368,10 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: "22"
- name: Set up Java 21 for x64
- name: Set up Java 25 for x64
uses: actions/setup-java@v4
with:
java-version: "21"
java-version: "25"
distribution: "corretto"
architecture: x64
- uses: aws-actions/setup-sam@v1
Expand Down
4 changes: 2 additions & 2 deletions src/inventory-service/cdk/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<cdk.version>2.199.0</cdk.version>
<cdk.version>2.229.0</cdk.version>
<constructs.version>[10.0.0,11.0.0)</constructs.version>
<junit.version>5.13.0</junit.version>
<junit.version>6.0.1</junit.version>
</properties>

<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public InstrumentedFunction(@NotNull Construct scope, @NotNull String id, @NotNu

List<ILayerVersion> layers = new ArrayList<>(2);
layers.add(LayerVersion.fromLayerVersionArn(this, "DatadogJavaLayer", String.format("arn:aws:lambda:%s:464622532012:layer:dd-trace-java:24",System.getenv("AWS_REGION"))));
layers.add(LayerVersion.fromLayerVersionArn(this, "DatadogLambdaExtension", String.format("arn:aws:lambda:%s:464622532012:layer:Datadog-Extension:85", System.getenv("AWS_REGION"))));
layers.add(LayerVersion.fromLayerVersionArn(this, "DatadogLambdaExtension", String.format("arn:aws:lambda:%s:464622532012:layer:Datadog-Extension:90", System.getenv("AWS_REGION"))));


Asset fileAsset = Asset.Builder.create(this, String.format("%sS3Asset", props.routingExpression()))
Expand All @@ -60,7 +60,7 @@ public InstrumentedFunction(@NotNull Construct scope, @NotNull String id, @NotNu

var builder = Function.Builder.create(this, props.routingExpression())
.functionName(String.format("%s-%s-%s", props.packageName().replace(".", ""), props.routingExpression(), props.sharedProps().env()))
.runtime(Runtime.JAVA_21)
.runtime(Runtime.JAVA_25)
.memorySize(2048)
.environment(lambdaEnvironment)
.timeout(Duration.seconds(30))
Expand Down
4 changes: 2 additions & 2 deletions src/inventory-service/infra/modules/lambda-function/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ module "aws_lambda_function" {
function_name = "TF-${var.service_name}-${var.function_name}-${var.env}"
role = aws_iam_role.lambda_function_role.arn
handler = var.lambda_handler
runtime = "java21"
runtime = "java25"
memory_size = var.memory_size
logging_config_log_group = aws_cloudwatch_log_group.lambda_log_group.name
source_code_hash = base64sha256(filebase64(var.jar_file))
Expand All @@ -124,7 +124,7 @@ module "aws_lambda_function" {
var.environment_variables
)

datadog_extension_layer_version = 85
datadog_extension_layer_version = 90
datadog_java_layer_version = 24
}

Expand Down
18 changes: 9 additions & 9 deletions src/inventory-service/inventory-acl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<wrapper.version>1.0.29.RELEASE</wrapper.version>
<aws-lambda-events.version>3.16.0</aws-lambda-events.version>
<aws-lambda-events.version>3.16.1</aws-lambda-events.version>
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
<quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
<quarkus.platform.version>3.29.0</quarkus.platform.version>
<quarkus.platform.version>3.29.4</quarkus.platform.version>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<maven.compiler.release>21</maven.compiler.release>
<skipITs>true</skipITs>
<surefire-plugin.version>3.5.3</surefire-plugin.version>
<surefire-plugin.version>3.5.4</surefire-plugin.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -79,7 +79,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.19.1</version>
<version>2.20.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand All @@ -89,7 +89,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.19.0</version>
<version>2.20.1</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand All @@ -100,7 +100,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.5.18</version>
<version>1.5.21</version>
</dependency>

<dependency>
Expand All @@ -126,12 +126,12 @@
<dependency>
<groupId>com.datadoghq</groupId>
<artifactId>dd-trace-api</artifactId>
<version>1.49.0</version>
<version>1.56.0</version>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-api</artifactId>
<version>1.52.0</version>
<version>1.56.0</version>
</dependency>
</dependencies>

Expand All @@ -140,7 +140,7 @@
<plugin>
<groupId>io.smallrye</groupId>
<artifactId>jandex-maven-plugin</artifactId>
<version>3.1.8</version>
<version>3.5.2</version>
<executions>
<execution>
<id>make-index</id>
Expand Down
19 changes: 7 additions & 12 deletions src/inventory-service/inventory-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
<quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
<quarkus.platform.version>3.29.0</quarkus.platform.version>
<quarkus.platform.version>3.29.4</quarkus.platform.version>
<skipITs>true</skipITs>
<surefire-plugin.version>3.5.3</surefire-plugin.version>
<surefire-plugin.version>3.5.4</surefire-plugin.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -45,11 +45,6 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-arc</artifactId>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-core</artifactId>
<version>4.5.12</version>
</dependency>
<dependency>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-api</artifactId>
Expand All @@ -63,12 +58,12 @@
<dependency>
<groupId>com.datadoghq</groupId>
<artifactId>dd-trace-api</artifactId>
<version>1.49.0</version>
<version>1.56.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.19.1</version>
<version>2.20.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand All @@ -78,7 +73,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.19.0</version>
<version>2.20.1</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
Expand Down Expand Up @@ -106,7 +101,7 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<version>1.21.1</version>
<version>2.0.2</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -127,7 +122,7 @@
<plugin>
<groupId>io.smallrye</groupId>
<artifactId>jandex-maven-plugin</artifactId>
<version>3.1.8</version>
<version>3.5.2</version>
<executions>
<execution>
<id>make-index</id>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM amazoncorretto:21
FROM amazoncorretto:25

RUN curl -Lo dd-java-agent.jar https://dtdg.co/latest-java-tracer

Expand Down
29 changes: 12 additions & 17 deletions src/inventory-service/inventory-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
<quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
<quarkus.platform.version>3.29.0</quarkus.platform.version>
<aws.sdk.version>2.38.1</aws.sdk.version>
<quarkus.platform.version>3.29.4</quarkus.platform.version>
<aws.sdk.version>2.39.2</aws.sdk.version>
<skipITs>true</skipITs>
<surefire-plugin.version>3.5.3</surefire-plugin.version>
<surefire-plugin.version>3.5.4</surefire-plugin.version>
</properties>

<dependencyManagement>
Expand All @@ -43,11 +43,6 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-arc</artifactId>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-core</artifactId>
<version>4.5.12</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>aws-crt-client</artifactId>
Expand Down Expand Up @@ -86,22 +81,22 @@
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-api</artifactId>
<version>1.52.0</version>
<version>1.56.0</version>
</dependency>
<dependency>
<groupId>com.datadoghq</groupId>
<artifactId>dd-trace-api</artifactId>
<version>1.49.0</version>
<version>1.56.0</version>
</dependency>
<dependency>
<groupId>com.datadoghq</groupId>
<artifactId>dd-trace-ot</artifactId>
<version>1.49.0</version>
<version>1.56.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.19.1</version>
<version>2.20.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand All @@ -111,7 +106,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.19.0</version>
<version>2.20.1</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
Expand All @@ -125,7 +120,7 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<version>1.21.1</version>
<version>2.0.2</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -142,7 +137,7 @@
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<version>3.0.5</version> <!-- Use the latest version -->
<version>4.0.0</version> <!-- Use the latest version -->
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
Expand All @@ -159,7 +154,7 @@
<plugin>
<groupId>io.smallrye</groupId>
<artifactId>jandex-maven-plugin</artifactId>
<version>3.1.8</version>
<version>3.5.2</version>
<executions>
<execution>
<id>make-index</id>
Expand Down Expand Up @@ -224,7 +219,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.10.0</version>
<version>2.20.1</version>
</plugin>
</plugins>
</build>
Expand Down
Loading