Merge pull request #10 from evgeny-goldin/maven-plugin

ExtractorMojo - sets "buildInfo.buildNumber" to "buildInfo.buildTimestam...
jfrog · Jul 14, 2013 · d341792 · d341792
2 parents 83fe36e + 32e69ec
commit d341792
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/...maven3-plugin/src/main/groovy/org/jfrog/build/extractor/maven/plugin/ExtractorMojo.groovy b/...maven3-plugin/src/main/groovy/org/jfrog/build/extractor/maven/plugin/ExtractorMojo.groovy
@@ -143,9 +143,10 @@ class ExtractorMojo extends GroovyMojo
     @Requires({ buildInfo && session && project })
     private void updateBuildInfo ()
     {
-        buildInfo.buildTimestamp = session.startTime.time.toString()
+        buildInfo.buildTimestamp = session.startTime.time as String
         buildInfo.buildStarted   = new SimpleDateFormat( 'yyyy-MM-dd\'T\'HH:mm:ss.SSSZ' ).format( session.startTime ) // 2013-06-23T18\:38\:37.597+0200
-        buildInfo.buildName      = buildInfo.buildName ?: project.artifactId
+        buildInfo.buildName      = buildInfo.buildName   ?: project.artifactId
+        buildInfo.buildNumber    = buildInfo.buildNumber ?: buildInfo.buildTimestamp
     }
 
 

diff --git a/...-plugin/src/main/groovy/org/jfrog/build/extractor/maven/plugin/ExtractorMojoHelper.groovy b/...-plugin/src/main/groovy/org/jfrog/build/extractor/maven/plugin/ExtractorMojoHelper.groovy
@@ -119,12 +119,13 @@ class ExtractorMojoHelper
     {
         assert prefixPropertyHandlers.values().each { assert it.delegate.props.is( artifactory.delegate.root.props ) }
 
-        final mergedProperties       = new Properties()
-        final deployPropertiesPrefix = ClientProperties.PROP_DEPLOY_PARAM_PROP_PREFIX
-        final deployProperties       = (( Properties ) readProperties( deployProperties ).collectEntries {
-            String key, String value -> [ "${ deployPropertiesPrefix }${ key }", value ]
-        }) + [ ( "${ deployPropertiesPrefix }${ BuildInfoFields.BUILD_TIMESTAMP }".toString()) : buildInfo.buildTimestamp,
-               ( "${ deployPropertiesPrefix }${ BuildInfoFields.BUILD_NAME }".toString())      : buildInfo.buildName ]
+        final mergedProperties = new Properties()
+        final deployProperties = ( [ ( BuildInfoFields.BUILD_TIMESTAMP ) : buildInfo.buildTimestamp,
+                                     ( BuildInfoFields.BUILD_NAME      ) : buildInfo.buildName,
+                                     ( BuildInfoFields.BUILD_NUMBER    ) : buildInfo.buildNumber ] +
+                                   readProperties( deployProperties )).collectEntries {
+            String key, String value -> [ "${ ClientProperties.PROP_DEPLOY_PARAM_PROP_PREFIX }${ key }".toString(), value ]
+        }
 
         addProperties(( Map<String, String> ) readProperties( mojo.propertiesFile ) + readProperties( mojo.properties ),
                       mergedProperties )