Skip to content

Commit ade49f7

Browse files
mini1798mini1798
committed
feature(frame): Code finishing
1. Code finishing
1 parent 7097c07 commit ade49f7

File tree

6 files changed

+67
-19
lines changed

6 files changed

+67
-19
lines changed

‎json-diff-common/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<parent>
66
<artifactId>json-diff-parent</artifactId>
77
<groupId>cn.xiaoandcai</groupId>
8-
<version>3.1.2-RC1-RELEASE</version>
8+
<version>4.0.5-RC1-RELEASE</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

1212
<artifactId>json-diff-common</artifactId>
13-
<version>3.1.2-RC1-RELEASE</version>
13+
<version>4.0.5-RC1-RELEASE</version>
1414

1515
<properties>
1616
<maven.compiler.source>8</maven.compiler.source>

‎json-diff-core/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<parent>
66
<artifactId>json-diff-parent</artifactId>
77
<groupId>cn.xiaoandcai</groupId>
8-
<version>3.1.2-RC1-RELEASE</version>
8+
<version>4.0.5-RC1-RELEASE</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

1212
<artifactId>json-diff-core</artifactId>
13-
<version>3.1.2-RC1-RELEASE</version>
13+
<version>4.0.5-RC1-RELEASE</version>
1414

1515
<dependencies>
1616
<dependency>

‎json-diff-impl/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
<parent>
66
<artifactId>json-diff-parent</artifactId>
77
<groupId>cn.xiaoandcai</groupId>
8-
<version>3.1.2-RC1-RELEASE</version>
8+
<version>4.0.5-RC1-RELEASE</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

1212
<artifactId>json-diff-impl</artifactId>
13-
<version>3.1.2-RC1-RELEASE</version>
13+
<version>4.0.5-RC1-RELEASE</version>
1414

1515
<properties>
16-
<maven.compiler.source>11</maven.compiler.source>
17-
<maven.compiler.target>11</maven.compiler.target>
16+
<maven.compiler.source>8</maven.compiler.source>
17+
<maven.compiler.target>8</maven.compiler.target>
1818
</properties>
1919

2020

‎json-diff-test/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<parent>
66
<artifactId>json-diff-parent</artifactId>
77
<groupId>cn.xiaoandcai</groupId>
8-
<version>3.1.2-RC1-RELEASE</version>
8+
<version>4.0.5-RC1-RELEASE</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

1212
<artifactId>json-diff-test</artifactId>
13-
<version>3.1.2-RC1-RELEASE</version>
13+
<version>4.0.5-RC1-RELEASE</version>
1414

1515
<properties>
1616
<maven.compiler.source>8</maven.compiler.source>

‎json-diff/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>json-diff-parent</artifactId>
77
<groupId>cn.xiaoandcai</groupId>
8-
<version>3.1.2-RC1-RELEASE</version>
8+
<version>4.0.5-RC1-RELEASE</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎pom.xml‎

Lines changed: 56 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
43

54
<modelVersion>4.0.0</modelVersion>
65
<packaging>pom</packaging>
76
<groupId>cn.xiaoandcai</groupId>
87
<artifactId>json-diff-parent</artifactId>
98
<!-- mvn clean deploy - -settings /Users/weidian/.m2/settings-out.xml -->
10-
<version>3.1.6-RC1-RELEASE</version>
9+
<version>4.0.5-RC1-RELEASE</version>
1110
<name>JsonDiff</name>
1211
<url>https://gitee.com/local-li/json-diff</url>
1312
<description>一款高性能的Json差异发现工具</description>
@@ -16,6 +15,7 @@
1615
<module>json-diff-core</module>
1716
<module>json-diff-test</module>
1817
<module>json-diff-common</module>
18+
<module>json-diff-impl</module>
1919
<module>json-diff</module>
2020
</modules>
2121

@@ -31,7 +31,7 @@
3131
<connection>scm:git:${project.scm.url}</connection>
3232
<developerConnection>scm:git:${project.scm.url}</developerConnection>
3333
<url>git@github.com:codeleep/json-diff.git</url>
34-
<tag>HEAD</tag>
34+
<tag>json-diff-parent-4.0.5-RC1-RELEASE</tag>
3535
</scm>
3636

3737
<dependencyManagement>
@@ -120,6 +120,54 @@
120120
<id>release</id>
121121
<build>
122122
<plugins>
123+
<!-- 要生成Javadoc和Source jar文件，您必须配置javadoc和源Maven插件 -->
124+
<plugin>
125+
<groupId>org.apache.maven.plugins</groupId>
126+
<artifactId>maven-source-plugin</artifactId>
127+
<version>3.2.0</version>
128+
<executions>
129+
<execution>
130+
<!-- 绑定source插件到Maven的生命周期 -->
131+
<id>attach-sources</id>
132+
<phase>package</phase>
133+
<!--在生命周期后执行绑定的source插件的goals -->
134+
<goals>
135+
<goal>jar-no-fork</goal>
136+
</goals>
137+
</execution>
138+
</executions>
139+
</plugin>
140+
<plugin>
141+
<groupId>org.apache.maven.plugins</groupId>
142+
<artifactId>maven-javadoc-plugin</artifactId>
143+
<version>3.4.0</version>
144+
<configuration>
145+
<additionalOptions>-Xdoclint:none</additionalOptions>
146+
</configuration>
147+
<executions>
148+
<execution>
149+
<phase>package</phase>
150+
<goals>
151+
<goal>jar</goal>
152+
</goals>
153+
</execution>
154+
</executions>
155+
</plugin>
156+
<plugin>
157+
<groupId>org.apache.maven.plugins</groupId>
158+
<artifactId>maven-release-plugin</artifactId>
159+
<version>3.0.0</version>
160+
<configuration>
161+
<!-- prepare发布之前执行的mvn命令 -->
162+
<preparationGoals>clean verify</preparationGoals>
163+
<!-- 生成的tag格式 这里 @{} 而不是 ${} 可以防止project.version被其他方式覆盖 -->
164+
<tagNameFormat>@{project.version}</tagNameFormat>
165+
<autoVersionSubmodules>true</autoVersionSubmodules>
166+
<!-- 取消构建api文档,否则注释不规范会造成构建失败 -->
167+
<useReleaseProfile>false</useReleaseProfile>
168+
</configuration>
169+
</plugin>
170+
123171
<plugin>
124172
<groupId>org.sonatype.central</groupId>
125173
<artifactId>central-publishing-maven-plugin</artifactId>
@@ -128,7 +176,7 @@
128176
<configuration>
129177
<tokenAuth>true</tokenAuth>
130178
<autoPublish>true</autoPublish>
131-
<publishingServerId>${gpg.keyname}</publishingServerId>
179+
<publishingServerId>codeleep</publishingServerId>
132180
</configuration>
133181
</plugin>
134182
<plugin>
@@ -147,8 +195,8 @@
147195
<arg>--pinentry-mode</arg>
148196
<arg>loopback</arg>
149197
</gpgArguments>
150-
<keyname>${gpg.keyname}</keyname>
151-
<passphraseServerId>${gpg.keyname}</passphraseServerId>
198+
<keyname>codeleep</keyname>
199+
<passphraseServerId>codeleep</passphraseServerId>
152200
</configuration>
153201
</execution>
154202
</executions>
@@ -158,4 +206,4 @@
158206
</profile>
159207
</profiles>
160208

161-
</project>
209+
</project>

0 commit comments

Comments
 (0)