Skip to content

Commit

Permalink
Java11
Browse files Browse the repository at this point in the history
  • Loading branch information
admin committed May 20, 2021
1 parent 3e86235 commit 233ab36
Show file tree
Hide file tree
Showing 3 changed files with 107 additions and 60 deletions.
10 changes: 5 additions & 5 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</modules>
<properties>
<saas-dependencies.version>1.0.0-Common-SNAPSHOT</saas-dependencies.version>
<java.version>1.8</java.version>
<java.version>11</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
Expand All @@ -60,17 +60,17 @@
<developer>
<id>dwi</id>
<name>dwi</name>
<email></email>
<email>[email protected]</email>
<roles>
<role>Java Development Engineer</role>
</roles>
<timezone>2020-03-12 17:50:10</timezone>
</developer>
</developers>
<scm>
<connection>scm:[email protected]:dwi/saas-util.git</connection>
<developerConnection>scm:[email protected]:dwi/saas-util.git</developerConnection>
<url>[email protected]:dwi/saas-util.git</url>
<connection>scm:[email protected]:zmdldp/saas-util.git</connection>
<developerConnection>scm:[email protected]:zmdldp/saas-util.git</developerConnection>
<url>[email protected]:zmdldp/saas-util.git</url>
</scm>

<distributionManagement>
Expand Down
63 changes: 63 additions & 0 deletions saas-boot/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,81 @@
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-websocket</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-undertow</artifactId>
<exclusions>
<exclusion>
<artifactId>jboss-annotations-api_1.3_spec</artifactId>
<groupId>org.jboss.spec.javax.annotation</groupId>
</exclusion>
</exclusions>
</dependency>
<!-- jdk11 统一使用：jakarta.annotation-api
排除：javax.annotation-api
排除：org.jboss.spec.javax.annotation:jboss-annotations-api_1.3_spec-2.0.1.Final.jar -->

<!-- jdk11 统一使用：com.sun.activation:jakarta.activation:1.2.2
排除： javax.activation:activation:1.1
排除： jakarta.activation:jakarta.activation-api
排除： javax.activation:javax.activation-api:1.2.0
-->
<dependency>
<groupId>com.sun.activation</groupId>
<artifactId>jakarta.activation</artifactId>
</dependency>

<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
</dependency>

<dependency>
<groupId>cn.afterturn</groupId>
<artifactId>easypoi-web</artifactId>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-autoconfigure</artifactId>
</dependency>

</dependencies>

</project>
94 changes: 39 additions & 55 deletions saas-dependencies/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<url>https://github.com/dwi/saas-cloud</url>

<properties>
<spring.boot.version>2.3.9.RELEASE</spring.boot.version>
<spring.boot.version>2.3.10.RELEASE</spring.boot.version>
<spring.cloud.version>Hoxton.SR10</spring.cloud.version>
<spring-cloud-alibaba-dependencies.version>2.2.5.RELEASE</spring-cloud-alibaba-dependencies.version>
<seata.version>1.3.0</seata.version>
Expand All @@ -30,8 +30,8 @@
<dynamic.datasource.version>3.2.1</dynamic.datasource.version>
<jasypt.version>2.1.0</jasypt.version>
<p6spy.version>3.9.1</p6spy.version>
<fastjson.version>1.2.75</fastjson.version>
<transmittable-thread-local.version>2.12.0</transmittable-thread-local.version>
<fastjson.version>1.2.76</fastjson.version>
<transmittable-thread-local.version>2.12.1</transmittable-thread-local.version>
<knife4j.version>2.0.8</knife4j.version>
<springfox.version>2.10.5</springfox.version>
<swagger-models.version>1.5.22</swagger-models.version>
Expand Down Expand Up @@ -59,18 +59,20 @@
<oss.version>3.1.0</oss.version>

