[pack] Modified build directories (#121)

Updated publish directories.

Author: yojagad

azure-pipelines.yml

@@ -27,6 +27,7 @@ jobs:
   condition: ne(dependencies.InitializePipeline.outputs['Initialize.BuildArtifacts'], true)
   variables:
     mvnPrefix: $[dependencies.InitializePipeline.outputs['Initialize.MvnPackagePrefix']]
+    mvnVersion: $[dependencies.InitializePipeline.outputs['Initialize.MvnPackageVersion']]
   pool:
     vmImage: 'vs2017-win2016'
   steps:
@@ -35,7 +36,7 @@ jobs:
     name: MvnBuild
     inputs:
       filePath: '$(Build.Repository.LocalPath)\build\MvnBuildAndPackage.ps1'
-      arguments: '-mvnPrefix ''$(mvnPrefix)'''
+      arguments: '-mvnPrefix ''$(mvnPrefix)'' -mvnVersion ''$(mvnVersion)'''
 
 - job: BuildArtifacts
   dependsOn: 
@@ -45,6 +46,7 @@ jobs:
     releaseVersionNumber: $[dependencies.InitializePipeline.outputs['Initialize.BuildNumber']]
     mvnPrefix: $[dependencies.InitializePipeline.outputs['Initialize.MvnPackagePrefix']]
     buildCounter: $[counter(variables['releaseVersionNumber'], 1)]
+    mvnVersion: $[dependencies.InitializePipeline.outputs['Initialize.MvnPackageVersion']]
   pool:
     vmImage: 'vs2017-win2016'
   steps:
@@ -146,11 +148,11 @@ jobs:
     name: MvnBuildAndPackage
     inputs:
       filePath: '$(Build.Repository.LocalPath)\build\mvnBuildAndPackage.ps1'
-      arguments: '-mvnPrefix ''$(mvnPrefix)'''
+      arguments: '-mvnPrefix ''$(mvnPrefix)'' -mvnVersion ''$(mvnVersion)'''
   - publish: $(Build.Repository.LocalPath)\packages\Microsoft.Azure.WebJobs.Extensions.RabbitMQ
-    artifact: Microsoft.Azure.WebJobs.Extensions.RabbitMQ.$(releaseVersionNumber)
+    artifact: NugetPackage
   - publish: $(Build.Repository.LocalPath)\binding-library\java\ToBePublished
-    artifact: $(mvnPrefix)
+    artifact: MavenPackage
 
 - job: RunTests
   pool:

build/initialize-pipeline.ps1

@@ -10,24 +10,30 @@ $version = $xmlContent.project.version
 $outputXmlFileName = ([string] ("$artifactid-$version")).Trim()
 Write-Host "Prefix generated from pom.xml is $outputXmlFileName"
 Write-Host "##vso[task.setvariable variable=MvnPackagePrefix;isOutput=true]$outputXmlFileName"
+Write-Host "Version generated from pom.xml is $version"
+Write-Host "##vso[task.setvariable variable=MvnPackageVersion;isOutput=true]$version"
+
 
 # Figure out nuget build number
 $xml = [Xml] (Get-Content "$versionPath\\WebJobs.Extensions.RabbitMQ.csproj")
 $version = ([string]($xml.Project.PropertyGroup.Version)).Trim()
 
 $buildReason = $env:BUILD_REASON
 $branch = $env:BUILD_SOURCEBRANCH
+$buildArtifacts = $false
 
 if ($buildReason -eq "PullRequest") {
   # parse PR title to see if we should pack this
   $response = Invoke-RestMethod api.github.com/repos/$env:BUILD_REPOSITORY_ID/pulls/$env:SYSTEM_PULLREQUEST_PULLREQUESTNUMBER
   $title = $response.title.ToLowerInvariant()
   Write-Host "Pull request '$title'"
   if ($title.Contains("[pack]")) {
-    Write-Host "##vso[task.setvariable variable=BuildArtifacts;isOutput=true]true"
-    Write-Host "Setting 'BuildArtifacts' to true."
+	$buildArtifacts = $true
   }
 }
 
+Write-Host "Value of 'BuildArtifacts' is $buildArtifacts."
+Write-Host "##vso[task.setvariable variable=BuildArtifacts;isOutput=true]$buildArtifacts"
+	
 Write-Host "Version is $version"
 Write-Host "##vso[task.setvariable variable=BuildNumber;isOutput=true]$version"

build/mvnBuildAndPackage.ps1

@@ -1,5 +1,6 @@
 param(
-	[Parameter(Mandatory=$true)][string]$mvnPrefix
+	[Parameter(Mandatory=$true)][string]$mvnPrefix,
+	[Parameter(Mandatory=$true)][string]$mvnVersion
 )
 
 Write-Host "Mvn prefix is $mvnPrefix"
@@ -9,11 +10,11 @@ cd binding-library/java
 .\mvnBuild.bat
 
 #Copy items to be published
-mkdir ToBePublished
-Copy-Item pom.xml "ToBePublished\$mvnPrefix.xml"
-Copy-Item "target\$mvnPrefix.jar" "ToBePublished\$mvnPrefix.jar"
-Copy-Item "target\$mvnPrefix-javadoc.jar" "ToBePublished\$mvnPrefix-javadoc.jar"
-Copy-Item "target\$mvnPrefix-sources.jar" "ToBePublished\$mvnPrefix-sources.jar"
+mkdir ToBePublished\$mvnVersion
+Copy-Item pom.xml "ToBePublished\$mvnVersion\$mvnPrefix.pom"
+Copy-Item "target\$mvnPrefix.jar" "ToBePublished\$mvnVersion\$mvnPrefix.jar"
+Copy-Item "target\$mvnPrefix-javadoc.jar" "ToBePublished\$mvnVersion\$mvnPrefix-javadoc.jar"
+Copy-Item "target\$mvnPrefix-sources.jar" "ToBePublished\$mvnVersion\$mvnPrefix-sources.jar"