Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ExtractorMojo - sets "buildInfo.buildNumber" to "buildInfo.buildTimestam... #10

Merged
merged 1 commit into from
Jul 14, 2013
Merged

ExtractorMojo - sets "buildInfo.buildNumber" to "buildInfo.buildTimestam... #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ...maven3-plugin/src/main/groovy/org/jfrog/build/extractor/maven/plugin/ExtractorMojo.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}


Expand Down
13 changes: 7 additions & 6 deletions ...-plugin/src/main/groovy/org/jfrog/build/extractor/maven/plugin/ExtractorMojoHelper.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down