Merge branch 'dev' into rsh/AzureIdentityAuth

baywet · baywet · commit 95d46b705f00 · 2020-08-31T12:24:19.000-04:00
diff --git a/build.gradle b/build.gradle
@@ -27,9 +27,6 @@ dependencies {
     // This dependency is exported to consumers, that is to say found on their compile classpath.
     api 'org.apache.commons:commons-math3:3.6.1'
 
-    // This dependency is used internally, and not exposed to consumers on their own compile classpath.
-    implementation 'com.google.guava:guava:20.0'
-
     // Use JUnit test framework
     testImplementation 'junit:junit:4.13'
     //Mockito Mock framework
diff --git a/gradle.properties b/gradle.properties
@@ -27,7 +27,7 @@ mavenGroupId         = com.microsoft.graph
 mavenArtifactId      = microsoft-graph-core
 mavenMajorVersion    = 1
 mavenMinorVersion    = 0
-mavenPatchVersion    = 1
+mavenPatchVersion    = 2
 mavenArtifactSuffix = 
 nightliesUrl         = http://dl.bintray.com/MicrosoftGraph/Maven
 
diff --git a/readme.md b/readme.md
@@ -19,17 +19,19 @@ repository {
 
 dependency {
     // Include the sdk as a dependency
-    compile('com.microsoft.graph:microsoft-graph-core:1.0.1')
+    compile('com.microsoft.graph:microsoft-graph-core:1.0.2')
 }
 ```
 
 ### 1.2 Install via Maven
+
 Add the dependency in `dependencies` in pom.xml
-```dependency
+
+```xml
 <dependency>
 	<groupId>com.microsoft.graph</groupId>
 	<artifactId>microsoft-graph-core</artifactId>
-	<version>1.0.1</version>
+	<version>1.0.2</version>
 </dependency>
 ```
 
diff --git a/scripts/validateMavenVersion.ps1 b/scripts/validateMavenVersion.ps1
@@ -8,25 +8,24 @@
 .Description 
     Retrieves the local, Maven, and Bintray versions of the Java-Core build.
     Checks that the Maven and Bintray versions are aligned, trigger warning if not.
-    Checks that the current local version is greater than those currently deployed.
-.Parameter packageName
-    The package name to search in the Maven and JCenter repositories.
+    Checks that the current local version is greater than those currently deployed. 
 .Parameter propertiesPath
     The path pointing to the Gradle.Properties file.
 #>
 
-Param(
-    [parameter(Mandatory = $true)]
-    [string]$packageName,
 
-    [parameter(Mandatory = $true)]
+Param(
     [string]$propertiesPath
 )
 
 #Find the local version from the Gradle.Properties file
+if($propertiesPath -eq "" -or $null -eq $propertiesPath) {
+    $propertiesPath = Join-Path -Path $PSScriptRoot -ChildPath "../gradle.properties"
+}
 $file = get-item $propertiesPath
 $findLocalVersions = $file | Select-String -Pattern "mavenMajorVersion" -Context 0,2
 $findLocalVersions = $findLocalVersions -split "`r`n"
+$packageName = ($file | Select-String -Pattern "mavenArtifactId").Line.Split("=")[1].Trim()
 
 $localMajor = $findLocalVersions[0].Substring($findLocalVersions[0].Length-1)
 $localMinor = $findLocalVersions[1].Substring($findLocalVersions[1].Length-1)
@@ -61,9 +60,9 @@ if($mavenVersion -ne $bintrayVersion){
     Write-Warning "The current Maven and Bintray versions are not the same"
 }
 #Success if Local version has been updated, Error otherwise. 
-if($localVersion -gt $bintrayVersion){
+if($localVersion -gt $bintrayVersion -and $localVersion -gt $mavenVersion){
     Write-Host "The current pull request is of a greater version"
 }   
 else{
     Write-Error "The current local version is not updated. Please update the local version in the Gradle.Properties file."
-} 
+} 
diff --git a/src/main/java/com/microsoft/graph/httpcore/TelemetryHandler.java b/src/main/java/com/microsoft/graph/httpcore/TelemetryHandler.java
@@ -11,7 +11,7 @@
 public class TelemetryHandler implements Interceptor{
 
 	public static final String SDK_VERSION = "SdkVersion";
-	public static final String VERSION = "v1.0.1";
+	public static final String VERSION = "v1.0.2";
 	public static final String GRAPH_VERSION_PREFIX = "graph-java-core";
 	public static final String JAVA_VERSION_PREFIX = "java";
 	public static final String CLIENT_REQUEST_ID = "client-request-id";
