update readme

topsale · May 7, 2017 · 59e1517 · 59e1517
1 parent ff3fa30
commit 59e1517
Show file tree

Hide file tree

Showing 7 changed files with 107 additions and 50 deletions.
diff --git a/README.md b/README.md
@@ -55,5 +55,34 @@ Root 项目，负责整体构建和模块组装
 ### leesite-database
 依赖 leesite-parent 模块，数据库初始化
 
+## Maven overlays
+
+将 LeeSite 作为框架依赖到您的项目中：
+
+```xml
+<dependencies>
+	<dependency>
+		<groupId>com.funtl.leesite</groupId>
+		<artifactId>leesite-dependencies</artifactId>
+		<version>${leesite.version}</version>
+		<type>pom</type>
+		<scope>import</scope>
+	</dependency>
+	<dependency>
+		<groupId>com.funtl.leesite</groupId>
+		<artifactId>leesite-module</artifactId>
+		<version>${leesite.version}</version>
+		<type>war</type>
+	</dependency>
+	<dependency>
+		<groupId>com.funtl.leesite</groupId>
+		<artifactId>leesite-module</artifactId>
+		<version>${leesite.version}</version>
+		<type>jar</type>
+		<classifier>classes</classifier>
+	</dependency>
+</dependencies>
+```
+
 ## License
 LeeSite is Open Source software released under the [Apache 2.0 license.](http://www.apache.org/licenses/LICENSE-2.0.html)
diff --git a/leesite-database/pom.xml.releaseBackup b/leesite-database/pom.xml.releaseBackup
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>com.funtl.leesite</groupId>
         <artifactId>leesite-parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.1-SNAPSHOT</version>
         <relativePath>../leesite-parent</relativePath>
     </parent>
 
@@ -33,7 +32,7 @@
         <developer>
             <id>lusifer</id>
             <name>Lusifer</name>
-            <email>lusifer at tssup.com</email>
+            <email>lusifer at funtl.com</email>
             <organization>深圳市鲁斯菲尔科技有限公司</organization>
             <organizationUrl>http://www.funtl.com</organizationUrl>
             <roles>
@@ -77,29 +76,19 @@
                         <configuration>
                             <target>
                                 <property name="dbunit.datatype" value="org.dbunit.ext.mysql.MySqlDataTypeFactory" />
-                                <property file="db-init.properties"/>
-                                <sql
-                                        driver="${jdbc.driver}"
-                                        url="${jdbc.url}"
-                                        userid="${jdbc.username}"
-                                        password="${jdbc.password}"
-                                        onerror="continue"
-                                        encoding="UTF-8">
-                                    <classpath refid="maven.test.classpath"/>
-                                    <transaction src="db/init/leesite_${jdbc.type}.sql"/>
+                                <property file="db-init.properties" />
+                                <sql driver="${jdbc.driver}" url="${jdbc.url}" userid="${jdbc.username}" password="${jdbc.password}" onerror="continue" encoding="UTF-8">
+                                    <classpath refid="maven.test.classpath" />
+                                    <transaction src="db/init/leesite_${jdbc.type}.sql" />
                                 </sql>
 
-                                <taskdef name="dbunit" classname="org.dbunit.ant.DbUnitTask" classpathref="maven.test.classpath"/>
-                                <dbunit
-                                        driver="${jdbc.driver}"
-                                        url="${jdbc.url}"
-                                        userid="${jdbc.username}"
-                                        password="${jdbc.password}">
+                                <taskdef name="dbunit" classname="org.dbunit.ant.DbUnitTask" classpathref="maven.test.classpath" />
+                                <dbunit driver="${jdbc.driver}" url="${jdbc.url}" userid="${jdbc.username}" password="${jdbc.password}">
                                     <dbconfig>
-                                        <property name="datatypeFactory" value="${dbunit.datatype}"/>
+                                        <property name="datatypeFactory" value="${dbunit.datatype}" />
                                     </dbconfig>
-                                    <classpath refid="maven.test.classpath"/>
-                                    <operation type="INSERT" src="db/init/leesite_data.xls" format="xls" transaction="true"/>
+                                    <classpath refid="maven.test.classpath" />
+                                    <operation type="INSERT" src="db/init/leesite_data.xls" format="xls" transaction="true" />
                                 </dbunit>
                             </target>
                         </configuration>

diff --git a/leesite-dependencies/pom.xml.releaseBackup b/leesite-dependencies/pom.xml.releaseBackup
@@ -4,7 +4,7 @@
 
     <groupId>com.funtl.leesite</groupId>
     <artifactId>leesite-dependencies</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>leesite-dependencies</name>
@@ -27,7 +27,7 @@
         <developer>
             <id>lusifer</id>
             <name>Lusifer</name>
-            <email>lusifer at tssup.com</email>
+            <email>lusifer at funtl.com</email>
             <organization>深圳市鲁斯菲尔科技有限公司</organization>
             <organizationUrl>http://www.funtl.com</organizationUrl>
             <roles>
@@ -36,6 +36,19 @@
         </developer>
     </developers>
 
+    <distributionManagement>
+        <snapshotRepository>
+            <id>nexus</id>
+            <name>Nexus Snapshot</name>
+            <url>http://192.168.0.254:8081/repository/maven-snapshots/</url>
+        </snapshotRepository>
+        <repository>
+            <id>nexus</id>
+            <name>Nexus Releases</name>
+            <url>http://192.168.0.254:8081/repository/maven-releases/</url>
+        </repository>
+    </distributionManagement>
+
     <properties>
         <apache-ant.version>1.9.7</apache-ant.version>
         <apache-poi.version>3.15</apache-poi.version>

diff --git a/leesite-module/pom.xml.releaseBackup b/leesite-module/pom.xml.releaseBackup
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.funtl.leesite</groupId>
         <artifactId>leesite-parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.1-SNAPSHOT</version>
         <relativePath>../leesite-parent</relativePath>
     </parent>
 
@@ -32,7 +32,7 @@
         <developer>
             <id>lusifer</id>
             <name>Lusifer</name>
-            <email>lusifer at tssup.com</email>
+            <email>lusifer at funtl.com</email>
             <organization>深圳市鲁斯菲尔科技有限公司</organization>
             <organizationUrl>http://www.funtl.com</organizationUrl>
             <roles>
@@ -468,6 +468,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <attachClasses>true</attachClasses>
+                    <archiveClasses>true</archiveClasses>
+                </configuration>
             </plugin>
 
             <plugin>

diff --git a/leesite-parent/pom.xml.releaseBackup b/leesite-parent/pom.xml.releaseBackup
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.funtl.leesite</groupId>
         <artifactId>leesite-dependencies</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.1-SNAPSHOT</version>
         <relativePath>../leesite-dependencies</relativePath>
     </parent>
 
@@ -32,7 +32,7 @@
         <developer>
             <id>lusifer</id>
             <name>Lusifer</name>
-            <email>lusifer at tssup.com</email>
+            <email>lusifer at funtl.com</email>
             <organization>深圳市鲁斯菲尔科技有限公司</organization>
             <organizationUrl>http://www.funtl.com</organizationUrl>
             <roles>

diff --git a/pom.xml.releaseBackup b/pom.xml.releaseBackup
@@ -4,7 +4,7 @@
 
     <groupId>com.funtl.leesite</groupId>
     <artifactId>leesite-build</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>leesite-build</name>
@@ -14,7 +14,8 @@
     <scm>
         <url>https://github.com/topsale/leesite</url>
         <developerConnection>scm:git:ssh://[email protected]/topsale/leesite.git</developerConnection>
-    </scm>
+      <tag>HEAD</tag>
+  </scm>
 
     <organization>
         <name>深圳市鲁斯菲尔科技有限公司</name>
@@ -32,7 +33,7 @@
         <developer>
             <id>lusifer</id>
             <name>Lusifer</name>
-            <email>lusifer at tssup.com</email>
+            <email>lusifer at funtl.com</email>
             <organization>深圳市鲁斯菲尔科技有限公司</organization>
             <organizationUrl>http://www.funtl.com</organizationUrl>
             <roles>
@@ -45,6 +46,19 @@
         <main.basedir>${basedir}</main.basedir>
     </properties>
 
+    <distributionManagement>
+        <snapshotRepository>
+            <id>nexus</id>
+            <name>Nexus Snapshot</name>
+            <url>http://192.168.0.254:8081/repository/maven-snapshots/</url>
+        </snapshotRepository>
+        <repository>
+            <id>nexus</id>
+            <name>Nexus Releases</name>
+            <url>http://192.168.0.254:8081/repository/maven-releases/</url>
+        </repository>
+    </distributionManagement>
+
     <build>
         <plugins>
             <plugin>
@@ -55,10 +69,18 @@
         </plugins>
     </build>
 
-    <modules>
-		<module>leesite-dependencies</module>
-        <module>leesite-parent</module>
-        <module>leesite-database</module>
-        <module>leesite-module</module>
-	</modules>
+    <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>leesite-dependencies</module>
+                <module>leesite-parent</module>
+                <module>leesite-database</module>
+                <module>leesite-module</module>
+            </modules>
+        </profile>
+    </profiles>
 </project>
diff --git a/release.properties b/release.properties
@@ -1,26 +1,26 @@
 #release configuration
-#Fri May 05 23:47:42 CST 2017
+#Mon May 08 00:26:39 CST 2017
 scm.commentPrefix=[maven-release-plugin] 
-project.rel.com.funtl.leesite\:leesite-database=1.0.0-RELEASE
+project.rel.com.funtl.leesite\:leesite-database=1.0.1-RELEASE
 pushChanges=true
-project.rel.com.funtl.leesite\:leesite-parent=1.0.0-RELEASE
-project.rel.com.funtl.leesite\:leesite-build=1.0.0-RELEASE
+project.rel.com.funtl.leesite\:leesite-parent=1.0.1-RELEASE
+project.rel.com.funtl.leesite\:leesite-build=1.0.1-RELEASE
 project.scm.com.funtl.leesite\:leesite-build.developerConnection=scm\:git\:ssh\://[email protected]/topsale/leesite.git
 project.scm.com.funtl.leesite\:leesite-build.url=https\://github.com/topsale/leesite
-scm.tag=1.0.0-RELEASE
+scm.tag=1.0.1-RELEASE
 remoteTagging=true
-project.rel.com.funtl.leesite\:leesite-dependencies=1.0.0-RELEASE
+project.rel.com.funtl.leesite\:leesite-dependencies=1.0.1-RELEASE
 exec.additionalArguments=-P maven-snapshots
 projectVersionPolicyId=default
-project.dev.com.funtl.leesite\:leesite-parent=1.0.1-SNAPSHOT
+project.dev.com.funtl.leesite\:leesite-parent=1.0.2-SNAPSHOT
 scm.url=scm\:git\:ssh\://[email protected]/topsale/leesite.git
 scm.tagNameFormat=@{project.artifactId}-@{project.version}
-project.dev.com.funtl.leesite\:leesite-build=1.0.1-SNAPSHOT
-project.dev.com.funtl.leesite\:leesite-dependencies=1.0.1-SNAPSHOT
+project.dev.com.funtl.leesite\:leesite-build=1.0.2-SNAPSHOT
+project.dev.com.funtl.leesite\:leesite-dependencies=1.0.2-SNAPSHOT
 preparationGoals=clean verify
-project.dev.com.funtl.leesite\:leesite-module=1.0.1-SNAPSHOT
+project.dev.com.funtl.leesite\:leesite-module=1.0.2-SNAPSHOT
 exec.snapshotReleasePluginAllowed=false
-project.dev.com.funtl.leesite\:leesite-database=1.0.1-SNAPSHOT
-project.rel.com.funtl.leesite\:leesite-module=1.0.0-RELEASE
+project.dev.com.funtl.leesite\:leesite-database=1.0.2-SNAPSHOT
+project.rel.com.funtl.leesite\:leesite-module=1.0.1-RELEASE
 completedPhase=end-release
 project.scm.com.funtl.leesite\:leesite-build.tag=HEAD