Merged and fixed azure/master, moved to new Razor tool (#1787)

* Ref resolving improvements (#1708)

* composite external resolving revised

* preprocessor (header resolving)

* tmp YAML merging override to unblock arm-recoveryservicesbackup (#1713)

[NOTE] - Admin merging because TravisCI has dishonored itself and should be shamed.

* tmp composite swagger merge override to unblock arm-recoveryservicesbackup

* skip test

* Added code to change the data type of ItemType (#1711)

* Extension proposal (#1638)

[Admin merging  - docs ]
* fixed typo in autorest.json files

* Fixed linefeeds, better c# simplifier

* regenerated python (line endings)

* regenerated ruby (line endings)

* regenerated nodejs (line endings)

* regenerated c# (line endings)

* regenerated samples (line endings)

* merged from master and regenerated

* whitelist assemblies that should be signed

* imported draft document

* [Ruby] Making credentials nil by default (#1677)

* Making credentials nil by default

* Regenerated Samples

* [Linter Rules] M1005, M1006, M1007 & M1009 (#1706)

* Implement OperationNameValidation Rule for M1005, M1006, M1007 & M1009

* Update warning message

* Adding swagger modeler validation tests

* Correcting the clean swagger and improving the rules correctness

* [linter Rules] Swagger rules M2005 - long running operation must have valid terminal status codes (#1707)

* Long running operations must have valid success response codes.

* Adding swagger modeler validation tests for invalid long running reponse codes

* Adding nullable check on response codes before schema resolver

* Adding positive test case for correctly modeled x-ms-long-running

* Correct the merge conflicted resx file syntax

* Add insights swagger spec test, add vm extensions to swagger and schema (#1512)

* Add ServiceBus AzureResourceSchema acceptance test

* Add insights swagger spec test

* Add minLength and maxLength support to schema generator

* Fixing logic to add missing schema resources

* Working on discriminator stuff

* Change schemas that only have an 'object' type definition to be empty

* Add compute test with extension properties

* Add additional enum values for extensionType discriminator

* missing test files

* Update SwaggerSpecHelper.cs

unnecessary file change

* Update SwaggerSpecHelper.cs

unnecessary file change

* [Linter Rules] M2008 for x-ms-mutability extension (#1712)

* x-ms-mutability swagger linter rules

* Removing <<<< characters

* undo unblocking fix (#1718)

* Improvements for Mono & Docker users (#1714)

* Make Docker shell script executable

* Remove unnecessary dependencies

* Update documentation for AutoRest Mono/Docker usage

* Better preprocessor and 3 bugfixes (#1717)

* general $inc handling

* more preproc magic

* move up path params and do cleanup

* fixed Stream.Null codegen

* enum default escaping

* added operationId and title as optional properties of the example schema (#1725)

* Fix NullReferenceException (#1722)

See #1721 for problem and solution.

* minor code cleanup in swagger validation rule file (#1724)

* Generator should not flatten out parameters if they are polymorphic (#1726)

* Changes to markdown file generation in AzureResourceSchema generator. (#1715)

The doc team requested the following changes so they can start consuming
the generated markdown help files.
- generate a separate file for each resource type
- use namespace/type instead of just namespace
- include optional properties in the template sample
- move type into its own column
- remove line-breaks from tables
- re-word some of the boiler-plate text
- don't bold text when listing a type's values

* Relaxing naming rules to accomodate suffix words in names

* [Go] Telemetry tiny detail (#1731)

* Fix for credentials switch (#1728)

* Fix for list and dict serialization (#1727)

* [Java] AutoRest changes by runtime changes (#1703)

* Fix some tests with beta5 snapshot runtime

* Runtime change: mapperAdapter to serializerAdapter

* Runtime change: CollectionFormat moved

* Runtime changes: Use RestClient for generic clients

* Fix paging test

* Get rid of gradle and use maven

* Use pluggable response builder

* Finish up response builder factory

* [Azure/autorest-clientruntime-for-java#119] rename ServiceCall#create()

* [fixes Azure/autorest-clientruntime-for-java#125] remove all references to old callback classes

* Revert to previous next method annotation

* Support fragmented paging

* [#1426] Tests for fragment paging

* Update scripts and docs to use maven

* Support custom logging interceptor

* Remove composite swagger modeler fix

* Remove android footprint

* Reduce complexity on exception construction

* Consistent naming for getters and setters

* Remove duplicate RestClient imports

* Fix maven test runner in gulpfile

* Fix Enum name generation

* Add JsonProperty everywhere

* Regenerate samples

* Fixed AutoRest.Python.Azure.Tests.AcceptanceTests.SampleTestForGeneratingPython (#1759)

* Update AcceptanceTests.cs

* Update SwaggerSpecHelper.cs

* Remove Azure extensions configuration from __init__ in Python (#1745)

* Remove nextLink check in Python

* Remove Azure extensions from __init__ in Python

* Regenerate Python tests

* [Azure.Python] Update setup.py dependency on msrestazure

* [Azure.Python] Regenerate Azure Python tests

* Xml support (#1744)

* Swagger schema adjustment

* wip -1

* removed old xml gen

* xml model

* tests

* real path

* additional test

* test server

* wip 5

* xml wip

* missing files

* fixes

* Tweaked enum serialization

* generic deserialization

* isWrapped serialization support

* rfc date

* niklas

* new properties

* fix response header creation

* refactor and remove custom (de)serialization

* naming

* unnecessary whitespace change

* fixed templates to be non-xml sensitive

* regen

* regen

* fixed nullable dictionary xml deserialization and regened petstoreV2

* cleanup

* xml serialization fix

* fixed testcase

* another special case for list serialization

* Literate File Formats (#1743)

* Drafting Literate docs

* test data format

* updated doc

* more

* literate Swagger

* added literate-metadata

* added literate-metadata

* updated docs

* Got rid of ReadOnly validation (#1749)

* Fixed and improved UniqueResourcePaths linter rule (#1768)

* fixed UniqueResourcePaths

* addressed feedback

* cleaner code gen (less unnecessary code) (#1771)

* Make S.X.X a build-time dependency.

* Fix #1738 (#1772)

* cleaner code gen (less unnecessary code)

* add disambiguation

* fixed test

* regex valitation for dictionary values (#1773)

* Code changes to generate resources/subresources (#1769)

Code changes to generate resources/subresources in ruby based on the standard definitions defined in MSRestAzure

* Removing sanitization for redable output paths

* Eliminate // in the Path output

* Update SwaggerModelerCompareTests

* Fix generation of ARM markdown help files. (#1765)

Include API specific name property instead of the generic one (it provides
better doc text than the generic "name of the resource" one).
Merge AllOf/Properties into a flat list so that AllOf is included.
Removed EnsureUniqueFileName as it's not needed.
Fix unnecessary nesting output directories.
Fixed a silly bug in InlineLink missing a '#' character.

* Adding new property for readable log output

* Linter Validation rules (#1751)

* Adding Validation Rule to check the format for API Version

* Fix the regular expression

* Added validation to check the HTTP Verb

* Added validation to check the properties of resources and their read only preoperties

* Added validation is resource validation must have x-ms-azure-resource extension

* Fixed the condition

* Added Validation to check if the delete operation have empty body

* Added validation to validate x-ms-client-name field

* Fix the signature

* Added validation to check the response of put/get/patch operations

* Fixed the signature

* Added validation to discourage usage of Guid

* Added code to validate if operations API has been implemented

* Added code to validate tracked resources

* Added code to validate properties of tracked resources

* Additional changes

* Fix the Build Issue

* Response to PR comments

* Added Test cases

* Added more test cases

* Fixing test cases

* Removed circular dependency test case

* adjusted master's changes & used new razor tool

.travis.yml

@@ -6,12 +6,6 @@ addons:
     sources:
     - deadsnakes
     packages:
-    # Packages required for android build
-    - libc6-i386
-    - lib32stdc++6
-    - lib32gcc1
-    - lib32ncurses5
-    - lib32z1
     # packages for python
     - python3.5
 before_install:
@@ -30,12 +24,6 @@ install:
   - gem install bundler
   - bundle install
   - pip install --user tox
-  # Install android SDK
-  - mkdir android
-  - wget -qO- "http://dl.google.com/android/android-sdk_r23.0.2-linux.tgz" | tar -zxv -C ./android
-  - echo y | ./android/android-sdk-linux/tools/android update sdk --all --filter platform-tools,android-23,build-tools-23.0.1 --no-ui --force
-  - echo y | ./android/android-sdk-linux/tools/android update sdk --all --filter extra-android-support,extra-android-m2repository,extra-google-m2repository --no-ui --force
-  - export ANDROID_HOME=`pwd`/android/android-sdk-linux
   # Install NetCore RC2
   - sudo sh -c 'echo "deb [arch=amd64] https://apt-mo.trafficmanager.net/repos/dotnet/ trusty main" > /etc/apt/sources.list.d/dotnetdev.list' 
   - sudo apt-key adv --keyserver apt-mo.trafficmanager.net --recv-keys 417A0893

README.md

@@ -16,9 +16,35 @@ Alternatively it can be installed from [Chocolatey](https://chocolatey.org/) by
 Nightlies are available via MyGet:
 [![AutoRest MyGet](https://img.shields.io/myget/autorest/vpre/autorest.svg?style=flat-square)](https://www.myget.org/gallery/autorest)
 
-AutoRest can be run on OSX and Unix using Mono or by running Docker container:
-
-	docker pull azuresdk/autorest:latest
+AutoRest can be run on macOS and *nix using [Mono](http://www.mono-project.com/download):
+
+  # Download & Unpack Autorest
+  curl -LO https://github.com/Azure/autorest/releases/download/AutoRest-0.16.0/autorest.0.16.0.zip && \
+  unzip autorest.0.16.0.zip -d autorest/ && \
+  cd autorest && \
+
+  # Download Swagger.json example
+  curl -O https://raw.githubusercontent.com/Azure/autorest/master/Samples/petstore/petstore.json && \
+
+  # Run AutoRest using mono
+  mono AutoRest.exe \
+    -CodeGenerator CSharp \
+    -Input petstore.json \
+    -OutputDirectory CSharp_PetStore -Namespace PetStore
+
+Or [Docker](https://docs.docker.com/engine/installation):
+
+  # Download Swagger.json example
+  curl -O https://raw.githubusercontent.com/Azure/autorest/master/Samples/petstore/petstore.json
+
+  # Download latest AutoRest Docker image
+  docker pull azuresdk/autorest:latest
+
+  # Run AutoRest using Docker, mounting the current folder (pwd) into /home inside the container
+  docker run -it --rm -v $(pwd):/home azuresdk/autorest:latest autorest \
+    -CodeGenerator CSharp \
+    -Input /home/petstore.json \
+    -OutputDirectory /home/CSharp_PetStore -Namespace PetStore
 
 ## Building AutoRest
 AutoRest is developed primarily in C# but generates code for multiple languages. See [this link](docs/developer/guide/building-code.md) to build and test AutoRest.

Samples/petstore/CSharp/Models/XmlSerialization.cs

@@ -0,0 +1,90 @@
+namespace Petstore
+{
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Xml;
+    using System.Xml.Linq;
+    internal static class XmlSerialization
+    {
+        internal delegate bool XmlRootDeserializer<T>( XElement root, out T result );
+        internal delegate bool XmlDeserializer<T>( XElement parent, string propertyName, out T result );
+        internal static XmlRootDeserializer<T> Root<T>( XmlDeserializer<T> deserializer ) =>
+            (XElement root, out T result) => deserializer(new XElement("artificialRoot", root), root.Name.LocalName, out result);
+        private static XmlDeserializer<T> Unroot<T>( XmlRootDeserializer<T> deserializer )
+        {
+            return (XElement parent, string propertyName, out T result) => {
+                result = default(T);
+                var element = parent.Element(propertyName);
+                if (element == null)
+                {
+                    return false;
+                }
+                return deserializer(element, out result);
+            };
+        }
+        private static XmlRootDeserializer<T> ToRootDeserializer<T>( System.Func<XElement, T> unsafeDeserializer )
+            => (XElement root, out T result) => {
+                try
+                {
+                    result = unsafeDeserializer(root);
+                    return true;
+                }
+                catch
+                {
+                    result = default(T);
+                    return false;
+                }};
+        internal static XmlDeserializer<T> ToDeserializer<T>( System.Func<XElement, T> unsafeDeserializer )
+            => Unroot(ToRootDeserializer(unsafeDeserializer));
+        internal static XmlDeserializer<IList<T>> CreateListXmlDeserializer<T>( XmlDeserializer<T> elementDeserializer, string elementTagName = null /*if isWrapped = false*/ )
+        {
+            if (elementTagName != null)
+            {
+                // create non-wrapped deserializer and forward
+                var slave = CreateListXmlDeserializer( elementDeserializer );
+                return (XElement parent, string propertyName, out IList<T> result) => {
+                    result = null;
+                    var wrapper = parent.Element(propertyName);
+                    return wrapper != null && slave(wrapper, elementTagName, out result);
+                };
+            }
+            var rootElementDeserializer = Root(elementDeserializer);
+            return (XElement parent, string propertyName, out IList<T> result) => {
+                result = new List<T>();
+                foreach (var element in parent.Elements(propertyName))
+                {
+                    T elementResult;
+                    if (!rootElementDeserializer(element, out elementResult))
+                    {
+                        return false;
+                    }
+                    result.Add(elementResult);
+                }
+                return true;
+            };
+        }
+        internal static XmlDeserializer<IDictionary<string, T>> CreateDictionaryXmlDeserializer<T>( XmlDeserializer<T> elementDeserializer )
+        {
+            return (XElement parent, string propertyName, out IDictionary<string, T> result) => {
+                result = null;
+                var childElement = parent.Element(propertyName);
+                if (childElement == null)
+                {
+                    return false;
+                }
+                result = new Dictionary<string, T>();
+                foreach (var element in childElement.Elements())
+                {
+                    T elementResult;
+                    if (!elementDeserializer(childElement, element.Name.LocalName, out elementResult))
+                    {
+                        return false;
+                    }
+                    result.Add(element.Name.LocalName, elementResult);
+                }
+                return true;
+            };
+        }
+    }
+}
+

Tools/dockerfiles/Dockerfile

@@ -1,20 +1,20 @@
 FROM mono:4.2
 
-# all in one RUN to produce less, smaller layers
+ARG AUTOREST_VERSION=0.16.0
+
+ADD autorest /opt/autorest/autorest
+
+# all-in-one RUN to produce smaller image with less layers
 RUN apt-get -qqy update && \
 	apt-get -qqy upgrade && \
-	apt-get -qqy install wget unzip && \
+	apt-get -qqy install bsdtar && \
 	apt-get clean && \
-	rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-RUN bash -c "\
-	mkdir /opt/autorest && \
-	cd /opt/autorest && \
-	wget https://github.com/Azure/autorest/releases/download/AutoRest-0.16.0/autorest.0.16.0.zip && \
-	unzip autorest.0.16.0.zip"
+	rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
 
-ADD autorest /opt/autorest/autorest
+	curl -#SL https://github.com/Azure/autorest/releases/download/AutoRest-$AUTOREST_VERSION/autorest.$AUTOREST_VERSION.zip | \
+	bsdtar -xvf- -C /opt/autorest/ && \
+	chmod +x /opt/autorest/autorest
 
 ENV PATH "$PATH:/opt/autorest/"
 
-WORKDIR /opt/autorest/
+WORKDIR /opt/autorest/

Tools/setup-developerworkstation.ps1

@@ -13,25 +13,6 @@ write-host -fore Yellow "YES"
 write-host -fore cyan "Info: making temp directory."
 $null = mkdir -ea 0 c:\tmp
 
-Function Get-AndroidHomeFromRegistry
-{
-    if ([environment]::GetEnvironmentVariable("ProgramFiles(x86)")) {
-        $androidRegistryKey = "HKLM:\SOFTWARE\Wow6432Node\Android SDK Tools"
-    }
-    else {
-        $androidRegistryKey = "HKLM:\SOFTWARE\Android SDK Tools"
-    }
-
-    if (Test-Path $androidRegistryKey) {
-        $path = (Get-ItemProperty $androidRegistryKey Path).Path
-
-        if (-not (Test-Path -ea 0 $path)) {
-            $path = $null
-        }
-    }
-    return $path
-}
-
 function DiffPathFromRegistry {
     $u = ([System.Environment]::GetEnvironmentVariable( "path", 'User'))
     $m = ([System.Environment]::GetEnvironmentVariable( "path", 'Machine'))
@@ -72,16 +53,6 @@ if( !(get-command -ea 0 java.exe) ) {
 write-host -fore darkcyan "      Setting JAVA_HOME environment key."
 ([System.Environment]::SetEnvironmentVariable('JAVA_HOME',  (resolve-path "$((get-command -ea 0 javac).Source)..\..\..").Path , "Machine" ))
 
-# install Android SDK
-if( ! (Get-AndroidHomeFromRegistry) ) {
-    write-host -fore cyan "Info: Installing Android SDK."
-    $null = install-package -provider chocolatey android-sdk -force
-    if( ! (Get-AndroidHomeFromRegistry) ) { return write-error "No Android SDK Installed" }
-    # set the environment variable for the user.
-}
-write-host -fore darkcyan "      setting ANDROID_HOME environment key."
-([System.Environment]::SetEnvironmentVariable('ANDROID_HOME', (Get-AndroidHomeFromRegistry) ,'Machine'))
-
 # Install node.js
 if( !(get-command -ea 0 node.exe) ) { 
     write-host -fore cyan "Info: Installing NodeJS."
@@ -307,19 +278,19 @@ if( !(get-command -ea 0 tox.exe) ) {
     if( !(get-command -ea 0 tox.exe) ) { return write-error "No TOX  in PATH." }
 }
 
-# install gradle
-if( !(get-command -ea 0 gradle.bat) ) { 
-    write-host -fore cyan "Info: Downloading Gradle"
-    (New-Object System.Net.WebClient).DownloadFile("https://services.gradle.org/distributions/gradle-3.1-all.zip", "c:\tmp\gradle-3.1-all.zip" )
-    if( !(test-path -ea 0  "c:\tmp\gradle-3.1-all.zip") ) { return write-error "Unable to download Gradle" }
-    write-host -fore darkcyan "      Unpacking Gradle."
-    Expand-Archive C:\tmp\gradle-3.1-all.zip -DestinationPath c:\
-    write-host -fore darkcyan "      Adding gradle to system PATH."
+# install maven
+if( !(get-command -ea 0 mvn.cmd) ) { 
+    write-host -fore cyan "Info: Downloading Maven"
+    (New-Object System.Net.WebClient).DownloadFile("http://www-eu.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.zip", "c:\tmp\apache-maven-3.3.9-bin.zip" )
+    if( !(test-path -ea 0  "c:\tmp\apache-maven-3.3.9-bin.zip") ) { return write-error "Unable to download Maven" }
+    write-host -fore darkcyan "      Unpacking Maven."
+    Expand-Archive C:\tmp\apache-maven-3.3.9-bin.zip -DestinationPath c:\
+    write-host -fore darkcyan "      Adding mvn to system PATH."
     $p = ([System.Environment]::GetEnvironmentVariable( "path", 'Machine'))
-    $p = "$p;c:\gradle-3.1\bin"
+    $p = "$p;c:\apache-maven-3.3.9\bin"
     ([System.Environment]::SetEnvironmentVariable( "path", $p,  'Machine'))
     ReloadPathFromRegistry
-    if( !(get-command -ea 0 gradle.bat) ) { return write-error "No Gradle in PATH." }
+    if( !(get-command -ea 0 mvn.cmd) ) { return write-error "No Maven in PATH." }
 }
 
 #install go 

Tools/verify-settings.ps1

@@ -203,32 +203,6 @@ function Find-OrAdd ( $cmd , $folders = @("${env:ProgramFiles(x86)}","${env:Prog
     }
 }
 
-Function Get-AndroidHomeFromRegistry
-{
-    # if ([Environment]::Is64BitOperatingSystem)
-    # powershell v1 doesn't have is 64 bit flag.
-    if ([environment]::GetEnvironmentVariable("ProgramFiles(x86)"))
-    {
-        $androidRegistryKey = "HKLM:\SOFTWARE\Wow6432Node\Android SDK Tools"
-    }
-    else
-    {
-        $androidRegistryKey = "HKLM:\SOFTWARE\Android SDK Tools"
-    }
-
-    if (Test-Path $androidRegistryKey)
-    {
-        $path = (Get-ItemProperty $androidRegistryKey Path).Path
-
-        if (-not (Test-Path $path))
-        {
-            $path = $null
-        }
-    }
-
-    return $path
-}
-
 find-orAdd "dotnet.exe" -hint "See: https://www.microsoft.com/net/core#windows"
 find-orAdd "msbuild.exe" -hint "Install Visual studio 2015"
 
@@ -239,7 +213,7 @@ find-orAdd "gulp.cmd" -hint "maybe use 'npm install -g gulp'" -folders @("${env:
 
 find-orAdd "ruby.exe" (@() +  ((dir -ea 0 c:\ruby*).fullname) + @( "${env:ProgramFiles(x86)}","${env:ProgramFiles}","c:\tools")) -hint "see http://rubyinstaller.org/downloads/"
 
-find-orAdd "gradle.bat" ( @( "${env:ProgramFiles(x86)}","${env:ProgramFiles}","c:\tools")) -hint "see http://gradle.org/gradle-download/"
+find-orAdd "mvn.cmd" ( @( "${env:ProgramFiles(x86)}","${env:ProgramFiles}","c:\tools")) -hint "see https://maven.apache.org/download.cgi"
 
 find-orAdd "python.exe" (@() +  ((dir -ea 0 c:\python*).fullname) + @( "${env:ProgramFiles(x86)}","${env:ProgramFiles}","c:\tools")) -hint "https://www.python.org/downloads/"
 find-orAdd "tox.exe" (@() +  ((dir -ea 0 c:\python*).fullname) + @( "${env:ProgramFiles(x86)}","${env:ProgramFiles}","c:\tools"))   -hint "maybe use 'pip install tox'"
@@ -259,19 +233,6 @@ if( (!$env:JAVA_HOME) -or (!(test-path  -PathType Container $env:JAVA_HOME )) )
     }
 }
 
-# use this to add the missing SDK
-# .\Install-AndroidSDK.ps1  -RequestedAndroidPackages android-23 -apilevel 23
-
-if( (!$env:ANDROID_HOME) -or (!(test-path  -PathType Container $env:ANDROID_HOME )) ) {
-    $android = Get-AndroidHomeFromRegistry
-    if (! $android ) {
-        write-host -fore red "Environment variable ANDROID_HOME not set correctly."
-        $failing = $true
-    } else {
-        $env:ANDROID_HOME= $android
-    }
-}
-
 if( !$failing  ) {
     write-host -fore green "`n`nTools/Environment are OK"
 } else {

attic/build.proj.xml

@@ -102,6 +102,7 @@
   <!-- CodeGenerator projects that can be built into packages -->
   <ItemGroup>
     <PackageableLibraries Include="$(LibraryRoot)/src/core/AutoRest/project.json" />
+    <PackageableLibraries Include="$(LibraryRoot)/src/dev/AutoRest.Preview/project.json" />
   </ItemGroup>
 
   <!-- Our Custom Tasks -->
@@ -181,6 +182,7 @@
   <-->
   <ItemGroup>
     <XProjFiles Include="src/core/AutoRest/AutoRest.xproj" />
+    <XProjFiles Include="src/dev/AutoRest.Preview/AutoRest.Preview.xproj" />
     <XProjFiles Include="src/core/AutoRest.Core/AutoRest.Core.xproj" />
     <XProjFiles Include="src/core/AutoRest.Core.Tests/AutoRest.Core.Tests.xproj" />
     <XProjFiles Include="src/core/AutoRest.Extensions/AutoRest.Extensions.xproj" />

attic/gulpfile.js

@@ -361,23 +361,6 @@ gulp.task('regenerate:expected:javaazurefluent', function(cb){
   }, cb);
 })
 
-gulp.task('test:clientruntime:java:init', ['test:java:init'], function(){
-  return gulp.src('./').pipe(shell(basePathOrThrow() + '/gradlew :client-runtime:check'));
-});
-gulp.task('test:clientruntime:javaazure:init', ['test:clientruntime:java:init'], function(){
-  return gulp.src('./').pipe(shell(basePathOrThrow() + '/gradlew :azure-client-runtime:check'));
-});
-
-gulp.task('test:java:init', function(cb){
-   if(fs.existsSync(basePathOrThrow()+'/src/client')){
-     // clean the src/client dir
-     del.sync(['./src/client/'], cb);
-   } 
-   fs.mkdir(basePathOrThrow()+'/src/client/');
-   //clone the Java ClientRuntime repo
-   return gulp.src('./').pipe(shell('git clone --branch v1.0.0-beta3 https://github.com/azure/autorest-clientruntime-for-java.git src/client/Java --depth=1'));
-});
-
 gulp.task('regenerate:expected:java', function(cb){
   mappings = {};
   for (var key in defaultMappings) {
@@ -792,8 +775,8 @@ gulp.task('test:ruby:azure', ['regenerate:expected:rubyazure'], shell.task('ruby
 gulp.task('test:python', function(cb){ runAsync('tox', {cwd: './src/generator/AutoRest.Python.Tests/'}, cb) });
 gulp.task('test:python:azure', function(cb){ runAsync('tox', {cwd: './src/generator/AutoRest.Python.Azure.Tests/'}, cb) });
 
-gulp.task('test:java', ['test:java:init', 'test:clientruntime:java:init', 'test:clientruntime:javaazure:init'], shell.task(basePathOrThrow() + '/gradlew :codegen-tests:check', {cwd: './', verbosity: 3}));
-gulp.task('test:java:azure', shell.task(basePathOrThrow() + '/gradlew :azure-codegen-tests:check', {cwd: './', verbosity: 3}));
+gulp.task('test:java', shell.task('mvn test -pl src/generator/AutoRest.Java.Tests', {verbosity: 3}));
+gulp.task('test:java:azure', shell.task('mvn test -pl src/generator/AutoRest.Java.Azure.Tests', {verbosity: 3}));
 
 gulp.task('test:go', ['regenerate:expected:go'], shell.task([
     'glide up',