疯狂的狮子li
2021-06-16 d10099d9e95c8e195bc71355b0eacd2ff446ae09
update 适配 jdk11
已修改2个文件
42 ■■■■ 文件已修改
pom.xml 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-common/pom.xml 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pom.xml
@@ -126,7 +126,7 @@
                <version>${redisson.version}</version>
            </dependency>
            <!--jaxb-->
            <!-- jdk11 缺失依赖 jaxb-->
            <dependency>
                <groupId>com.sun.xml.bind</groupId>
                <artifactId>jaxb-impl</artifactId>
@@ -271,6 +271,27 @@
                <logging.level>warn</logging.level>
            </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>
            </properties>
        </profile>
    </profiles>
</project>
ruoyi-common/pom.xml
@@ -146,12 +146,19 @@
            <artifactId>redisson-spring-boot-starter</artifactId>
        </dependency>
        <!--jaxb-->
        <dependency>
            <groupId>com.sun.xml.bind</groupId>
            <artifactId>jaxb-impl</artifactId>
        </dependency>
    </dependencies>
    <profiles>
        <profile>
            <id>jdk11</id>
            <dependencies>
                <!--jaxb-->
                <dependency>
                    <groupId>com.sun.xml.bind</groupId>
                    <artifactId>jaxb-impl</artifactId>
                </dependency>
            </dependencies>
        </profile>
    </profiles>
</project>