Merge pull request #12 from Azure/javavnext

Merge javavnext into master

README.md

@@ -1,2 +1,22 @@
-# autorest-clientruntime-for-java
+[![Build Status](https://travis-ci.org/Azure/autorest-clientruntime-for-java.svg?branch=javavnext)](https://travis-ci.org/Azure/autorest-clientruntime-for-java)
+
+# AutoRest Client Runtimes for Java
 The runtime libraries for AutoRest generated Java clients.
+
+## Repository structure
+
+### client-runtime
+This is the generic runtime. You will need this for AutoRest generated library using Java code generator.
+
+### azure-client-runtime
+This is the runtime with Azure specific customizations. You will need this for AutoRest generated library using Azure.Java code generator.
+
+### azure-client-authentication
+This package provides access to Active Directory authentication on JDK using OrgId or application ID / secret combinations. Multi-factor-auth is currently not supported.
+
+### azure-android-client-authentication
+This package provides access to Active Directory authentication on Android. You can login with Microsoft accounts, OrgId, with or without multi-factor-auth.
+
+## Build
+To build this repository, you will need maven 2.0+ and gradle 1.6+.
+Maven is used for [Java SDK](https://github.com/Azure/azure-sdk-for-java) when it's used as a submodule in there. Gradle is used for [AutoRest](https://github.com/Azure/autorest) when it's used as a submodule in there.

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")
 }

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 {

azure-client-runtime/build.gradle

@@ -20,7 +20,7 @@ checkstyle {
 }
 
 dependencies {
-    compile 'com.microsoft.rest:client-runtime:1.0.0-beta1'
+    compile 'com.microsoft.rest:client-runtime:1.0.0-SNAPSHOT'
     testCompile 'junit:junit:4.12'
     testCompile 'junit:junit-dep:4.11'
     deployerJars "org.apache.maven.wagon:wagon-ftp:2.10"
@@ -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 {