Add build information and extra properties to application.properties. F…

…ixes #142
griffon · Feb 3, 2016 · abc706e · abc706e
1 parent 4ffe4ae
commit abc706e
Show file tree

Hide file tree

Showing 30 changed files with 171 additions and 98 deletions.
diff --git a/...gradle-griffon-plugin/src/main/groovy/org/codehaus/griffon/gradle/GriffonExtension.groovy b/...gradle-griffon-plugin/src/main/groovy/org/codehaus/griffon/gradle/GriffonExtension.groovy
@@ -33,6 +33,8 @@ class GriffonExtension {
 
     String applicationIconName = 'griffon.icns'
 
+    Map applicationProperties = [:]
+
     GriffonExtension(Project project) {
     }
 }
diff --git a/...ts/gradle-griffon-plugin/src/main/groovy/org/codehaus/griffon/gradle/GriffonPlugin.groovy b/...ts/gradle-griffon-plugin/src/main/groovy/org/codehaus/griffon/gradle/GriffonPlugin.groovy
@@ -141,7 +141,7 @@ class GriffonPlugin implements Plugin<Project> {
                     'application.name'   : resolveApplicationName(project),
                     'application.version': project.version,
                     'griffon.version'    : extension.version
-                ])
+                ] + extension.applicationProperties)
             }
         }
     }
@@ -165,7 +165,7 @@ class GriffonPlugin implements Plugin<Project> {
                     'application.name'   : resolveApplicationName(project),
                     'application.version': project.version,
                     'griffon.version'    : extension.version
-                ])
+                ] + extension.applicationProperties)
             }
         }
     }

diff --git a/subprojects/griffon-core/src/main/java/griffon/core/env/Metadata.java b/subprojects/griffon-core/src/main/java/griffon/core/env/Metadata.java
@@ -120,7 +120,9 @@ public String get(@Nonnull String key) {
     @Nonnull
     public Set<String> keySet() {
         Set<String> keys = new LinkedHashSet<>();
-
+        for (Object key : properties.keySet()) {
+            keys.add(String.valueOf(key));
+        }
         return Collections.unmodifiableSet(keys);
     }
 }
diff --git a/templates/griffon-javafx-groovy-templates/templates/griffon-javafx-groovy/build.gradle b/templates/griffon-javafx-groovy-templates/templates/griffon-javafx-groovy/build.gradle
@@ -14,21 +14,31 @@ buildscript {
         classpath 'org.kordamp.gradle:stats-gradle-plugin:0.1.5'
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.12.0'
         classpath 'de.gliderpilot.gradle.jnlp:gradle-jnlp-plugin:0.2.1'
+        classpath 'net.nemerosa:versioning:1.6.0'
     }
 }
 
 apply plugin: 'groovy'
 apply plugin: 'org.codehaus.griffon.griffon'
+apply plugin: 'net.nemerosa.versioning'
+
+Date buildTimeAndDate = new Date()
+ext {
+    buildDate = new SimpleDateFormat('yyyy-MM-dd').format(buildTimeAndDate)
+    buildTime = new SimpleDateFormat('HH:mm:ss.SSSZ').format(buildTimeAndDate)
+    macosx = System.getProperty('os.name').contains('Mac OS')
+}
 
 griffon {
     disableDependencyResolution = false
     includeGroovyDependencies = true
     version = '${griffon_version}'
     toolkit = 'javafx'
-}
-
-ext {
-    macosx = System.getProperty('os.name').contains('Mac OS')
+    applicationProperties = [
+        'build.date'    : buildDate,
+        'build.time'    : buildTime,
+        'build.revision': versioning.info.commit
+    ]
 }
 
 mainClassName = '${project_package}.Launcher'
@@ -78,6 +88,8 @@ tasks.withType(GroovyCompile) {
 }
 
 import com.github.jengelman.gradle.plugins.shadow.transformers.*
