Merge pull request Azure#8 from anuchandy/gradlefix

Removed gitrevisions
xingwu1 · Apr 28, 2016 · 82bdc8b · 82bdc8b
2 parents 2a37759 + d56d5e0
commit 82bdc8b
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 71 deletions.
diff --git 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,13 +106,12 @@ 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
 }
 
 artifacts {
     archives sourcesJar
     archives javadocJar
-    archives file: file("${projectDir}/.gitrevision")
 }
diff --git 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,15 +79,14 @@ 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
 }
 
 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
@@ -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,15 +78,14 @@ 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
 }
 
 artifacts {
     archives sourcesJar
     archives javadocJar
-    archives file: file("${projectDir}/.gitrevision")
 }
 
 test {

diff --git 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,15 +89,14 @@ 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
 }
 
 artifacts {
     archives sourcesJar
     archives javadocJar
-    archives file: file("${projectDir}/.gitrevision")
 }
 
 test {

diff --git a/pom.xml b/pom.xml
@@ -244,29 +244,6 @@
           <artifactId>maven-release-plugin</artifactId>
           <version>2.5.2</version>
         </plugin>
-
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>build-helper-maven-plugin</artifactId>
-          <version>1.10</version>
-          <executions>
-            <execution>
-              <id>attach-artifacts</id>
-              <phase>package</phase>
-              <goals>
-                <goal>attach-artifact</goal>
-              </goals>
-              <configuration>
-                <artifacts>
-                  <artifact>
-                    <file>target/.gitrevision</file>
-                    <type>gitrevision</type>
-                  </artifact>
-                </artifacts>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>
       </plugins>
     </pluginManagement>
   </build>