Merge pull request #281 from ltsopensource/develop

1.6.8-beta, 更新文档地址
ltsopensource · Apr 24, 2016 · 9d1b212 · 9d1b212
2 parents 4ae1c6c + 06a8c7b
commit 9d1b212
Show file tree

Hide file tree

Showing 17 changed files with 45 additions and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,4 @@
 *.iml
 .idea
 .DS_Store
-dist
 target
diff --git 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
@@ -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
@@ -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
diff --git a/docs/osc&github同时推送数据.txt b/docs/osc&github同时推送数据.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
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-parent</artifactId>
         <groupId>com.github.ltsopensource</groupId>
-        <version>1.6.8-SNAPSHOT</version>
+        <version>1.6.8-beta1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>war</packaging>

diff --git a/lts-core/pom.xml b/lts-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-parent</artifactId>
         <groupId>com.github.ltsopensource</groupId>
-        <version>1.6.8-SNAPSHOT</version>
+        <version>1.6.8-beta1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

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
@@ -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
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-parent</artifactId>
         <groupId>com.github.ltsopensource</groupId>
-        <version>1.6.8-SNAPSHOT</version>
+        <version>1.6.8-beta1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/lts-jobtracker/pom.xml b/lts-jobtracker/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-parent</artifactId>
         <groupId>com.github.ltsopensource</groupId>
-        <version>1.6.8-SNAPSHOT</version>
+        <version>1.6.8-beta1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/lts-monitor/pom.xml b/lts-monitor/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-parent</artifactId>
         <groupId>com.github.ltsopensource</groupId>
-        <version>1.6.8-SNAPSHOT</version>
+        <version>1.6.8-beta1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/lts-spring/pom.xml b/lts-spring/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-parent</artifactId>
         <groupId>com.github.ltsopensource</groupId>
-        <version>1.6.8-SNAPSHOT</version>
+        <version>1.6.8-beta1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

diff --git a/lts-startup/pom.xml b/lts-startup/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-parent</artifactId>
         <groupId>com.github.ltsopensource</groupId>
-        <version>1.6.8-SNAPSHOT</version>
+        <version>1.6.8-beta1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

diff --git a/lts-tasktracker/pom.xml b/lts-tasktracker/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-parent</artifactId>
         <groupId>com.github.ltsopensource</groupId>
-        <version>1.6.8-SNAPSHOT</version>
+        <version>1.6.8-beta1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/lts/pom.xml b/lts/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-parent</artifactId>
         <groupId>com.github.ltsopensource</groupId>
-        <version>1.6.8-SNAPSHOT</version>
+        <version>1.6.8-beta1</version>
     </parent>
     <packaging>jar</packaging>
     <modelVersion>4.0.0</modelVersion>
@@ -51,6 +51,27 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-javadoc</id>
+                        <phase>deploy</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <show>public</show>
+                    <charset>UTF-8</charset>
+                    <encoding>UTF-8</encoding>
+                    <docencoding>UTF-8</docencoding>
+                    <links>
+                        <link>http://docs.oracle.com/javase/6/docs/api</link>
+                    </links>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
@@ -71,6 +92,7 @@
                                     <include>com.github.ltsopensource:lts-tasktracker</include>
                                     <include>com.github.ltsopensource:lts-jobtracker</include>
                                     <include>com.github.ltsopensource:lts-spring</include>
+                                    <include>com.github.ltsopensource:lts-monitor</include>
                                 </includes>
                             </artifactSet>
                             <transformers>

diff --git a/pom.xml b/pom.xml
@@ -13,7 +13,7 @@
     <groupId>com.github.ltsopensource</groupId>
     <artifactId>lts-parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.6.8-SNAPSHOT</version>
+    <version>1.6.8-beta1</version>
     <url>https://github.com/ltsopensource/light-task-scheduler.git</url>
     <modules>
         <module>lts-core</module>