Skip to content

Commit bd8f5b0

Browse files
oharstaoharsta
authored
Merge pull request #70 from SURFnet/feature/jdk21
Feature/jdk21
2 parents 77dffd3 + 03afe16 commit bd8f5b0

File tree

8 files changed

+70
-27
lines changed

8 files changed

+70
-27
lines changed

‎.github/workflows/build.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@ jobs:
1212
build:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v3
16-
- name: Set up JDK 1.8
17-
uses: actions/setup-java@v1
15+
- uses: actions/checkout@v4
16+
- name: Set up JDK 21
17+
uses: actions/setup-java@v4
1818
with:
19-
java-version: 1.8
19+
distribution: 'temurin' # See 'Supported distributions' for available options
20+
java-version: '21'
2021
- name: Set up MySQL
2122
uses: shogo82148/actions-setup-mysql@v1
2223
with:

‎.github/workflows/release.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121
- name: Check out code
2222
uses: actions/checkout@v4
2323

24-
- name: Set up JDK 1.8
24+
- name: Set up JDK 21
2525
uses: actions/setup-java@v4
2626
with:
27-
java-version: 8
27+
java-version: 21
2828
distribution: "temurin"
2929

3030
- name: Determine the version
@@ -43,21 +43,21 @@ jobs:
4343
exit 1
4444
if: github.event_name != 'workflow_dispatch' && steps.versioncheck.outputs.version != github.ref_name
4545

46-
- name: Set up JDK 1.8 for snapshots
46+
- name: Set up JDK 21 for snapshots
4747
uses: actions/setup-java@v4
4848
with:
49-
java-version: 8
49+
java-version: 21
5050
distribution: "temurin"
5151
cache: "maven"
5252
server-id: openconext-snapshots
5353
server-username: MAVEN_USERNAME
5454
server-password: MAVEN_PASSWORD
5555
if: ( endsWith(steps.versioncheck.outputs.version, '-SNAPSHOT'))
5656

57-
- name: Set up JDK 1.8
57+
- name: Set up JDK 21
5858
uses: actions/setup-java@v4
5959
with:
60-
java-version: 8
60+
java-version: 21
6161
distribution: "temurin"
6262
cache: "maven"
6363
server-id: openconext-releases

