From 6e286834118c62ce349b1dab6c43841fca3cded4 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期二, 14 九月 2021 12:07:42 +0800 Subject: [PATCH] update 默认适配jdk11 --- pom.xml | 49 +++++++++---------------------------------------- 1 files changed, 9 insertions(+), 40 deletions(-) diff --git a/pom.xml b/pom.xml index 5d46d4e..abda74c 100644 --- a/pom.xml +++ b/pom.xml @@ -36,6 +36,9 @@ <lock4j.version>2.2.1</lock4j.version> <dynamic-ds.version>3.4.1</dynamic-ds.version> + <!-- jdk11 缂哄け渚濊禆 jaxb--> + <jaxb.version>3.0.1</jaxb.version> + <!-- OSS 閰嶇疆 --> <qiniu.version>7.8.0</qiniu.version> <aliyun.oss.version>3.13.1</aliyun.oss.version> @@ -239,7 +242,12 @@ <dependencies> - + <!-- jdk11 缂哄け渚濊禆 jaxb--> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + <version>${jaxb.version}</version> + </dependency> </dependencies> <build> @@ -320,45 +328,6 @@ <logging.level>warn</logging.level> <endpoints.include>health,info</endpoints.include> </properties> - </profile> - - <!-- jdk澶氱増鏈厤缃� --> - <profile> - <id>jdk8</id> - <activation> - <activeByDefault>true</activeByDefault> - <jdk>1.8</jdk> - </activation> - <properties> - <java.version>1.8</java.version> - </properties> - </profile> - <profile> - <id>jdk11</id> - <activation> - <jdk>11</jdk> - </activation> - <properties> - <java.version>11</java.version> - <jaxb.version>3.0.1</jaxb.version> - </properties> - <dependencyManagement> - <dependencies> - <!-- jdk11 缂哄け渚濊禆 jaxb--> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - <version>${jaxb.version}</version> - </dependency> - </dependencies> - </dependencyManagement> - <dependencies> - <!--jaxb--> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - </dependency> - </dependencies> </profile> </profiles> -- Gitblit v1.9.3