Merge pull request #48 from admin-ch/feature/vaccinecer-2413-deployment

Feature/vaccinecer 2413 deployment

Author: Armin-Isenring-Bit

.github/workflows/maven.yml

@@ -16,10 +16,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11.0.7
+          java-version: 17.0.4
           server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
       - name: Build with Maven
         run:

pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.6.RELEASE</version>
+		<version>2.7.6</version>
 		<relativePath/>
 	</parent>
 	<groupId>ch.admin.bag.covidcode</groupId>
@@ -15,14 +15,18 @@
 	<description>Service for generating an authorization code for the proximity tracing app</description>
 
 	<properties>
-		<java.version>11</java.version>
+		<java.version>17</java.version>
 
-		<spring-cloud.version>Hoxton.RELEASE</spring-cloud.version>
-		<logstash.version>5.2</logstash.version>
-		<janino.version>2.6.1</janino.version>
+		<spring-cloud.version>2021.0.4</spring-cloud.version>
+		<spring-cloud-sleuth.version>3.1.5</spring-cloud-sleuth.version>
+		<logstash.version>7.2</logstash.version>
+		<janino.version>3.1.9</janino.version>
+		<jsonwebtoken.version>0.11.5</jsonwebtoken.version>
+		<snakeyaml.version>1.33</snakeyaml.version>
+		<java-cfenv-boot.version>2.4.1</java-cfenv-boot.version>
 
-		<springdoc.version>1.3.6</springdoc.version>
-		<jacoco-maven-plugin.version>0.8.5</jacoco-maven-plugin.version>
+		<springdoc.version>1.6.14</springdoc.version>
+		<jacoco-maven-plugin.version>0.8.7</jacoco-maven-plugin.version>
 		<reproducible-build-maven-plugin.version>0.12</reproducible-build-maven-plugin.version>
 
 		<maven.javadoc.skip>true</maven.javadoc.skip>
@@ -88,7 +92,7 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-sleuth</artifactId>
-            <version>2.2.0.RELEASE</version>
+            <version>${spring-cloud-sleuth.version}</version>
         </dependency>
         <dependency>
             <groupId>net.logstash.logback</groupId>
@@ -149,21 +153,33 @@
 		<dependency>
 			<groupId>io.jsonwebtoken</groupId>
 			<artifactId>jjwt-api</artifactId>
-			<version>0.11.1</version>
+			<version>${jsonwebtoken.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>io.jsonwebtoken</groupId>
 			<artifactId>jjwt-impl</artifactId>
-			<version>0.11.1</version>
+			<version>${jsonwebtoken.version}</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>io.jsonwebtoken</groupId>
 			<artifactId>jjwt-jackson</artifactId>
-			<version>0.11.1</version>
+			<version>${jsonwebtoken.version}</version>
 			<scope>runtime</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>org.yaml</groupId>
+			<artifactId>snakeyaml</artifactId>
+			<version>${snakeyaml.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>io.pivotal.cfenv</groupId>
+			<artifactId>java-cfenv-boot</artifactId>
+			<version>${java-cfenv-boot.version}</version>
+		</dependency>
+
 		<!-- test Dependencies -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

src/main/resources/application.yml

@@ -61,6 +61,7 @@ spring:
         password: secret
         hikari:
             maximum-pool-size: 10
+            minimum-idle: 2
             pool-name: hikari-cp-${spring.application.name}
     jpa:
         hibernate:

src/test/java/ch/admin/bag/covidcode/authcodegeneration/domain/AuthorizationCodeRepositoryTest.java

@@ -20,7 +20,7 @@
 @SpringBootTest(properties = {
         "spring.jpa.hibernate.ddl-auto=create",
         "spring.datasource.driver-class-name=org.h2.Driver",
-        "spring.datasource.url=jdbc:h2:~/test;MODE=PostgreSQL;DATABASE_TO_LOWER=TRUE",
+        "spring.datasource.url=jdbc:h2:mem:test;MODE=PostgreSQL;DATABASE_TO_LOWER=TRUE",
         "spring.datasource.username=sa",
         "spring.datasource.password=sa"
 })

src/test/java/ch/admin/bag/covidcode/authcodegeneration/service/AuthCodeDeletionServiceITTest.java

@@ -18,7 +18,7 @@
 @SpringBootTest(properties = {
         "spring.jpa.hibernate.ddl-auto=create",
         "spring.datasource.driver-class-name=org.h2.Driver",
-        "spring.datasource.url=jdbc:h2:~/test;MODE=PostgreSQL;DATABASE_TO_LOWER=TRUE",
+        "spring.datasource.url=jdbc:h2:mem:test;MODE=PostgreSQL;DATABASE_TO_LOWER=TRUE",
         "spring.datasource.username=sa",
         "spring.datasource.password=sa",
         "CF_INSTANCE_INDEX=0"

src/test/java/ch/admin/bag/covidcode/authcodegeneration/testutil/KeyPairTestUtil.java

@@ -42,7 +42,7 @@ public String getJwks() throws NoSuchAlgorithmException, InvalidKeySpecException
                 .keyUse(KeyUse.SIGNATURE)
                 .algorithm(JWSAlgorithm.RS256)
                 .keyID(KEY_ID);
-        return new JWKSet(builder.build()).toJSONObject().toJSONString();
+        return new JWKSet(builder.build()).toString();
     }
 
     private KeyPair getKeyPair() throws NoSuchAlgorithmException {