diff --git a/.gitignore b/.gitignore index 81e988071..ec85c7211 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ *.iml .idea .DS_Store -dist target diff --git a/README.md b/README.md index 28b36c3aa..e946c06b0 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,12 @@ github地址: oschina地址: [http://git.oschina.net/hugui/light-task-scheduler](http://git.oschina.net/hugui/light-task-scheduler) +例子: +[https://github.com/ltsopensource/lts-examples](https://github.com/ltsopensource/lts-examples) + +文档地址(正在更新中,后面以这个为准): +[https://www.gitbook.com/book/qq254963746/lts/details](https://www.gitbook.com/book/qq254963746/lts/details) + 这两个地址都会同步更新。感兴趣,请加QQ群:109500214 一起探讨、完善。越多人支持,就越有动力去更新,喜欢记得右上角star哈。 ## 框架概况 diff --git a/build.cmd b/build.cmd index eb69ccbf0..1933ec6dc 100644 --- a/build.cmd +++ b/build.cmd @@ -4,7 +4,7 @@ start mvn clean install -DskipTests echo "LTS: mvn clean install -DskipTests" echo "LTS: After sub window finished, close it , and press any key to continue" & pause>nul -set VERSION=1.6.8-SNAPSHOT +set VERSION=1.6.8-beta1 set BASE_HOME=%~dp0% set DIST_BIN_DIR=lts-%VERSION%-bin diff --git a/build.sh b/build.sh index e56db55e0..5d83f80fe 100644 --- a/build.sh +++ b/build.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERSION="1.6.8-SNAPSHOT" +VERSION="1.6.8-beta1" LTS_BIN="${BASH_SOURCE-$0}" LTS_BIN="$(dirname "${LTS_BIN}")" @@ -29,3 +29,6 @@ mvn clean assembly:assembly -DskipTests -Plts-admin cp -rf $Startup_Dir/target/lts-bin/lts/lib $Dist_Bin_Dir/war/jetty cp -rf $LTS_Bin_Dir/lts-admin/target/lts-admin-$VERSION.war $Dist_Bin_Dir/war/lts-admin.war + cd $LTS_Bin_Dir/dist + zip -r lts-$VERSION-bin.zip lts-$VERSION-bin/* + rm -rf lts-$VERSION-bin diff --git a/dist/lts-1.6.8-beta1-bin.zip b/dist/lts-1.6.8-beta1-bin.zip new file mode 100644 index 000000000..6bde29f3c Binary files /dev/null and b/dist/lts-1.6.8-beta1-bin.zip differ diff --git "a/docs/osc&github\345\220\214\346\227\266\346\216\250\351\200\201\346\225\260\346\215\256.txt" "b/docs/osc&github\345\220\214\346\227\266\346\216\250\351\200\201\346\225\260\346\215\256.txt" index 8b98df489..7b21df54c 100644 --- "a/docs/osc&github\345\220\214\346\227\266\346\216\250\351\200\201\346\225\260\346\215\256.txt" +++ "b/docs/osc&github\345\220\214\346\227\266\346\216\250\351\200\201\346\225\260\346\215\256.txt" @@ -27,3 +27,4 @@ git ls-remote --tags github ~/Data/Software/apache-maven-3.2.5/bin/mvn clean install -U -DskipTests ~/Data/Software/apache-maven-3.2.5/bin/mvn clean deploy -DskipTests ~/Data/Software/apache-maven-3.2.5/bin/mvn clean deploy -P release -Dgpg.passphrase=密码 -DskipTests + diff --git a/lts-admin/pom.xml b/lts-admin/pom.xml index 90b0bc6ed..eeddad3c5 100644 --- a/lts-admin/pom.xml +++ b/lts-admin/pom.xml @@ -5,7 +5,7 @@ lts-parent com.github.ltsopensource - 1.6.8-SNAPSHOT + 1.6.8-beta1 4.0.0 war diff --git a/lts-core/pom.xml b/lts-core/pom.xml index 0f7d8864c..dbd12eab6 100644 --- a/lts-core/pom.xml +++ b/lts-core/pom.xml @@ -5,7 +5,7 @@ lts-parent com.github.ltsopensource - 1.6.8-SNAPSHOT + 1.6.8-beta1 4.0.0 jar diff --git a/lts-core/src/main/java/com/github/ltsopensource/core/support/Version.java b/lts-core/src/main/java/com/github/ltsopensource/core/support/Version.java index c2aa7ff8f..f339d2ae6 100644 --- a/lts-core/src/main/java/com/github/ltsopensource/core/support/Version.java +++ b/lts-core/src/main/java/com/github/ltsopensource/core/support/Version.java @@ -20,7 +20,7 @@ private Version() {} private static final Logger LOGGER = LoggerFactory.getLogger(Version.class); - private static final String VERSION = getVersion(Version.class, "1.6.8-SNAPSHOT"); + private static final String VERSION = getVersion(Version.class, "1.6.8-beta1"); static { // 检查是否存在重复的jar包 diff --git a/lts-jobclient/pom.xml b/lts-jobclient/pom.xml index 031dcba9e..09b048ae0 100644 --- a/lts-jobclient/pom.xml +++ b/lts-jobclient/pom.xml @@ -5,7 +5,7 @@ lts-parent com.github.ltsopensource - 1.6.8-SNAPSHOT + 1.6.8-beta1 4.0.0 diff --git a/lts-jobtracker/pom.xml b/lts-jobtracker/pom.xml index 792c3ebf3..2de05d04d 100644 --- a/lts-jobtracker/pom.xml +++ b/lts-jobtracker/pom.xml @@ -5,7 +5,7 @@ lts-parent com.github.ltsopensource - 1.6.8-SNAPSHOT + 1.6.8-beta1 4.0.0 diff --git a/lts-monitor/pom.xml b/lts-monitor/pom.xml index 984de2546..9581a0d38 100644 --- a/lts-monitor/pom.xml +++ b/lts-monitor/pom.xml @@ -5,7 +5,7 @@ lts-parent com.github.ltsopensource - 1.6.8-SNAPSHOT + 1.6.8-beta1 4.0.0 diff --git a/lts-spring/pom.xml b/lts-spring/pom.xml index 7737bc315..84c3aa816 100644 --- a/lts-spring/pom.xml +++ b/lts-spring/pom.xml @@ -5,7 +5,7 @@ lts-parent com.github.ltsopensource - 1.6.8-SNAPSHOT + 1.6.8-beta1 4.0.0 jar diff --git a/lts-startup/pom.xml b/lts-startup/pom.xml index f93bb998f..91e5f9e3d 100644 --- a/lts-startup/pom.xml +++ b/lts-startup/pom.xml @@ -5,7 +5,7 @@ lts-parent com.github.ltsopensource - 1.6.8-SNAPSHOT + 1.6.8-beta1 4.0.0 jar diff --git a/lts-tasktracker/pom.xml b/lts-tasktracker/pom.xml index 861c744b8..10927ca2e 100644 --- a/lts-tasktracker/pom.xml +++ b/lts-tasktracker/pom.xml @@ -5,7 +5,7 @@ lts-parent com.github.ltsopensource - 1.6.8-SNAPSHOT + 1.6.8-beta1 4.0.0 diff --git a/lts/pom.xml b/lts/pom.xml index e77a5050e..3ca690c39 100644 --- a/lts/pom.xml +++ b/lts/pom.xml @@ -5,7 +5,7 @@ lts-parent com.github.ltsopensource - 1.6.8-SNAPSHOT + 1.6.8-beta1 jar 4.0.0 @@ -51,6 +51,27 @@ + + maven-javadoc-plugin + + + attach-javadoc + deploy + + jar + + + + + public + UTF-8 + UTF-8 + UTF-8 + + http://docs.oracle.com/javase/6/docs/api + + + org.apache.maven.plugins maven-shade-plugin @@ -71,6 +92,7 @@ com.github.ltsopensource:lts-tasktracker com.github.ltsopensource:lts-jobtracker com.github.ltsopensource:lts-spring + com.github.ltsopensource:lts-monitor diff --git a/pom.xml b/pom.xml index 93f528e5b..bd75753ef 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ com.github.ltsopensource lts-parent pom - 1.6.8-SNAPSHOT + 1.6.8-beta1 https://github.com/ltsopensource/light-task-scheduler.git lts-core