Skip to content

Commit

Permalink
!333 optimize dependencies
Browse files Browse the repository at this point in the history 
Merge pull request !333 from KamToHung/KamToHung
  • Loading branch information
@VampireAchao @gitee-org
VampireAchao authored and gitee-org committed May 4, 2023
2 parents 05f8adc + be26cfe commit 8c79050
Show file tree
Hide file tree
Showing 6 changed files with 123 additions and 47 deletions.
57 changes: 31 additions & 26 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<module>stream-core</module>
<module>stream-plugin</module>
<module>stream-dependencies</module>
<module>stream-parent</module>
</modules>


Expand All @@ -21,26 +22,22 @@
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<revision>1.7.0-alpha</revision>
<mybatis-plus.version>3.5.3.1</mybatis-plus.version>
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
<maven-javadoc-plugin.version>3.4.0</maven-javadoc-plugin.version>
<flatten-maven-plugin.version>1.2.7</flatten-maven-plugin.version>
<maven-checkstyle-plugin.version>3.1.0</maven-checkstyle-plugin.version>
<spotless-maven-plugin.version>2.27.2</spotless-maven-plugin.version>
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
<cobertura-maven-plugin.version>2.7</cobertura-maven-plugin.version>
<maven-gpg-plugin.version>1.5</maven-gpg-plugin.version>
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
</properties>

<name>stream-query</name>
<name>Stream Query</name>
<description>允许完全摆脱Mapper的mybatis-plus体验！可以使用类似“工具类”这样的静态函数进行数据库操作</description>
<url>https://github.com/dromara/stream-query</url>


<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.dromara.stream-query</groupId>
<artifactId>stream-dependencies</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<issueManagement>
<system>Github Issue</system>
<url>https://github.com/dromara/stream-query/issues</url>
Expand Down Expand Up @@ -78,7 +75,15 @@
<email>[email protected]</email>
<organization>dromara.org</organization>
<roles>
<role>commiter</role>
<role>committer</role>
</roles>
</developer>
<developer>
<name>KamTo Hung</name>
<email>[email protected]</email>
<organization>dromara.org</organization>
<roles>
<role>committer</role>
</roles>
</developer>
</developers>
Expand All @@ -88,7 +93,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
Expand All @@ -100,7 +105,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.2</version>
<version>${maven-surefire-plugin.version}</version>
<configuration>
<testFailureIgnore>true</testFailureIgnore>
</configuration>
Expand All @@ -109,7 +114,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.4.0</version>
<version>${maven-javadoc-plugin.version}</version>
<configuration>
<additionalOptions>-Xdoclint:none</additionalOptions>
<tags>
Expand Down Expand Up @@ -169,7 +174,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.2.7</version>
<version>${flatten-maven-plugin.version}</version>
<configuration>
<updatePomFile>true</updatePomFile>
<flattenMode>resolveCiFriendliesOnly</flattenMode>
Expand All @@ -195,7 +200,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.1.0</version>
<version>${maven-checkstyle-plugin.version}</version>
<configuration>
<configLocation>checkstyle/checkstyle.xml</configLocation>
<includeTestSourceDirectory>false</includeTestSourceDirectory>
Expand All @@ -218,7 +223,7 @@
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
<version>2.27.2</version>
<version>${spotless-maven-plugin.version}</version>
<configuration>
<java>
<licenseHeader>
Expand Down Expand Up @@ -280,7 +285,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.1</version>
<version>${maven-source-plugin.version}</version>
<executions>
<execution>
<id>ossrh</id>
Expand All @@ -296,7 +301,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.7</version>
<version>${cobertura-maven-plugin.version}</version>
<configuration>
<formats>
<format>html</format>
Expand All @@ -309,7 +314,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.5</version>
<version>${maven-gpg-plugin.version}</version>
<executions>
<execution>
<id>ossrh</id>
Expand All @@ -323,7 +328,7 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.8</version>
<version>${nexus-staging-maven-plugin.version}</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
Expand Down
6 changes: 4 additions & 2 deletions stream-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,15 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.dromara.stream-query</groupId>
<artifactId>stream-query</artifactId>
<artifactId>stream-parent</artifactId>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
<relativePath>../stream-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>stream-core</artifactId>
<name>Stream Core</name>
<description>Stream Core</description>

