Skip to content

Commit 9f5f109

Browse files
xlornexlorne
authored
Merge pull request #208 from codingapi/5.0.0-dev
5.0.0 dev
2 parents 1fad609 + c288ffd commit 9f5f109

231 files changed

Lines changed: 3897 additions & 2346 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎.github/ISSUE_TEMPLATE/custom.md‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎.github/ISSUE_TEMPLATE/feature_request.md‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
  Copyright 2017 CodingApi
189+
  Copyright 2017-2019 CodingApi
190190

191191
Licensed under the Apache License, Version 2.0 (the "License");
192192
you may not use this file except in compliance with the License.

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# tx-lcn分布式事务框架 (5.0.0.RC1)
1+
# tx-lcn分布式事务框架 (5.0.0.RC2)
22

33
[![Gitter](https://badges.gitter.im/codingapi/tx-lcn.svg)](https://gitter.im/codingapi/tx-lcn?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
44
[![BBS](https://bbs.txlcn.org/style/Archlinux/txlcn-bbs.svg)](https://bbs.txlcn.org)

‎package.txmanager.bat‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
@echo off
2+
3+
cd tx-manager
4+
5+
start mvn clean package
6+
7+
cd ..
8+
9+

‎pom.xml‎

Lines changed: 43 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.codingapi.txlcn</groupId>
88
<artifactId>tx-lcn</artifactId>
9-
<version>5.0.0.RC1</version>
9+
<version>5.0.0.RC2</version>
1010
<packaging>pom</packaging>
1111

1212

@@ -41,12 +41,12 @@
4141
<maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
4242
<maven.compile.source>1.8</maven.compile.source>
4343
<maven.compile.target>1.8</maven.compile.target>
44-
<maven.source.plugin>2.4</maven.source.plugin>
44+
<maven.source.plugin>3.0.1</maven.source.plugin>
4545
<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
4646
<maven.javadoc.plugin>2.10.3</maven.javadoc.plugin>
4747
<maven.gpg.plugin>1.6</maven.gpg.plugin>
4848

49-
<codingapi.txlcn.version>5.0.0.RC1</codingapi.txlcn.version>
49+
<codingapi.txlcn.version>5.0.0.RC2</codingapi.txlcn.version>
5050

5151
<txlcn-org.projectlombok.version>1.18.0</txlcn-org.projectlombok.version>
5252
<txlcn-spring-cloud.version>Finchley.SR2</txlcn-spring-cloud.version>
@@ -79,7 +79,6 @@
7979

8080
<dependencies>
8181

82-
8382
<dependency>
8483
<groupId>org.springframework.boot</groupId>
8584
<artifactId>spring-boot-starter-test</artifactId>
@@ -111,24 +110,27 @@
111110
<groupId>com.caucho</groupId>
112111
<artifactId>hessian</artifactId>
113112
</dependency>
113+
114114
<dependency>
115115
<groupId>com.dyuproject.protostuff</groupId>
116116
<artifactId>protostuff-core</artifactId>
117117
</dependency>
118+
118119
<dependency>
119120
<groupId>com.dyuproject.protostuff</groupId>
120121
<artifactId>protostuff-runtime</artifactId>
121122
</dependency>
123+
122124
<dependency>
123125
<groupId>com.esotericsoftware</groupId>
124126
<artifactId>kryo-shaded</artifactId>
125127
</dependency>
128+
126129
<dependency>
127130
<groupId>com.google.guava</groupId>
128131
<artifactId>guava</artifactId>
129132
</dependency>
130133

131-
132134
</dependencies>
133135

134136

@@ -154,24 +156,12 @@
154156
<version>${codingapi.txlcn.version}</version>
155157
</dependency>
156158

157-
<dependency>
158-
<groupId>com.codingapi.txlcn</groupId>
159-
<artifactId>tx-spi-sleuth-dubbo</artifactId>
160-
<version>${codingapi.txlcn.version}</version>
161-
</dependency>
162-
163159
<dependency>
164160
<groupId>com.codingapi.txlcn</groupId>
165161
<artifactId>tx-client</artifactId>
166162
<version>${codingapi.txlcn.version}</version>
167163
</dependency>
168164

169-
<dependency>
170-
<groupId>com.codingapi.txlcn</groupId>
171-
<artifactId>tx-spi-sleuth-springcloud</artifactId>
172-
<version>${codingapi.txlcn.version}</version>
173-
</dependency>
174-
175165
<dependency>
176166
<groupId>com.codingapi.txlcn</groupId>
177167
<artifactId>tx-spi-message-netty</artifactId>
@@ -184,7 +174,6 @@
184174
<version>${codingapi.txlcn.version}</version>
185175
</dependency>
186176

187-
188177
<dependency>
189178
<groupId>com.codingapi.txlcn</groupId>
190179
<artifactId>tx-logger</artifactId>
@@ -209,14 +198,12 @@
209198
<version>${txlcn-com.github.pagehelper.version}</version>
210199
</dependency>
211200

212-
213201
<dependency>
214202
<groupId>org.mybatis.spring.boot</groupId>
215203
<artifactId>mybatis-spring-boot-starter</artifactId>
216204
<version>${txlcn-org.mybatis.spring.boot.version}</version>
217205
</dependency>
218206

219-
220207
<dependency>
221208
<groupId>com.h2database</groupId>
222209
<artifactId>h2</artifactId>
@@ -241,14 +228,12 @@
241228
<version>${txlcn-com.github.jsqlparser.version}</version>
242229
</dependency>
243230

244-
245231
<dependency>
246232
<groupId>org.projectlombok</groupId>
247233
<artifactId>lombok</artifactId>
248234
<version>${txlcn-org.projectlombok.version}</version>
249235
</dependency>
250236

251-
252237
<dependency>
253238
<groupId>io.netty</groupId>
254239
<artifactId>netty-all</artifactId>
@@ -278,21 +263,25 @@
278263
<artifactId>hessian</artifactId>
279264
<version>${txlcn-hessian.version}</version>
280265
</dependency>
266+
281267
<dependency>
282268
<groupId>com.dyuproject.protostuff</groupId>
283269
<artifactId>protostuff-core</artifactId>
284270
<version>${txlcn-protostuff.version}</version>
285271
</dependency>
272+
286273
<dependency>
287274
<groupId>com.dyuproject.protostuff</groupId>
288275
<artifactId>protostuff-runtime</artifactId>
289276
<version>${txlcn-protostuff.version}</version>
290277
</dependency>
278+
291279
<dependency>
292280
<groupId>com.esotericsoftware</groupId>
293281
<artifactId>kryo-shaded</artifactId>
294282
<version>${txlcn-kryo.version}</version>
295283
</dependency>
284+
296285
<dependency>
297286
<groupId>com.google.guava</groupId>
298287
<artifactId>guava</artifactId>
@@ -307,7 +296,6 @@
307296
<scope>import</scope>
308297
</dependency>
309298

310-
311299
</dependencies>
312300
</dependencyManagement>
313301

@@ -396,6 +384,7 @@
396384
<source>${maven.compile.source}</source>
397385
<target>${maven.compile.target}</target>
398386
<encoding>${project.build.sourceEncoding}</encoding>
387+
<compilerArgument>-Xlint:deprecation</compilerArgument>
399388
</configuration>
400389
</plugin>
401390
<plugin>
@@ -425,35 +414,37 @@
425414
</configuration>
426415
</plugin>
427416

428-
<plugin>
429-
<groupId>org.apache.maven.plugins</groupId>
430-
<artifactId>maven-javadoc-plugin</artifactId>
431-
<version>${maven.javadoc.plugin}</version>
432-
<executions>
433-
<execution>
434-
<id>attach-javadocs</id>
435-
<goals>
436-
<goal>jar</goal>
437-
</goals>
438-
</execution>
439-
</executions>
440-
</plugin>
441-
442-
<!--手动打包时，将下面的plugin注释掉-->
443-
<plugin>
444-
<groupId>org.apache.maven.plugins</groupId>
445-
<artifactId>maven-gpg-plugin</artifactId>
446-
<version>${maven.gpg.plugin}</version>
447-
<executions>
448-
<execution>
449-
<id>sign-artifacts</id>
450-
<phase>verify</phase>
451-
<goals>
452-
<goal>sign</goal>
453-
</goals>
454-
</execution>
455-
</executions>
456-
</plugin>
417+
<!-- 手动打包时，将下面的plugin注释掉 -->
418+
419+
<!--<plugin>-->
420+
<!--<groupId>org.apache.maven.plugins</groupId>-->
421+
<!--<artifactId>maven-javadoc-plugin</artifactId>-->
422+
<!--<version>${maven.javadoc.plugin}</version>-->
423+
<!--<executions>-->
424+
<!--<execution>-->
425+
<!--<id>attach-javadocs</id>-->
426+
<!--<goals>-->
427+
<!--<goal>jar</goal>-->
428+
<!--</goals>-->
429+
<!--</execution>-->
430+
<!--</executions>-->
431+
<!--</plugin>-->
432+
433+
434+
<!--<plugin>-->
435+
<!--<groupId>org.apache.maven.plugins</groupId>-->
436+
<!--<artifactId>maven-gpg-plugin</artifactId>-->
437+
<!--<version>${maven.gpg.plugin}</version>-->
438+
<!--<executions>-->
439+
<!--<execution>-->
440+
<!--<id>sign-artifacts</id>-->
441+
<!--<phase>verify</phase>-->
442+
<!--<goals>-->
443+
<!--<goal>sign</goal>-->
444+
<!--</goals>-->
445+
<!--</execution>-->
446+
<!--</executions>-->
447+
<!--</plugin>-->
457448

458449
</plugins>
459450
</build>

‎run.txmanager.bat‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
@echo off
2+
3+
start java -jar -Xms256m -Xmx512m tx-manager/target/tx-manager-5.0.0.RC2.jar
4+

‎tx-client-dubbo/pom.xml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>tx-lcn</artifactId>
77
<groupId>com.codingapi.txlcn</groupId>
8-
<version>5.0.0.RC1</version>
8+
<version>5.0.0.RC2</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

@@ -24,11 +24,6 @@
2424
<artifactId>brave-instrumentation-dubbo-rpc</artifactId>
2525
</dependency>
2626

27-
<dependency>
28-
<groupId>com.codingapi.txlcn</groupId>
29-
<artifactId>tx-spi-sleuth</artifactId>
30-
</dependency>
31-
3227
<dependency>
3328
<groupId>com.codingapi.txlcn</groupId>
3429
<artifactId>tx-client</artifactId>

0 commit comments

Comments
 (0)