+import java.text.SimpleDateFormat
+
 shadowJar {
     transform(ServiceFileTransformer)
     transform(ServiceFileTransformer) {

diff --git a/.../griffon-javafx-groovy-templates/templates/griffon-javafx-groovy/gradle/publishing.gradle b/.../griffon-javafx-groovy-templates/templates/griffon-javafx-groovy/gradle/publishing.gradle
@@ -1,10 +1,3 @@
-import java.text.SimpleDateFormat
-
-Date buildTimeAndDate = new Date()
-ext {
-    buildDate = new SimpleDateFormat('yyyy-MM-dd').format(buildTimeAndDate)
-    buildTime = new SimpleDateFormat('HH:mm:ss.SSSZ').format(buildTimeAndDate)
-}
 
 jar {
     manifest {
@@ -13,6 +6,7 @@ jar {
             'Created-By': "${System.properties['java.version']} (${System.properties['java.vendor']} ${System.properties['java.vm.version']})".toString(),
             'Build-Date': project.buildDate,
             'Build-Time': project.buildTime,
+            'Build-Revision': versioning.info.commit,
             'Specification-Title': project.name,
             'Specification-Version': project.version,
             'Implementation-Title': project.name,

diff --git a/...vy-templates/templates/griffon-javafx-groovy/griffon-app/resources/application.properties b/...vy-templates/templates/griffon-javafx-groovy/griffon-app/resources/application.properties
@@ -1,2 +1,5 @@
 application.name=@application.name@
 application.version=@application.version@
+build.date=@build.date@
+build.time=@build.time@
+build.revision=@build.revision@
diff --git a/templates/griffon-javafx-java-templates/templates/griffon-javafx-java/build.gradle b/templates/griffon-javafx-java-templates/templates/griffon-javafx-java/build.gradle
@@ -14,21 +14,31 @@ buildscript {
         classpath 'org.kordamp.gradle:stats-gradle-plugin:0.1.5'
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.12.0'
         classpath 'de.gliderpilot.gradle.jnlp:gradle-jnlp-plugin:0.2.1'
+        classpath 'net.nemerosa:versioning:1.6.0'
     }
 }
 
 apply plugin: 'groovy'
 apply plugin: 'org.codehaus.griffon.griffon'
+apply plugin: 'net.nemerosa.versioning'
+
+Date buildTimeAndDate = new Date()
+ext {
+    buildDate = new SimpleDateFormat('yyyy-MM-dd').format(buildTimeAndDate)
+    buildTime = new SimpleDateFormat('HH:mm:ss.SSSZ').format(buildTimeAndDate)
+    macosx = System.getProperty('os.name').contains('Mac OS')
+}
 
 griffon {
     disableDependencyResolution = false
     includeGroovyDependencies = false
     version = '${griffon_version}'
     toolkit = 'javafx'
-}
-
-ext {
-    macosx = System.getProperty('os.name').contains('Mac OS')
+    applicationProperties = [
+        'build.date'    : buildDate,
+        'build.time'    : buildTime,
+        'build.revision': versioning.info.commit
+    ]
 }
 
 mainClassName = '${project_package}.Launcher'
@@ -80,6 +90,8 @@ tasks.withType(GroovyCompile) {
 }
 
 import com.github.jengelman.gradle.plugins.shadow.transformers.*
+import java.text.SimpleDateFormat
+
 shadowJar {
     transform(ServiceFileTransformer)
     transform(ServiceFileTransformer) {

diff --git a/...ates/griffon-javafx-java-templates/templates/griffon-javafx-java/gradle/publishing.gradle b/...ates/griffon-javafx-java-templates/templates/griffon-javafx-java/gradle/publishing.gradle
@@ -1,10 +1,3 @@
-import java.text.SimpleDateFormat
-
-Date buildTimeAndDate = new Date()
-ext {
-    buildDate = new SimpleDateFormat('yyyy-MM-dd').format(buildTimeAndDate)
-    buildTime = new SimpleDateFormat('HH:mm:ss.SSSZ').format(buildTimeAndDate)
-}
 
 jar {
     manifest {
@@ -13,6 +6,7 @@ jar {
             'Created-By': "${System.properties['java.version']} (${System.properties['java.vendor']} ${System.properties['java.vm.version']})".toString(),
             'Build-Date': project.buildDate,
             'Build-Time': project.buildTime,
+            'Build-Revision': versioning.info.commit,
             'Specification-Title': project.name,
             'Specification-Version': project.version,
             'Implementation-Title': project.name,

diff --git a/...java-templates/templates/griffon-javafx-java/griffon-app/resources/application.properties b/...java-templates/templates/griffon-javafx-java/griffon-app/resources/application.properties
@@ -1,2 +1,5 @@
 application.name=@application.name@
 application.version=@application.version@
+build.date=@build.date@
+build.time=@build.time@
+build.revision=@build.revision@
diff --git a/templates/griffon-lanterna-groovy-templates/templates/griffon-lanterna-groovy/build.gradle b/templates/griffon-lanterna-groovy-templates/templates/griffon-lanterna-groovy/build.gradle
@@ -14,21 +14,31 @@ buildscript {
         classpath 'org.kordamp.gradle:stats-gradle-plugin:0.1.5'
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.12.0'
         classpath 'de.gliderpilot.gradle.jnlp:gradle-jnlp-plugin:0.2.1'
+        classpath 'net.nemerosa:versioning:1.6.0'
     }
 }
 
 apply plugin: 'groovy'
 apply plugin: 'org.codehaus.griffon.griffon'
+apply plugin: 'net.nemerosa.versioning'
+
+Date buildTimeAndDate = new Date()
+ext {
+    buildDate = new SimpleDateFormat('yyyy-MM-dd').format(buildTimeAndDate)
+    buildTime = new SimpleDateFormat('HH:mm:ss.SSSZ').format(buildTimeAndDate)
+    macosx = System.getProperty('os.name').contains('Mac OS')
+}
 
 griffon {
     disableDependencyResolution = false
     includeGroovyDependencies = true
     version = '${griffon_version}'
     toolkit = 'lanterna'
-}
-
-ext {
-    macosx = System.getProperty('os.name').contains('Mac OS')
+    applicationProperties = [
+        'build.date'    : buildDate,
+        'build.time'    : buildTime,
+        'build.revision': versioning.info.commit
+    ]
 }
 
 mainClassName = '${project_package}.Launcher'
@@ -69,6 +79,8 @@ tasks.withType(GroovyCompile) {
 }
 
 import com.github.jengelman.gradle.plugins.shadow.transformers.*
+import java.text.SimpleDateFormat
+
 shadowJar {
     transform(ServiceFileTransformer)
     transform(ServiceFileTransformer) {

diff --git a/...ffon-lanterna-groovy-templates/templates/griffon-lanterna-groovy/gradle/publishing.gradle b/...ffon-lanterna-groovy-templates/templates/griffon-lanterna-groovy/gradle/publishing.gradle
@@ -1,10 +1,3 @@
-import java.text.SimpleDateFormat
-
-Date buildTimeAndDate = new Date()
-ext {
-    buildDate = new SimpleDateFormat('yyyy-MM-dd').format(buildTimeAndDate)
-    buildTime = new SimpleDateFormat('HH:mm:ss.SSSZ').format(buildTimeAndDate)
-}
 
 jar {
     manifest {
@@ -13,6 +6,7 @@ jar {
             'Created-By': "${System.properties['java.version']} (${System.properties['java.vendor']} ${System.properties['java.vm.version']})".toString(),
             'Build-Date': project.buildDate,
             'Build-Time': project.buildTime,
+            'Build-Revision': versioning.info.commit,
             'Specification-Title': project.name,
             'Specification-Version': project.version,
             'Implementation-Title': project.name,

diff --git a/...-templates/templates/griffon-lanterna-groovy/griffon-app/resources/application.properties b/...-templates/templates/griffon-lanterna-groovy/griffon-app/resources/application.properties
@@ -1,2 +1,5 @@
 application.name=@application.name@
 application.version=@application.version@
+build.date=@build.date@
+build.time=@build.time@
+build.revision=@build.revision@
diff --git a/templates/griffon-lanterna-java-templates/templates/griffon-lanterna-java/build.gradle b/templates/griffon-lanterna-java-templates/templates/griffon-lanterna-java/build.gradle
@@ -14,21 +14,31 @@ buildscript {
         classpath 'org.kordamp.gradle:stats-gradle-plugin:0.1.5'
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.12.0'
         classpath 'de.gliderpilot.gradle.jnlp:gradle-jnlp-plugin:0.2.1'
+        classpath 'net.nemerosa:versioning:1.6.0'
     }
 }
 
 apply plugin: 'groovy'
 apply plugin: 'org.codehaus.griffon.griffon'
+apply plugin: 'net.nemerosa.versioning'
+
+Date buildTimeAndDate = new Date()
+ext {
+    buildDate = new SimpleDateFormat('yyyy-MM-dd').format(buildTimeAndDate)
+    buildTime = new SimpleDateFormat('HH:mm:ss.SSSZ').format(buildTimeAndDate)
+    macosx = System.getProperty('os.name').contains('Mac OS')
+}
 
 griffon {
     disableDependencyResolution = false
     includeGroovyDependencies = false
     version = '${griffon_version}'
     toolkit = 'lanterna'
-}
-
-ext {
-    macosx = System.getProperty('os.name').contains('Mac OS')
+    applicationProperties = [
+        'build.date'    : buildDate,
+        'build.time'    : buildTime,
+        'build.revision': versioning.info.commit
+    ]
 }
 
 mainClassName = '${project_package}.Launcher'
@@ -71,6 +81,8 @@ tasks.withType(GroovyCompile) {
 }
 
 import com.github.jengelman.gradle.plugins.shadow.transformers.*
+import java.text.SimpleDateFormat
+
 shadowJar {
     transform(ServiceFileTransformer)
     transform(ServiceFileTransformer) {

diff --git a/.../griffon-lanterna-java-templates/templates/griffon-lanterna-java/gradle/publishing.gradle b/.../griffon-lanterna-java-templates/templates/griffon-lanterna-java/gradle/publishing.gradle
@@ -1,10 +1,3 @@
-import java.text.SimpleDateFormat
-
-Date buildTimeAndDate = new Date()
-ext {
-    buildDate = new SimpleDateFormat('yyyy-MM-dd').format(buildTimeAndDate)
-    buildTime = new SimpleDateFormat('HH:mm:ss.SSSZ').format(buildTimeAndDate)
-}
 
 jar {
     manifest {
@@ -13,6 +6,7 @@ jar {
             'Created-By': "${System.properties['java.version']} (${System.properties['java.vendor']} ${System.properties['java.vm.version']})".toString(),
             'Build-Date': project.buildDate,
             'Build-Time': project.buildTime,
+            'Build-Revision': versioning.info.commit,
             'Specification-Title': project.name,
             'Specification-Version': project.version,
             'Implementation-Title': project.name,

diff --git a/...va-templates/templates/griffon-lanterna-java/griffon-app/resources/application.properties b/...va-templates/templates/griffon-lanterna-java/griffon-app/resources/application.properties
@@ -1,2 +1,5 @@
 application.name=@application.name@
 application.version=@application.version@
+build.date=@build.date@
+build.time=@build.time@
+build.revision=@build.revision@
diff --git a/templates/griffon-pivot-groovy-templates/templates/griffon-pivot-groovy/build.gradle b/templates/griffon-pivot-groovy-templates/templates/griffon-pivot-groovy/build.gradle
@@ -14,21 +14,31 @@ buildscript {
         classpath 'org.kordamp.gradle:stats-gradle-plugin:0.1.5'
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.12.0'
         classpath 'de.gliderpilot.gradle.jnlp:gradle-jnlp-plugin:0.2.1'
+        classpath 'net.nemerosa:versioning:1.6.0'
     }
 }
 
 apply plugin: 'groovy'
 apply plugin: 'org.codehaus.griffon.griffon'
+apply plugin: 'net.nemerosa.versioning'
+
+Date buildTimeAndDate = new Date()
+ext {
+    buildDate = new SimpleDateFormat('yyyy-MM-dd').format(buildTimeAndDate)
+    buildTime = new SimpleDateFormat('HH:mm:ss.SSSZ').format(buildTimeAndDate)
+    macosx = System.getProperty('os.name').contains('Mac OS')
+}
 
 griffon {
     disableDependencyResolution = false
     includeGroovyDependencies = true
     version = '${griffon_version}'
     toolkit = 'pivot'
-}
-
-ext {
-    macosx = System.getProperty('os.name').contains('Mac OS')
+    applicationProperties = [
+        'build.date'    : buildDate,
+        'build.time'    : buildTime,
+        'build.revision': versioning.info.commit
+    ]
 }
 
 mainClassName = '${project_package}.Launcher'
@@ -70,6 +80,8 @@ tasks.withType(GroovyCompile) {
 }
 
 import com.github.jengelman.gradle.plugins.shadow.transformers.*
+import java.text.SimpleDateFormat
+
 shadowJar {
     transform(ServiceFileTransformer)
     transform(ServiceFileTransformer) {

diff --git a/...es/griffon-pivot-groovy-templates/templates/griffon-pivot-groovy/gradle/publishing.gradle b/...es/griffon-pivot-groovy-templates/templates/griffon-pivot-groovy/gradle/publishing.gradle
@@ -1,10 +1,3 @@
-import java.text.SimpleDateFormat
-
-Date buildTimeAndDate = new Date()
-ext {
-    buildDate = new SimpleDateFormat('yyyy-MM-dd').format(buildTimeAndDate)
-    buildTime = new SimpleDateFormat('HH:mm:ss.SSSZ').format(buildTimeAndDate)
-}
 
 jar {
     manifest {
@@ -13,6 +6,7 @@ jar {
             'Created-By': "${System.properties['java.version']} (${System.properties['java.vendor']} ${System.properties['java.vm.version']})".toString(),
             'Build-Date': project.buildDate,
             'Build-Time': project.buildTime,
+            'Build-Revision': versioning.info.commit,
             'Specification-Title': project.name,
             'Specification-Version': project.version,
             'Implementation-Title': project.name,

diff --git a/...ovy-templates/templates/griffon-pivot-groovy/griffon-app/resources/application.properties b/...ovy-templates/templates/griffon-pivot-groovy/griffon-app/resources/application.properties
@@ -1,2 +1,5 @@
 application.name=@application.name@
 application.version=@application.version@
+build.date=@build.date@
+build.time=@build.time@
+build.revision=@build.revision@