Browse Source

@IPU_REQ_2022@Springboot版本升级为2.3.1.RELEASE,spring版本升级为5.2.7.RELEASE,tomcat版本升级为9.0.56

weihf 3 years ago
parent
commit
804dfb81fd

+ 4 - 4
ipu-rest-demo/pom.xml

4
	<parent>
4
	<parent>
5
		<groupId>com.ai.ipu.server</groupId>
5
		<groupId>com.ai.ipu.server</groupId>
6
		<artifactId>ipu-server-parent</artifactId>
6
		<artifactId>ipu-server-parent</artifactId>
7
		<version>3.2-SNAPSHOT</version>
7
		<version>3.3-SNAPSHOT</version>
8
	</parent>
8
	</parent>
9
9
10
	<artifactId>ipu-rest-demo</artifactId>
10
	<artifactId>ipu-rest-demo</artifactId>
33
		<skip-test>true</skip-test>
33
		<skip-test>true</skip-test>
34
		<start-class>com.ai.ipu.server.demo.IpuRestDemoStart</start-class>
34
		<start-class>com.ai.ipu.server.demo.IpuRestDemoStart</start-class>
35
		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
35
		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
36
		<ipu>3.2-SNAPSHOT</ipu>
36
		<ipu>3.3-SNAPSHOT</ipu>
37
		<!-- ipu-dependencies3.3-SNAPSHOT起,不再支持springboot1.x,升级为springboot2.1.3-RELEASE -->
37
		<!-- ipu-dependencies3.3-SNAPSHOT起,不再支持springboot1.x,升级为springboot2.1.3-RELEASE -->
38
		<ipu-rest>3.2-SNAPSHOT</ipu-rest>
39
		<org.springframework.boot>1.5.9.RELEASE</org.springframework.boot>
38
		<ipu-rest>3.3-SNAPSHOT</ipu-rest>
39
		<org.springframework.boot>2.3.1.RELEASE</org.springframework.boot>
40
		<!-- 执行完build镜像后,是否自动push到仓库,如果是,必须配置docker-registry-server -->
40
		<!-- 执行完build镜像后,是否自动push到仓库,如果是,必须配置docker-registry-server -->
41
		<spring-boot-docker-push>false</spring-boot-docker-push>
41
		<spring-boot-docker-push>false</spring-boot-docker-push>
42
        <!-- 拉取镜像的策略,可选的值:ALWAYS, NEVER, IF_NOT_PRESENT -->
42
        <!-- 拉取镜像的策略,可选的值:ALWAYS, NEVER, IF_NOT_PRESENT -->

+ 2 - 2
ipu-rest-demo/src/main/resources/dev/application.properties

9
spring.resources.static-locations=classpath:/${web.root}
9
spring.resources.static-locations=classpath:/${web.root}
10

10

11
#1.x默认/
11
#1.x默认/
12
server.context-path=/ipu
12
#server.context-path=/ipu
13
#默认/。注册DispatcherServlet对应path,亦可通过dispatcherRegistration方法配置
13
#默认/。注册DispatcherServlet对应path,亦可通过dispatcherRegistration方法配置
14
#server.servlet-path=/
14
#server.servlet-path=/
15
#2.x
15
#2.x
16
#server.servlet.context-path=/ipu
16
server.servlet.context-path=/ipu
17
#使用maven中的变量替换
17
#使用maven中的变量替换
18
logging.file=target/logs/${project.artifactId}.log
18
logging.file=target/logs/${project.artifactId}.log
19
spring.application.name=${project.artifactId}
19
spring.application.name=${project.artifactId}

+ 1 - 2
ipu-rest-scaffold/pom.xml

75
        <dependency>
75
        <dependency>
76
            <groupId>com.ai.ipu.server</groupId>
76
            <groupId>com.ai.ipu.server</groupId>
77
            <artifactId>ipu-restful</artifactId>
77
            <artifactId>ipu-restful</artifactId>
78
            <version>${ipu-rest}</version>
79
        </dependency>
78
        </dependency>
80
        <dependency>
79
        <dependency>
81
            <groupId>com.ai.ipu</groupId>
80
            <groupId>com.ai.ipu</groupId>
85
        <dependency>
84
        <dependency>
86
            <groupId>com.ai.ipu.server</groupId>
85
            <groupId>com.ai.ipu.server</groupId>
87
            <artifactId>ipu-portal</artifactId>
86
            <artifactId>ipu-portal</artifactId>
88
            <version>${ipu-rest}</version>
87
            <version>3.1-SNAPSHOT</version>
89
        </dependency>
88
        </dependency>
90
		<dependency>
89
		<dependency>
91
			<groupId>junit</groupId>
90
			<groupId>junit</groupId>