Commit 0167257c authored by femiadeyemi's avatar femiadeyemi
Browse files

upgrade to spring-boot version 2.3.5

Motivation:

Keep cerebrum up-to-date.

Modification:

- change the spring-boot version to 2.3.5
- upgrade the springdoc-openapi-ui to version 1.4.8 to
    avoid the classpath problem
- use the latest spring boot version of the neo4j driver
- unity aai jwt header token is at+jwt however, the latest
    springframework security does not support this. Hence.
    exclude the current version of nimbus-jose-jwt and
    add version 7.9 that support at+jwt header.
- inside the application.yml and application-dev.yml use the
    properties setting for the neo4j instead of the spring
    neo4j properties
- enable more neo4j logs info
- use the proper variable name for the sceret value inside
    the docker file.

Result:

No visible changes to the end user
parent 5e8fa9dd
FROM adoptopenjdk:11-jre-hotspot
COPY target/helmholtz-cerebrum-*.jar app.jar
EXPOSE 8090
CMD java -Dspring.profiles.active=dev -jar app.jar -Dsecret=$CLIENT_SECRET
CMD java -Dspring.profiles.active=dev -jar app.jar -DclientSecret=$CLIENT_SECRET
......@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.2.7.RELEASE</version>
<version>2.3.5.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
......@@ -19,7 +19,7 @@
<properties>
<java.version>11</java.version>
<springdoc-openapi-ui.version>1.4.1</springdoc-openapi-ui.version>
<springdoc-openapi-ui.version>1.4.8</springdoc-openapi-ui.version>
<json-patch.version>1.13</json-patch.version>
<oauth2-oidc-sdk.version>8.3</oauth2-oidc-sdk.version>
<sonar-maven-plugin.version>3.7.0.1746</sonar-maven-plugin.version>
......@@ -36,6 +36,11 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-neo4j</artifactId>
</dependency>
<dependency>
<groupId>org.neo4j.driver</groupId>
<artifactId>neo4j-java-driver-spring-boot-starter</artifactId>
<version>4.1.1.0</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
......@@ -66,6 +71,17 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-oauth2-jose</artifactId>
<exclusions>
<exclusion>
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
<version>7.9</version>
</dependency>
<dependency>
......
cerebrum:
allowed:
origins: https://helmholtz-marketplace-dev.test.fedcloud.eu
origins: http://hifis-tp.desy.de
logging:
level:
root: DEBUG
org.springframework.web: DEBUG
org.springframework.security: DEBUG
org.springframework.security.oauth2: DEBUG
root: INFO
org.springframework.web: TRACE
org.springframework.security: TRACE
org.springframework.security.oauth2: TRACE
org.springframework.boot.autoconfigure: DEBUG
org.neo4j.driver.GraphDatabase: TRACE
org.neo4j.driver.Driver: TRACE
org.neo4j.driver.OutboundMessageHandler: TRACE
org.neo4j.driver.InboundMessageDispatcher: TRACE
org:
neo4j:
driver:
uri: bolt://localhost:7687
authentication:
username: neo4j
password: test
spring:
data:
neo4j:
username: neo4j
password: cerebrum
uri: bolt://cerebrum-neo4j:7687
open-in-view: false
\ No newline at end of file
......@@ -9,9 +9,14 @@ logging:
level:
root: INFO
org.springframework.web: INFO
org.springframework.security: INFO
org.springframework.security.oauth2: INFO
org.springframework.security: DEBUG
org.springframework.security.oauth2: DEBUG
org.springframework.data.neo4j.cypher: TRACE
org.springframework.boot.autoconfigure: DEBUG
org.neo4j.driver.GraphDatabase: TRACE
org.neo4j.driver.Driver: TRACE
org.neo4j.driver.OutboundMessageHandler: TRACE
org.neo4j.driver.InboundMessageDispatcher: TRACE
server:
port: 8090
......@@ -20,13 +25,18 @@ server:
whitelabel:
enabled: false
org:
neo4j:
driver:
uri: bolt://localhost:7687
authentication:
username: neo4j
password: test
spring:
data:
rest:
base-path: /api/v0
neo4j:
username: neo4j
password: secret
mvc:
throw-exception-if-no-handler-found: true
security:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment