Skip to content

Commit

Permalink
1、拿掉thoughtworksparanamer代码
Browse files Browse the repository at this point in the history
2、pom.xml升级
3、其它小修改
  • Loading branch information
tywo45 committed Mar 29, 2019
1 parent b386c64 commit 9b8ad13
Show file tree
Hide file tree
Showing 18 changed files with 17 additions and 2,106 deletions.
10 changes: 3 additions & 7 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@ Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

Portions copyright 2017-2018, talent-tan
Portions copyright (c) 2006-2018 Paul Hammant & ThoughtWorks Inc
Portions copyright (c) 2000-2007 INRIA, France Telecom


TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.
Expand Down Expand Up @@ -181,7 +176,7 @@ recommend that a file or class name and description of purpose be included on
the same "printed page" as the copyright notice for easier identification within
third-party archives.

Copyright 2017 talent-tan
Copyright 2018 JFinal

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -193,4 +188,5 @@ third-party archives.
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
limitations under the License.

2 changes: 1 addition & 1 deletion src/core/src/main/java/org/tio/server/TioServer.java
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public void start(String serverIp, int serverPort) throws IOException {
int xxLen = 18;
int aaLen = baseLen - 3;
List<String> infoList = new ArrayList<>();
infoList.add(StrUtil.fillAfter("Tio on github", ' ', xxLen) + "| " + SysConst.TIO_URL_GITEE);
infoList.add(StrUtil.fillAfter("Tio on github", ' ', xxLen) + "| " + SysConst.TIO_URL_GITHUB);
infoList.add(StrUtil.fillAfter("Tio site address", ' ', xxLen) + "| " + SysConst.TIO_URL_SITE);
infoList.add(StrUtil.fillAfter("Tio version", ' ', xxLen) + "| " + SysConst.TIO_CORE_VERSION);

Expand Down
10 changes: 5 additions & 5 deletions src/parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<maven.version>3.5.0</maven.version>

<mysql.driver.version>8.0.15</mysql.driver.version><!-- 5.1.46 -->
<druid.version>1.1.14</druid.version>
<druid.version>1.1.15</druid.version>
<jfinal.version>3.5</jfinal.version>
<logback.version>1.3.0-alpha4</logback.version>
<slf4j.version>1.8.0-beta4</slf4j.version>
Expand All @@ -62,23 +62,23 @@
<commons-compress.version>1.18</commons-compress.version>
<fastjson.version>1.2.56</fastjson.version>
<testng.version>6.14.3</testng.version>
<hutool.version>4.5.2</hutool.version>
<hutool.version>4.5.3</hutool.version>
<protobuf-java.version>3.7.0</protobuf-java.version>
<commons-beanutils.version>1.9.3</commons-beanutils.version>
<protobuf-java-format.version>1.4</protobuf-java-format.version>
<protostuff.version>1.6.0</protostuff.version>
<redisson.version>3.10.5</redisson.version>
<jodd.version>5.0.10</jodd.version>
<quartz.version>2.3.0</quartz.version>
<quartz.version>2.3.1</quartz.version>
<caffeine.version>2.7.0</caffeine.version>
<binarywang.version>3.3.0</binarywang.version>
<zxing.version>3.3.3</zxing.version>
<httpcore.version>4.4.11</httpcore.version>
<httpclient.version>4.5.7</httpclient.version>
<closure.version>v20190301</closure.version>
<closure.version>v20190325</closure.version>
<freemarker.version>2.3.28</freemarker.version>
<UserAgentUtils.version>1.21</UserAgentUtils.version>
<scribejava-apis.version>6.5.0</scribejava-apis.version>
<scribejava-apis.version>6.5.1</scribejava-apis.version>
<oltu.oauth2.version>1.0.2</oltu.oauth2.version>


Expand Down
4 changes: 4 additions & 0 deletions src/utils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
</dependency>
<dependency>
<groupId>com.thoughtworks.paranamer</groupId>
<artifactId>paranamer</artifactId>
</dependency>

<dependency>
<groupId>org.redisson</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/utils/src/main/java/org/tio/utils/SysConst.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2018年7月1日 下午10:51:59
*/
public interface SysConst {
String TIO_URL_GITEE = "https://github.com/tywo45/t-io";
String TIO_URL_GITHUB = "https://github.com/tywo45/t-io";
String TIO_URL_SITE = "https://www.t-io.org/";
String TIO_CORE_VERSION = "3.2.8.v20190326-RELEASE";
/**
Expand Down

This file was deleted.

Loading

0 comments on commit 9b8ad13

Please sign in to comment.