<dependencies>
<dependency>
Expand Down
83 changes: 66 additions & 17 deletions stream-dependencies/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,60 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>org.dromara.stream-query</groupId>
<parent>
<groupId>org.dromara.stream-query</groupId>
<artifactId>stream-query</artifactId>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>stream-dependencies</artifactId>
<version>${revision}</version>
<packaging>pom</packaging>
<name>Stream Dependencies</name>
<description>Stream Dependencies</description>
<url>https://github.com/dromara/stream-query</url>

<licenses>
<license>
<name>Apache Software License, Version 2.0</name>
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
</license>
</licenses>

<scm>
<connection>scm:[email protected]:dromara/stream-query.git</connection>
<developerConnection>scm:[email protected]:dromara/stream-query.git</developerConnection>
<url>[email protected]:dromara/stream-query.git</url>
</scm>

<developers>
<developer>
<name>VampireAchao</name>
<email>[email protected]</email>
<organization>dromara.org</organization>
<roles>
<role>author</role>
</roles>
</developer>
<developer>
<name>Cizai_</name>
<email>[email protected]</email>
<organization>dromara.org</organization>
<roles>
<role>committer</role>
</roles>
</developer>
<developer>
<name>KamTo Hung</name>
<email>[email protected]</email>
<organization>dromara.org</organization>
<roles>
<role>committer</role>
</roles>
</developer>
</developers>

<properties>
<revision>1.7.0-alpha</revision>
<mybatis-plus.version>3.5.3.1</mybatis-plus.version>
<byte-buddy.version>1.12.21</byte-buddy.version>
<lombok.version>1.18.24</lombok.version>
Expand All @@ -21,6 +68,22 @@

<dependencyManagement>
<dependencies>
<!-- stream-core -->
<dependency>
<groupId>org.dromara.stream-query</groupId>
<artifactId>stream-core</artifactId>
<version>${revision}</version>
</dependency>

<!-- stream-plugin-mybatis-plus -->
<dependency>
<groupId>org.dromara.stream-query</groupId>
<artifactId>stream-plugin-mybatis-plus</artifactId>
<version>${revision}</version>
</dependency>


<!-- Third Party -->
<!-- mybatis-plus -->
<dependency>
<groupId>com.baomidou</groupId>
Expand Down Expand Up @@ -53,20 +116,6 @@
<version>${spring-boot.version}</version>
</dependency>

<!-- stream-core -->
<dependency>
<groupId>org.dromara.stream-query</groupId>
<artifactId>stream-core</artifactId>
<version>${revision}</version>
</dependency>

<!-- stream-plugin-mybatis-plus -->
<dependency>
<groupId>org.dromara.stream-query</groupId>
<artifactId>stream-plugin-mybatis-plus</artifactId>
<version>${revision}</version>
</dependency>

<!-- 测试依赖 -->
<dependency>
<groupId>com.baomidou</groupId>
Expand Down
15 changes: 15 additions & 0 deletions stream-parent/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.dromara.stream-query</groupId>
<artifactId>stream-dependencies</artifactId>
<version>${revision}</version>
<relativePath>../stream-dependencies/pom.xml</relativePath>
</parent>
<artifactId>stream-parent</artifactId>
<packaging>pom</packaging>
<name>Stream Parent</name>
<description>Stream Parent</description>

</project>
7 changes: 5 additions & 2 deletions stream-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,17 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.dromara.stream-query</groupId>
<artifactId>stream-query</artifactId>
<artifactId>stream-parent</artifactId>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
<relativePath>../stream-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>stream-plugin</artifactId>
<packaging>pom</packaging>
<name>Stream Plugin</name>
<description>Stream Plugin</description>

<modules>
<module>stream-plugin-mybatis-plus</module>
</modules>
Expand Down
2 changes: 2 additions & 0 deletions stream-plugin/stream-plugin-mybatis-plus/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>stream-plugin-mybatis-plus</artifactId>
<name>Stream Plugin Mybatis plus</name>
<description>Stream Plugin Mybatis plus</description>

<dependencies>
<!-- mybatis-plus -->
Expand Down

0 comments on commit 8c79050

Please sign in to comment.