<apache.xmlgraphics.version>1.7</apache.xmlgraphics.version>
<lombok.version>1.18.18</lombok.version>
<lombok.version>1.18.20</lombok.version>
<javassist.version>3.25.0-GA</javassist.version>
<slf4j.version>1.7.30</slf4j.version>
<hutool.version>5.6.2</hutool.version>
<hutool.version>5.6.3</hutool.version>
<antisamy.version>1.5.10</antisamy.version>
<caffeine.version>2.8.6</caffeine.version>
<caffeine.version>2.9.0</caffeine.version>
<protostuff.version>1.7.2</protostuff.version>
<ip2region.version>1.7.2</ip2region.version>
<bitwalker.version>1.21</bitwalker.version>
<gson.version>2.8.2</gson.version>
<jsoup.version>1.11.3</jsoup.version>
<commons-logging.version>1.2</commons-logging.version>
<JustAuth.version>1.13.2</JustAuth.version>
<sun-jaxb.version>2.3.0.1</sun-jaxb.version>
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
<maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
</properties>
Expand All @@ -96,9 +98,9 @@
</developer>
</developers>
<scm>
<connection>scm:[email protected]:dwi/saas-util.git</connection>
<developerConnection>scm:[email protected]:dwi/saas-util.git</developerConnection>
<url>[email protected]:dwi/saas-util.git</url>
<connection>scm:[email protected]:zmdldp/saas-util.git</connection>
<developerConnection>scm:[email protected]:zmdldp/saas-util.git</developerConnection>
<url>[email protected]:zmdldp/saas-util.git</url>
</scm>

<distributionManagement>
Expand Down Expand Up @@ -378,19 +380,6 @@
<artifactId>dozer-spring4</artifactId>
<version>${dozer.version}</version>
</dependency>

<!-- swagger2 -->
<!-- <dependency>-->
<!-- <groupId>io.springfox</groupId>-->
<!-- <artifactId>springfox-swagger2</artifactId>-->
<!-- <version>${springfox.version}</version>-->
<!-- <exclusions>-->
<!-- <exclusion>-->
<!-- <groupId>io.swagger</groupId>-->
<!-- <artifactId>swagger-models</artifactId>-->
<!-- </exclusion>-->
<!-- </exclusions>-->
<!-- </dependency>-->
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-core</artifactId>
Expand All @@ -402,12 +391,6 @@
<artifactId>swagger-annotations</artifactId>
<version>${swagger-models.version}</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>io.swagger.core.v3</groupId>-->
<!-- <artifactId>swagger-annotations</artifactId>-->
<!-- <version>${swagger3.version}</version>-->
<!-- </dependency>-->

<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-models</artifactId>
Expand Down Expand Up @@ -490,18 +473,7 @@
<artifactId>commons-io</artifactId>
<version>${commons-io.version}</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>commons-collections</groupId>-->
<!-- <artifactId>commons-collections</artifactId>-->
<!-- <version>${commons.collections.version}</version>-->
<!-- </dependency>-->

<!-- commons-collections4 -->
<!-- <dependency>-->
<!-- <groupId>org.apache.commons</groupId>-->
<!-- <artifactId>commons-collections4</artifactId>-->
<!-- <version>${commons.collections4.version}</version>-->
<!-- </dependency>-->
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
Expand Down Expand Up @@ -559,6 +531,12 @@
<groupId>cn.afterturn</groupId>
<artifactId>easypoi-base</artifactId>
<version>${easypoi.version}</version>
<exclusions>
<exclusion>
<artifactId>javassist</artifactId>
<groupId>org.javassist</groupId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand All @@ -572,27 +550,22 @@
<version>${jsoup.version}</version>
</dependency>

<!-- <dependency>-->
<!-- <artifactId>javassist</artifactId>-->
<!-- <groupId>org.javassist</groupId>-->
<!-- <version>${javassist.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.objenesis</groupId>-->
<!-- <artifactId>objenesis</artifactId>-->
<!-- <version>${objenesis.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.jgroups</groupId>-->
<!-- <artifactId>jgroups</artifactId>-->
<!-- <version>${jgroups.version}</version>-->
<!-- </dependency>-->

<dependency>
<groupId>me.zhyd.oauth</groupId>
<artifactId>JustAuth</artifactId>
<version>${JustAuth.version}</version>
</dependency>

<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>${sun-jaxb.version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>${sun-jaxb.version}</version>
</dependency>

<dependency>
<groupId>cn.hutool</groupId>
Expand All @@ -615,6 +588,17 @@
<version>${guava.version}</version>
</dependency>

<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
</dependency>

<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
<version>${javassist.version}</version>
</dependency>

<dependency>
<groupId>org.activiti</groupId>
Expand Down

0 comments on commit 233ab36

Please sign in to comment.