From e5cbc4009e34c4ba8710fd78c4b72b0fd1e0bc0e Mon Sep 17 00:00:00 2001 From: anuchan Date: Wed, 27 Apr 2016 13:01:28 -0700 Subject: [PATCH 1/2] Fixing few compilation errors, removing gitrevision artifacts from the POM and Gradle files --- .../build.gradle | 1 - azure-client-authentication/build.gradle | 1 - azure-client-runtime/build.gradle | 1 - client-runtime/build.gradle | 1 - pom.xml | 23 ------------------- 5 files changed, 27 deletions(-) diff --git a/azure-android-client-authentication/build.gradle b/azure-android-client-authentication/build.gradle index 753fd4b7114e0..77563124163dc 100644 --- a/azure-android-client-authentication/build.gradle +++ b/azure-android-client-authentication/build.gradle @@ -124,5 +124,4 @@ task javadocJar(type: Jar, dependsOn: [javadoc, versionInfo]) { artifacts { archives sourcesJar archives javadocJar - archives file: file("${projectDir}/.gitrevision") } \ No newline at end of file diff --git a/azure-client-authentication/build.gradle b/azure-client-authentication/build.gradle index a04020e1fd378..1a729cf8ce596 100644 --- a/azure-client-authentication/build.gradle +++ b/azure-client-authentication/build.gradle @@ -97,7 +97,6 @@ task javadocJar(type: Jar, dependsOn: [javadoc, versionInfo]) { artifacts { archives sourcesJar archives javadocJar - archives file: file("${projectDir}/.gitrevision") } test { diff --git a/azure-client-runtime/build.gradle b/azure-client-runtime/build.gradle index dcdaddcea285b..ea93e20578caf 100644 --- a/azure-client-runtime/build.gradle +++ b/azure-client-runtime/build.gradle @@ -96,7 +96,6 @@ task javadocJar(type: Jar, dependsOn: [javadoc, versionInfo]) { artifacts { archives sourcesJar archives javadocJar - archives file: file("${projectDir}/.gitrevision") } test { diff --git a/client-runtime/build.gradle b/client-runtime/build.gradle index b734d33608eaf..96cddf05a92a4 100644 --- a/client-runtime/build.gradle +++ b/client-runtime/build.gradle @@ -107,7 +107,6 @@ task javadocJar(type: Jar, dependsOn: [javadoc, versionInfo]) { artifacts { archives sourcesJar archives javadocJar - archives file: file("${projectDir}/.gitrevision") } test { diff --git a/pom.xml b/pom.xml index ae5dc28eaff4b..98b38905b457f 100644 --- a/pom.xml +++ b/pom.xml @@ -244,29 +244,6 @@ maven-release-plugin 2.5.2 - - - org.codehaus.mojo - build-helper-maven-plugin - 1.10 - - - attach-artifacts - package - - attach-artifact - - - - - target/.gitrevision - gitrevision - - - - - - From b6592dabfefafa7d6492dd19cd364327c804df1d Mon Sep 17 00:00:00 2001 From: anuchan Date: Wed, 27 Apr 2016 13:22:34 -0700 Subject: [PATCH 2/2] Removing unused VersionInfo task from runtime gradle files --- azure-android-client-authentication/build.gradle | 12 +----------- azure-client-authentication/build.gradle | 12 +----------- azure-client-runtime/build.gradle | 12 +----------- client-runtime/build.gradle | 12 +----------- 4 files changed, 4 insertions(+), 44 deletions(-) diff --git a/azure-android-client-authentication/build.gradle b/azure-android-client-authentication/build.gradle index 77563124163dc..df85a81cc546d 100644 --- a/azure-android-client-authentication/build.gradle +++ b/azure-android-client-authentication/build.gradle @@ -95,16 +95,6 @@ uploadArchives { } } -task versionInfo(type:Exec){ - commandLine 'git rev-parse HEAD'.split() - ext.versionfile = new File("${projectDir}/.gitrevision") - standardOutput = new ByteArrayOutputStream() - - doLast { - versionfile.text = "Azure/autorest#" + standardOutput.toString() - } -} - task sourcesJar(type: Jar) { from android.sourceSets.main.java.srcDirs classifier = 'sources' @@ -116,7 +106,7 @@ task javadoc(type: Javadoc) { options.encoding = 'UTF-8' } -task javadocJar(type: Jar, dependsOn: [javadoc, versionInfo]) { +task javadocJar(type: Jar, dependsOn: [javadoc]) { classifier = 'javadoc' from javadoc.destinationDir } diff --git a/azure-client-authentication/build.gradle b/azure-client-authentication/build.gradle index 1a729cf8ce596..5f20108264785 100644 --- a/azure-client-authentication/build.gradle +++ b/azure-client-authentication/build.gradle @@ -70,16 +70,6 @@ test { } } -task versionInfo(type:Exec){ - commandLine 'git rev-parse HEAD'.split() - ext.versionfile = new File("${projectDir}/.gitrevision") - standardOutput = new ByteArrayOutputStream() - - doLast { - versionfile.text = "Azure/autorest#" + standardOutput.toString() - } -} - javadoc { options.encoding = 'UTF-8' } @@ -89,7 +79,7 @@ task sourcesJar(type: Jar, dependsOn:classes) { from sourceSets.main.allSource } -task javadocJar(type: Jar, dependsOn: [javadoc, versionInfo]) { +task javadocJar(type: Jar, dependsOn: [javadoc]) { classifier = 'javadoc' from javadoc.destinationDir } diff --git a/azure-client-runtime/build.gradle b/azure-client-runtime/build.gradle index ea93e20578caf..e8a50ca112428 100644 --- a/azure-client-runtime/build.gradle +++ b/azure-client-runtime/build.gradle @@ -69,16 +69,6 @@ test { } } -task versionInfo(type:Exec){ - commandLine 'git rev-parse HEAD'.split() - ext.versionfile = new File("${projectDir}/.gitrevision") - standardOutput = new ByteArrayOutputStream() - - doLast { - versionfile.text = "Azure/autorest#" + standardOutput.toString() - } -} - javadoc { options.encoding = 'UTF-8' } @@ -88,7 +78,7 @@ task sourcesJar(type: Jar, dependsOn:classes) { from sourceSets.main.allSource } -task javadocJar(type: Jar, dependsOn: [javadoc, versionInfo]) { +task javadocJar(type: Jar, dependsOn: [javadoc]) { classifier = 'javadoc' from javadoc.destinationDir } diff --git a/client-runtime/build.gradle b/client-runtime/build.gradle index 96cddf05a92a4..2558fc5055f9a 100644 --- a/client-runtime/build.gradle +++ b/client-runtime/build.gradle @@ -80,16 +80,6 @@ test { } } -task versionInfo(type:Exec){ - commandLine 'git rev-parse HEAD'.split() - ext.versionfile = new File("${projectDir}/.gitrevision") - standardOutput = new ByteArrayOutputStream() - - doLast { - versionfile.text = "Azure/autorest#" + standardOutput.toString() - } -} - javadoc { options.encoding = 'UTF-8' } @@ -99,7 +89,7 @@ task sourcesJar(type: Jar, dependsOn:classes) { from sourceSets.main.allSource } -task javadocJar(type: Jar, dependsOn: [javadoc, versionInfo]) { +task javadocJar(type: Jar, dependsOn: [javadoc]) { classifier = 'javadoc' from javadoc.destinationDir }