Skip to content

Commit d8f6e26

Browse files
committed
CHG set jvm version to 21
1 parent 47a0cdc commit d8f6e26

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

.github/workflows/maven.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313

1414
steps:
1515
- uses: actions/checkout@v4
16-
- name: Set up JDK 17
16+
- name: Set up JDK 21
1717
uses: actions/setup-java@v4
1818
with:
19-
java-version: '17'
19+
java-version: '21'
2020
distribution: 'temurin'
2121
cache: maven
2222
- name: Build with Maven
@@ -31,10 +31,10 @@ jobs:
3131

3232
steps:
3333
- uses: actions/checkout@v4
34-
- name: Set up JDK 17
34+
- name: Set up JDK 21
3535
uses: actions/setup-java@v4
3636
with:
37-
java-version: '17'
37+
java-version: '21'
3838
distribution: 'temurin'
3939
cache: maven
4040
- name: Start Confluence

pom.xml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<maven.javadoc.skip>true</maven.javadoc.skip>
2727
<allow.google.tracking>false</allow.google.tracking>
2828
<kotlin.version>2.1.20</kotlin.version>
29+
<kotlin.compiler.jvmTarget>21</kotlin.compiler.jvmTarget>
2930
</properties>
3031

3132

@@ -112,6 +113,11 @@
112113
<artifactId>atlassian-plugins-osgi-javaconfig</artifactId>
113114
<version>0.6.0</version>
114115
</dependency>
116+
<dependency>
117+
<groupId>org.jetbrains.kotlin</groupId>
118+
<artifactId>kotlin-stdlib-jdk8</artifactId>
119+
<version>${kotlin.version}</version>
120+
</dependency>
115121

116122
<!-- WIRED TEST RUNNER DEPENDENCIES -->
117123
<dependency>
@@ -132,11 +138,6 @@
132138
<version>2.0.17</version>
133139
<scope>test</scope>
134140
</dependency>
135-
<dependency>
136-
<groupId>org.jetbrains.kotlin</groupId>
137-
<artifactId>kotlin-stdlib-jdk8</artifactId>
138-
<version>${kotlin.version}</version>
139-
</dependency>
140141
<dependency>
141142
<groupId>org.jetbrains.kotlin</groupId>
142143
<artifactId>kotlin-test</artifactId>

0 commit comments

Comments
 (0)