From f3d29ca549a6cf4c1a5a38f5ddee5d215c781bb9 Mon Sep 17 00:00:00 2001
From: daniel <daniel@finereport.com>
Date: Thu, 26 Jul 2018 17:37:06 +0800
Subject: [PATCH] build

---
 .gitignore               |  3 ++-
 build.third_step0.gradle |  9 ++++++---
 build.third_step1.gradle |  2 +-
 build.third_step2.gradle |  2 +-
 build.third_step3.gradle |  2 +-
 build.third_step4.gradle |  2 +-
 build.third_step5.gradle |  2 +-
 build.third_step6.gradle |  2 +-
 fine-spring/pom.xml      | 18 ++++++++++++++++++
 pom.xml                  | 23 +++++++++++++++++++++++
 10 files changed, 55 insertions(+), 10 deletions(-)
 create mode 100644 fine-spring/pom.xml
 create mode 100644 pom.xml

diff --git a/.gitignore b/.gitignore
index 249963d2c..4344fdc85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 *.iml
-.idea/
\ No newline at end of file
+.idea/
+/fine-classmate/*.iml
diff --git a/build.third_step0.gradle b/build.third_step0.gradle
index 256b434ab..d98c77d5f 100644
--- a/build.third_step0.gradle
+++ b/build.third_step0.gradle
@@ -39,8 +39,11 @@ FileTree files =fileTree(dir:'./',include:'build*.gradle')
 def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf (java.io.File.separator))
 def branchName=buildDir.substring(buildDir.lastIndexOf (java.io.File.separator)+1)
 
+def date = new Date()
+def formattedDate = date.format('yyyy.MM.dd')
+
 def srcDir="."
-def maven_version="${version}-RELEASE-SNAPSHOT"
+def maven_version="${version}.${formattedDate}"
 def jar_version = version
 
 configurations {
@@ -49,7 +52,7 @@ configurations {
 }
 
 dependencies {
-    thirdjar "com.fr.third:fine-third:10.0-RELEASE-SNAPSHOT"
+    thirdjar "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT"
 	sigar "com.fr.third:sigar:1.6.0"
     testCompile 'junit:junit:4.12'
 }
@@ -67,7 +70,7 @@ publishing {
     repositories {
 		maven {
 	    
-		    url "http://mvn.finedevelop.com/repository/fanruan/"
+		    url "http://mvn.finedevelop.com/repository/fanruan-release/"
 		    credentials {
 			username =  findProperty("NEXUS_USERNAME")
 			password =  findProperty("NEXUS_PASSWORD")
diff --git a/build.third_step1.gradle b/build.third_step1.gradle
index 1e65d5896..108188f50 100644
--- a/build.third_step1.gradle
+++ b/build.third_step1.gradle
@@ -56,7 +56,7 @@ dependencies{
 	compile fileTree(dir:"${srcDir}/fine-poi/lib",include:'**/*.jar')
 	compile fileTree(dir:"${srcDir}/fine-quartz/lib",include:'**/*.jar')
 	compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
-	compile "com.fr.third:fine-third:10.0-RELEASE-SNAPSHOT"
+	compile "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT"
 	compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar')
  	testCompile 'junit:junit:4.12'
 }
diff --git a/build.third_step2.gradle b/build.third_step2.gradle
index 3f5282d3c..1105b1599 100644
--- a/build.third_step2.gradle
+++ b/build.third_step2.gradle
@@ -45,7 +45,7 @@ dependencies{
 	compile fileTree(dir:"${srcDir}/fine-aspectj/lib",include:'**/*.jar')
 	compile fileTree(dir:"${srcDir}/fine-spring/lib",include:'**/*.jar')
 	compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
-	compile "com.fr.third:fine-third:10.0-RELEASE-SNAPSHOT"
+	compile "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT"
 	compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar')
  	testCompile 'junit:junit:4.12'
 }
