Skip to content

Commit 16d884c

Browse files
authored
Bump repo to Java 25 (#352)
1 parent 1b1f735 commit 16d884c

9 files changed

Lines changed: 18 additions & 115 deletions

File tree

.github/workflows/deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ jobs:
3434
- name: Checkout Code
3535
uses: actions/checkout@v6
3636

37-
- name: Set up JDK 21
37+
- name: Set up JDK 25
3838
uses: actions/setup-java@v5
3939
with:
40-
java-version: '21'
40+
java-version: '25'
4141
distribution: 'corretto'
4242
cache: maven
4343

.github/workflows/synth.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ jobs:
1515
- name: Checkout Code
1616
uses: actions/checkout@v6
1717

18-
- name: Set up JDK 21
18+
- name: Set up JDK 25
1919
uses: actions/setup-java@v5
2020
with:
21-
java-version: '21'
21+
java-version: '25'
2222
distribution: 'corretto'
2323
cache: maven
2424

@@ -30,4 +30,4 @@ jobs:
3030
echo "CDK Version: $(cdk version)"
3131
3232
- name: Syth Stack
33-
run: cdk synth -c accountId=123456789 east
33+
run: cdk synth -c accountId=123456789 east

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,14 @@ To deploy this project localy via CLI, you need the following tools. if you use
105105
* AWS CLI - [Install AWS CLI](https://docs.aws.amazon.com/cli/latest/userguide/getting-started-install.html)
106106
* AWS SAM CLI - [Install the SAM CLI](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-sam-cli-install.html)
107107
* AWS CDK - [Instal CDK](https://docs.aws.amazon.com/cdk/v2/guide/getting_started.html)
108-
* Java 21 - [Install Java 21](https://docs.aws.amazon.com/corretto/latest/corretto-21-ug/downloads-list.html)
108+
* Java 25 - [Install Java 25](https://docs.aws.amazon.com/corretto/latest/corretto-25-ug/downloads-list.html)
109109
* Maven - [Install Maven](https://maven.apache.org/install.html)
110110

111111
If you have [brew](https://brew.sh) installed (highly recommended) then:
112112
```bash
113113
brew install awscli
114114
brew install aws-cdk
115-
brew install corretto@21
115+
brew install corretto@25
116116
brew install maven
117117

118118
```
@@ -584,4 +584,4 @@ arn:aws:cloudformation:us-east-1:***:stack/chime-sdk-cdk-provision-twilio/d8ad30
584584
585585
(~/java-chime-voice-sdk-cdk) %
586586
587-
```
587+
```

deploy.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ACCOUNT_ID=$(aws sts get-caller-identity --query Account --output text)
1111
if [ "$AWS_EXECUTION_ENV" = "CloudShell" ]; then
1212
echo "CloudShell Detected, installing Java and Maven dependency"
1313
# Install needed tools
14-
sudo yum -y install java-21-amazon-corretto
14+
sudo yum -y install java-25-amazon-corretto
1515
# Ensure we are on latest CDK
1616
sudo npm install -g aws-cdk
1717
# Install 3.9.5 Maven Version which we know works (yum package is too outdated)

destroy.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ACCOUNT_ID=$(aws sts get-caller-identity --query Account --output text)
88
if [ "$AWS_EXECUTION_ENV" = "CloudShell" ]; then
99
echo "CloudShell Detected, installing Java and CDK"
1010
# If you come back later, Java could be removed
11-
sudo yum -y install java-21-amazon-corretto
11+
sudo yum -y install java-25-amazon-corretto
1212
# Ensure we are on latest CDK
1313
sudo npm install -g aws-cdk
1414

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626

2727
<properties>
2828
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
29-
<maven.compiler.release>21</maven.compiler.release>
30-
<maven.compiler.source>21</maven.compiler.source>
31-
<maven.compiler.target>21</maven.compiler.target>
29+
<maven.compiler.release>25</maven.compiler.release>
30+
<maven.compiler.source>25</maven.compiler.source>
31+
<maven.compiler.target>25</maven.compiler.target>
3232
<lombok.version>1.18.44</lombok.version>
3333
</properties>
3434

src/main/java/cloud/cleo/chimesma/cdk/twilio/TwilioBase.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public abstract class TwilioBase extends Function {
4949

5050
builderOptions = BundlingOptions.builder()
5151
.command(packagingInstructions)
52-
.image(JAVA_21.getBundlingImage())
52+
.image(JAVA_25.getBundlingImage())
5353
.user("root")
5454
.outputType(BundlingOutput.ARCHIVED)
5555
.volumes(singletonList(DockerVolume.builder().hostPath(System.getProperty("user.home") + "/.m2/").containerPath("/root/.m2/").build())).build();
@@ -65,7 +65,7 @@ public abstract class TwilioBase extends Function {
6565
protected TwilioBase(Stack scope, Class c, Map<String,? extends Object> props) {
6666
super(scope, c.getSimpleName() + "LAM" + ID_COUNTER.incrementAndGet(), FunctionProps.builder()
6767
.handler(c.getName())
68-
.runtime(JAVA_21)
68+
.runtime(JAVA_25)
6969
.architecture(Architecture.ARM_64)
7070
.description(c.getSimpleName() + " Provisioning Lambda")
7171
.timeout(Duration.seconds(30))

twilio/dependency-reduced-pom.xml

Lines changed: 0 additions & 97 deletions
This file was deleted.

twilio/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626

2727
<properties>
2828
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
29-
<maven.compiler.release>21</maven.compiler.release>
30-
<maven.compiler.source>21</maven.compiler.source>
31-
<maven.compiler.target>21</maven.compiler.target>
29+
<maven.compiler.release>25</maven.compiler.release>
30+
<maven.compiler.source>25</maven.compiler.source>
31+
<maven.compiler.target>25</maven.compiler.target>
3232
<lombok.version>1.18.44</lombok.version>
3333
</properties>
3434

0 commit comments

Comments
 (0)