Merge pull request #81 from hypercube1024/firefly-4.9.5_release

Firefly 4.9.5 release

Author: hypercube1024

README.md

@@ -12,7 +12,7 @@
     <parent>
         <artifactId>firefly-framework</artifactId>
         <groupId>com.fireflysource</groupId>
-        <version>4.9.4</version>
+        <version>4.9.5</version>
     </parent>
 
     <dependencies>
@@ -42,9 +42,17 @@
         <defaultGoal>install</defaultGoal>
         <resources>
             <resource>
-                <directory>src/main/resources</directory>
+                <directory>src/main/resources/template</directory>
                 <filtering>false</filtering>
             </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>**/*.xml</include>
+                    <include>**/*.properties</include>
+                </includes>
+            </resource>
         </resources>
         <testResources>
             <testResource>

firefly-boot/pom.xml

@@ -10,7 +10,7 @@
 /**
  * @author Pengtao Qiu
  */
-public class ExampleLogFormatter implements LogFormatter {
+public class BootLogFormatter implements LogFormatter {
 
     @Override
     public String format(LogItem logItem) {

firefly-boot/src/main/java/com/firefly/boot/common/ExampleLogFormatter.java renamed to firefly-boot/src/main/java/com/firefly/boot/common/BootLogFormatter.java

@@ -1,8 +1,10 @@
 package com.firefly.boot.model
 
 import com.beust.jcommander.Parameter
+import com.firefly.boot.model.PropertiesLoader.properties
 import com.firefly.kotlin.ext.annotation.NoArg
 import com.firefly.utils.ProjectVersion
+import java.util.*
 
 /**
  * @author Pengtao Qiu
@@ -48,9 +50,6 @@ data class Project(
               )
     var outputPath: String = ".",
 
-    @Parameter(names = ["--fireflyVersion", "-f"], description = "The firefly version.", order = 8)
-    var fireflyVersion: String = ProjectVersion.getValue(),
-
     @Parameter(
         names = ["--buildTool", "-b"],
         description = "The build tool name, the value is maven or gradle.",
@@ -62,7 +61,14 @@ data class Project(
     var help: Boolean = false,
 
     @Parameter(names = ["--version", "-v"], description = "Show the firefly cli version.", help = true, order = 102)
-    var version: Boolean = false
+    var version: Boolean = false,
+
+    val kotlinVersion: String = properties.getProperty("kotlin.version"),
+    val kotlinCoroutineVersion: String = properties.getProperty("kotlin.coroutine.version"),
+    val dokkaVersion: String = properties.getProperty("dokka.version"),
+    val jacksonVersion: String = properties.getProperty("jackson.version"),
+    val redissonVersion: String = properties.getProperty("redisson.version"),
+    val fireflyVersion: String = ProjectVersion.getValue()
                   ) {
 
     constructor() : this(null, null, null, null, null)
@@ -78,4 +84,19 @@ enum class BuildTool(val value: String) {
         }
     }
 
-}
+}
+
+object PropertiesLoader {
+    val properties: Properties by lazy {
+        loadProperties("/dependency.properties")
+    }
+
+    private fun loadProperties(path: String): Properties {
+        return Project::class.java.getResourceAsStream(path).use {
+            val properties = Properties()
+            properties.load(it)
+            properties
+        }
+    }
+}
+

firefly-boot/src/main/kotlin/com/firefly/boot/model/Project.kt

@@ -0,0 +1,5 @@
+kotlin.version=${kotlin.version}
+kotlin.coroutine.version=${kotlin.coroutine.version}
+dokka.version=${dokka.version}
+jackson.version=${jackson.version}
+redisson.version=${redisson.version}

firefly-boot/src/main/resources/dependency.properties

@@ -6,14 +6,14 @@
         <name>firefly-system</name>
         <level>INFO</level>
         <enable-console>true</enable-console>
-        <formatter>com.firefly.boot.common.ExampleLogFormatter</formatter>
+        <formatter>com.firefly.boot.common.BootLogFormatter</formatter>
     </logger>
 
     <logger>
         <name>com.firefly.boot</name>
         <level>INFO</level>
         <enable-console>true</enable-console>
-        <formatter>com.firefly.boot.common.ExampleLogFormatter</formatter>
+        <formatter>com.firefly.boot.common.BootLogFormatter</formatter>
     </logger>
 
 </loggers>

firefly-boot/src/main/resources/firefly-log.xml

@@ -14,21 +14,21 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <kotlin.version>1.3.0</kotlin.version>
-        <kotlin.coroutine.version>1.0.1</kotlin.coroutine.version>
+        <kotlin.version>{{kotlinVersion}}</kotlin.version>
+        <kotlin.coroutine.version>{{kotlinCoroutineVersion}}</kotlin.coroutine.version>
         <kotlin.compiler.incremental>false</kotlin.compiler.incremental>
         <kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
         <kotlin.compiler.languageVersion>1.3</kotlin.compiler.languageVersion>
         <kotlin.compiler.apiVersion>1.3</kotlin.compiler.apiVersion>
         <kotlin.code.style>official</kotlin.code.style>
 
-        <dokka.version>0.9.17</dokka.version>
+        <dokka.version>{{dokkaVersion}}</dokka.version>
         <dokka.config.noStdlibLink>true</dokka.config.noStdlibLink>
         <dokka.config.jdkVersion>8</dokka.config.jdkVersion>
 
         <firefly.version>{{fireflyVersion}}</firefly.version>
-        <jackson.version>2.9.7</jackson.version>
-        <redisson.version>3.9.0</redisson.version>
+        <jackson.version>{{jacksonVersion}}</jackson.version>
+        <redisson.version>{{redissonVersion}}</redisson.version>
     </properties>
 
     <dependencyManagement>