diff --git a/build.third_step3.gradle b/build.third_step3.gradle
index e30a07a11..af7e44eb1 100644
--- a/build.third_step3.gradle
+++ b/build.third_step3.gradle
@@ -46,7 +46,7 @@ def branchName=buildDir.substring(buildDir.lastIndexOf (java.io.File.separator)+
 dependencies{
 	compile fileTree(dir:"${srcDir}/fine-jboss-logging/lib",include:'**/*.jar')
 	compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
-	compile "com.fr.third:fine-third:10.0-RELEASE-SNAPSHOT"
+	compile "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT"
 	compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar')
  	testCompile 'junit:junit:4.12'
 }
diff --git a/build.third_step4.gradle b/build.third_step4.gradle
index 2542e2eb3..44f21f29c 100644
--- a/build.third_step4.gradle
+++ b/build.third_step4.gradle
@@ -45,7 +45,7 @@ def branchName=buildDir.substring(buildDir.lastIndexOf (java.io.File.separator)+
 dependencies{
 	compile fileTree(dir:"${srcDir}/fine-hibernate/lib",include:'**/*.jar')
 	compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
-	compile "com.fr.third:fine-third:10.0-RELEASE-SNAPSHOT"
+	compile "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT"
 	compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar')
  	testCompile 'junit:junit:4.12'
 }
diff --git a/build.third_step5.gradle b/build.third_step5.gradle
index 324c9a8c4..34ad92d5e 100644
--- a/build.third_step5.gradle
+++ b/build.third_step5.gradle
@@ -44,7 +44,7 @@ dependencies{
 	compile fileTree(dir:"${srcDir}/fine-druid/lib",include:'ojdbc7-12.1.0.jar')
 	compile fileTree(dir:"${srcDir}/fine-druid/lib",include:'**/*.jar')
 	compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
-	compile "com.fr.third:fine-third:10.0-RELEASE-SNAPSHOT"
+	compile "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT"
 	compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar')
  	testCompile 'junit:junit:4.12'
 }
diff --git a/build.third_step6.gradle b/build.third_step6.gradle
index 46f7ebe3b..468b22d16 100644
--- a/build.third_step6.gradle
+++ b/build.third_step6.gradle
@@ -66,7 +66,7 @@ dependencies{
 	compile fileTree(dir:"${srcDir}/fine-redisson/lib",include:'**/*.jar')
 	compile fileTree(dir:"${srcDir}/fine-socketio/lib",include:'**/*.jar')
 	compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
-	compile "com.fr.third:fine-third:10.0-RELEASE-SNAPSHOT"
+	compile "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT"
 	compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar')
  	testCompile 'junit:junit:4.12'
 }
diff --git a/fine-spring/pom.xml b/fine-spring/pom.xml
new file mode 100644
index 000000000..9a640ec11
--- /dev/null
+++ b/fine-spring/pom.xml
@@ -0,0 +1,18 @@
+<?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">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.fr.third</groupId>
+        <artifactId>base-third-code</artifactId>
+        <version>10.0-RELEASE-SNAPSHOT</version>
+    </parent>
+
+    <groupId>com.fr.third</groupId>
+    <artifactId>fine-spring</artifactId>
+    <version>10.0-RELEASE-SNAPSHOT</version>
+
+    
+</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 000000000..cecce11e0
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,23 @@
+<?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">
+    <modelVersion>4.0.0</modelVersion>
+    <modules>
+        <module>fine-hibernate</module>
+        <module>fine-druid</module>
+    </modules>>
+
+    <parent>
+        <groupId>com.fr.maven</groupId>
+        <artifactId>finereport-maven</artifactId>
+        <version>10.0-RELEASE-SNAPSHOT</version>
+        <relativePath>../finereport-maven</relativePath>
+    </parent>
+
+    <groupId>com.fr.third</groupId>
+    <artifactId>base-third-code</artifactId>
+    <version>10.0-RELEASE-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    
+</project>
\ No newline at end of file