‎client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
},
4040
"dependencies": {
4141
"@lottiefiles/svelte-lottie-player": "^0.1.4",
42-
"dompurify": "^2.4.0",
42+
"dompurify": "^3.1.7",
4343
"i18n-js": "^3.3.0",
4444
"isomorphic-fetch": "^3.0.0",
4545
"js-cookie": "^2.2.1",

‎client/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.surfnet</groupId>
66
<artifactId>student-mobility-broker</artifactId>
7-
<version>0.2.14</version>
7+
<version>0.3.0-SNAPSHOT</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<artifactId>student-mobility-broker-client</artifactId>
@@ -15,7 +15,7 @@
1515
<plugin>
1616
<groupId>org.codehaus.mojo</groupId>
1717
<artifactId>exec-maven-plugin</artifactId>
18-
<version>1.4.0</version>
18+
<version>3.1.0</version>
1919
<executions>
2020
<execution>
2121
<goals>

‎client/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2923,10 +2923,10 @@ domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.1:
29232923
dependencies:
29242924
domelementtype "^2.2.0"
29252925

2926-
dompurify@^2.4.0:
2927-
version "2.4.1"
2928-
resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.4.1.tgz#f9cb1a275fde9af6f2d0a2644ef648dd6847b631"
2929-
integrity sha512-ewwFzHzrrneRjxzmK6oVz/rZn9VWspGFRDb4/rRtIsM1n36t9AKma/ye8syCpcw+XJ25kOK/hOG7t1j2I2yBqA==
2926+
dompurify@^3.1.7:
2927+
version "3.1.7"
2928+
resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.1.7.tgz#711a8c96479fb6ced93453732c160c3c72418a6a"
2929+
integrity sha512-VaTstWtsneJY8xzy7DekmYWEOZcmzIe3Qb3zPd4STve1OBTa+e+WmS1ITQec1fZYXI3HCsOZZiSMpG6oxoWMWQ==
29302930

29312931
domutils@^2.5.2, domutils@^2.8.0:
29322932
version "2.8.0"

‎pom.xml

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>org.surfnet</groupId>
55
<artifactId>student-mobility-broker</artifactId>
6-
<version>0.2.14</version>
6+
<version>0.3.0-SNAPSHOT</version>
77
<name>student-mobility-broker</name>
88
<description>student-mobility-broker-app</description>
99
<packaging>pom</packaging>
1010
<parent>
1111
<groupId>org.springframework.boot</groupId>
1212
<artifactId>spring-boot-starter-parent</artifactId>
13-
<version>2.7.6</version>
13+
<version>2.7.16</version>
1414
<relativePath/>
1515
<!-- lookup parent from repository -->
1616
</parent>
@@ -23,14 +23,22 @@
2323
<extension>
2424
<groupId>org.apache.maven.wagon</groupId>
2525
<artifactId>wagon-webdav-jackrabbit</artifactId>
26-
<version>3.4.1</version>
26+
<version>3.5.3</version>
2727
</extension>
2828
</extensions>
2929
<plugins>
30+
<plugin>
31+
<groupId>org.apache.maven.plugins</groupId>
32+
<artifactId>maven-compiler-plugin</artifactId>
33+
<version>3.13.0</version>
34+
<configuration>
35+
<release>21</release>
36+
</configuration>
37+
</plugin>
3038
<plugin>
3139
<groupId>org.apache.maven.plugins</groupId>
3240
<artifactId>maven-enforcer-plugin</artifactId>
33-
<version>3.3.0</version>
41+
<version>3.5.0</version>
3442
<executions>
3543
<execution>
3644
<id>enforce-versions</id>
@@ -39,8 +47,11 @@
3947
</goals>
4048
<configuration>
4149
<rules>
50+
<requireMavenVersion>
51+
<version>3.8.4</version>
52+
</requireMavenVersion>
4253
<requireJavaVersion>
43-
<version>[1.8.0-0,1.8.0-500]</version>
54+
<version>21</version>
4455
</requireJavaVersion>
4556
</rules>
4657
</configuration>

‎server/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM eclipse-temurin:8-jdk-alpine
1+
FROM eclipse-temurin:21-jdk-alpine
22
RUN apk --update upgrade && apk add openssl openssl-dev ca-certificates libgcc && update-ca-certificates
33
COPY target/*.jar app.jar
44
ENTRYPOINT ["java","-jar","/app.jar"]

‎server/pom.xml

Lines changed: 35 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
<parent>
55
<groupId>org.surfnet</groupId>
66
<artifactId>student-mobility-broker</artifactId>
7-
<version>0.2.14</version>
7+
<version>0.3.0-SNAPSHOT</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<artifactId>student-mobility-broker-server</artifactId>
1111
<packaging>jar</packaging>
1212
<name>student-mobility-broker-server</name>
1313
<properties>
14-
<java.version>1.8</java.version>
14+
<java.version>21</java.version>
1515
</properties>
1616
<dependencies>
1717
<dependency>
@@ -94,15 +94,46 @@
9494
<groupId>org.springframework.boot</groupId>
9595
<artifactId>spring-boot-maven-plugin</artifactId>
9696
</plugin>
97+
<plugin>
98+
<groupId>org.apache.maven.plugins</groupId>
99+
<artifactId>maven-compiler-plugin</artifactId>
100+
<version>3.13.0</version>
101+
<configuration>
102+
<release>21</release>
103+
</configuration>
104+
</plugin>
105+
<plugin>
106+
<groupId>org.apache.maven.plugins</groupId>
107+
<artifactId>maven-enforcer-plugin</artifactId>
108+
<version>3.5.0</version>
109+
<executions>
110+
<execution>
111+
<id>enforce-versions</id>
112+
<goals>
113+
<goal>enforce</goal>
114+
</goals>
115+
<configuration>
116+
<rules>
117+
<requireMavenVersion>
118+
<version>3.8.4</version>
119+
</requireMavenVersion>
120+
<requireJavaVersion>
121+
<version>21</version>
122+
</requireJavaVersion>
123+
</rules>
124+
</configuration>
125+
</execution>
126+
</executions>
127+
</plugin>
97128
<plugin>
98129
<groupId>pl.project13.maven</groupId>
99130
<artifactId>git-commit-id-plugin</artifactId>
100-
<version>4.0.0</version>
131+
<version>4.9.10</version>
101132
</plugin>
102133
<plugin>
103134
<groupId>org.jacoco</groupId>
104135
<artifactId>jacoco-maven-plugin</artifactId>
105-
<version>0.8.6</version>
136+
<version>0.8.12</version>
106137
<executions>
107138
<execution>
108139
<goals>

0 commit comments

Comments
 (0)