summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhekeguang <hekeguang@chinamobile.com>2020-08-24 14:53:22 +0800
committerhekeguang <hekeguang@chinamobile.com>2020-08-24 14:53:34 +0800
commit1315d0b891fb9d46b8ce789ef5d7b0f0c724923d (patch)
tree860353495c6d6bd4cb9463737dc0508c22706b84
parent0567f5f59856591ceea2a95e7031e36a4eb68282 (diff)
SECCOM Java 11 migration from v8 [REQ-219] in UUI
Issue-ID: USECASEUI-482 Change-Id: If1776f3f8b74f2cb4c6bc7a7e0a894fb2c9a863a Signed-off-by: hekeguang <hekeguang@chinamobile.com>
-rw-r--r--server/pom.xml44
-rw-r--r--server/src/main/resources/application.properties5
2 files changed, 35 insertions, 14 deletions
diff --git a/server/pom.xml b/server/pom.xml
index 3015d657..5c71f202 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -30,8 +30,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <java.version>1.8</java.version>
- <hibernate.version>5.0.11.Final</hibernate.version>
+ <java.version>11</java.version>
+ <hibernate.version>5.4.2.Final</hibernate.version>
<javax.persistence.version>1.0.2</javax.persistence.version>
<common.csv.version>1.4</common.csv.version>
<jackson.version>2.9.8</jackson.version>
@@ -50,7 +50,7 @@
<!-- Import dependency management from Spring Boot -->
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>1.5.6.RELEASE</version>
+ <version>2.1.10.RELEASE</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -186,42 +186,42 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
- <version>5.1.5.RELEASE</version>
+ <version>5.1.15.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-commons</artifactId>
- <version>1.13.18.RELEASE</version>
+ <version>2.1.10.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>4.3.22.RELEASE</version>
+ <version>5.1.15.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-rest-webmvc</artifactId>
- <version>2.6.9.RELEASE</version>
+ <version>3.1.12.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>4.3.22.RELEASE</version>
+ <version>5.1.11.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-jpa</artifactId>
- <version>1.11.20.RELEASE</version>
+ <version>2.1.10.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
- <version>4.3.18.RELEASE</version>
+ <version>5.1.11.RELEASE</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
- <version>5.3.6.Final</version>
+ <version>5.4.2.Final</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
@@ -289,7 +289,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>2.2.4</version>
+ <version>2.8.6</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.alibaba/fastjson -->
<dependency>
@@ -354,6 +354,26 @@
<artifactId>json-simple</artifactId>
<version>1.1.1</version>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-core</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>javax.activation</artifactId>
+ <version>1.2.0</version>
+ </dependency>
</dependencies>
<build>
diff --git a/server/src/main/resources/application.properties b/server/src/main/resources/application.properties
index a742294c..394cc4ed 100644
--- a/server/src/main/resources/application.properties
+++ b/server/src/main/resources/application.properties
@@ -14,7 +14,7 @@
## limitations under the License.
##
## General App Properties
-server.contextPath=/api/usecaseui-server/v1
+server.servlet.contextPath=/api/usecaseui-server/v1
server.port=8082
spring.http.multipart.max-file-size=128MB
spring.http.multipart.max-request-size=128MB
@@ -23,10 +23,11 @@ spring.http.multipart.max-request-size=128MB
spring.datasource.url=jdbc:postgresql://localhost:5432/uui
spring.datasource.username=uui
spring.datasource.password=uui
-spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
+spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQL9Dialect
spring.database.driver.classname=org.postgresql.Driver
spring.jpa.show-sql=false
spring.jpa.properties.hibernate.format_sql=false
+spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
## Basic Authentication Properties
# security.user.name=usecase