Merge pull request #99 from microsoftgraph/dev

master sync and 1.0.6 release

Author: baywet

.azure-pipelines/buildAndPackage.yml

@@ -85,7 +85,7 @@ steps:
       settings.gradle
       gradle.properties
       **/gradle/wrapper/*
-      Scripts/getLatestVersion.ps1
+      Scripts/**
     TargetFolder: '$(Build.ArtifactStagingDirectory)/'
 
 - task: PublishBuildArtifacts@1

.azure-pipelines/prValidate.yml

@@ -43,13 +43,6 @@ steps:
   inputs:
     debugMode: false
 
-- task: PowerShell@2
-  condition: and(failed(), eq(variables['Build.SourceBranchName'], 'dev'))
-  inputs:
-    filePath: '$(System.DefaultWorkingDirectory)\Scripts\validateMavenVersion.ps1'
-    pwsh: true
-    arguments: '-packageName "$(PACKAGE_NAME)" -propertiesPath "$(PROPERTIES_PATH)"'
-
 - task: Gradle@2
   inputs:
     gradleWrapperFile: 'gradlew'

.editorconfig

@@ -0,0 +1,5 @@
+[*.java]
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @baywet @ddyett @MichaelMainer @nikithauc @zengin 

.github/dependabot.yml

@@ -5,7 +5,7 @@ updates:
   schedule:
     interval: daily
   open-pull-requests-limit: 10
-- package-ecosystem: maven
+- package-ecosystem: github-actions
   directory: "/"
   schedule:
     interval: daily

.gitignore

@@ -31,5 +31,4 @@ hs_err_pid*
 
 # Maven
 /target/
-/pom.xml
 local.properties

Scripts/incrementMinorVersion.ps1

@@ -0,0 +1,59 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+<#
+.Synopsis
+    Increment the minor version string in the gradle.properties if the major,
+    minor, or patch version hasn't been manually updated.
+.Description
+    Assumptions:
+        Targets Gradle.properties
+        This script assumes it is run from the repo root.
+        Minor version is typically auto-incremented.
+
+#>
+
+function Update-ReadmeVersion([string]$readmeFilePath, [version]$version) {
+	$readmeFileContent = Get-Content -Path $readmeFilePath -Raw
+	$readmeFileContent = $readmeFileContent -replace "\d{1,}\.\d{1,}\.\d{1,}", $version.ToString()
+	Set-Content -Path $readmeFilePath $readmeFileContent
+}
+
+function Update-TelemetryVersion([string]$telemetryFilePath, [version]$version) {
+	$telemetryFileContent = Get-Content -Path $telemetryFilePath -Raw
+	$telemetryFileContent = $telemetryFileContent -replace "\d{1,}\.\d{1,}\.\d{1,}", $version.ToString()
+	Set-Content -Path $telemetryFilePath $telemetryFileContent
+}
+
+function Update-PackageVersion([string]$propertiesFilePath, [version]$version) {
+	$propertiesFileContent = Get-Content -Path $propertiesFilePath -Raw
+	$propertiesFileContent = $propertiesFileContent -replace "mavenMajorVersion\s+=\s+\d{1,}", "mavenMajorVersion = $($version.Major)"
+	$propertiesFileContent = $propertiesFileContent -replace "mavenMinorVersion\s+=\s+\d{1,}", "mavenMinorVersion = $($version.Minor)"
+	$propertiesFileContent = $propertiesFileContent -replace "mavenPatchVersion\s+=\s+\d{1,}", "mavenPatchVersion = $($version.Build)"
+	Set-Content -Path $propertiesFilePath $propertiesFileContent
+}
+function Get-CurrentTelemetryVersion([string]$telemetryFilePath) {
+	$telemetryFileContent = Get-Content -Path $telemetryFilePath -Raw
+	if($telemetryFileContent -match "(\d{1,}\.\d{1,}\.\d{1,})") {
+		return [version]::Parse($Matches[1])
+	} else {
+		Write-Error "Invalid version number format"
+		return $null;
+	}
+}
+
+function Update-MinorVersionNumber([version]$currentVersion) {
+	return [version]::new($currentVersion.Major, $currentVersion.Minor + 1, 0);
+}
+
+function Update-MinorVersion() {
+	$readmeFilePath = Join-Path -Path $PWD.ToString() -ChildPath "../readme.md"
+	$propertiesFilePath = Join-Path -Path $PWD.ToString() -ChildPath "../gradle.properties"
+	$telemetryFilePath = Join-Path -Path $PWD.ToString() -ChildPath "../src/main/java/com/microsoft/graph/httpcore/TelemetryHandler.java"
+	$currentVersion = Get-CurrentTelemetryVersion -telemetryFilePath $telemetryFilePath
+	$nextVersion = Update-MinorVersionNumber -currentVersion $currentVersion
+	Update-ReadmeVersion -version $nextVersion -readmeFilePath $readmeFilePath
+	Update-TelemetryVersion -version $nextVersion -telemetryFilePath $telemetryFilePath
+	Update-PackageVersion -version $nextVersion -propertiesFilePath $propertiesFilePath
+}
+Update-MinorVersion

Scripts/validateMavenVersion.ps1

@@ -20,6 +20,14 @@ java {
     modularity.inferModulePath = true
 }
 
+sourceSets {
+    main {
+        java {
+            exclude 'pom.xml'
+        }
+    }
+}
+
 // In this section you declare where to find the dependencies of your project
 repositories {
     // Use jcenter for resolving your dependencies.
@@ -30,7 +38,7 @@ repositories {
 
 dependencies {
     // Use JUnit test framework
-    testImplementation 'junit:junit:4.13'
+    testImplementation 'junit:junit:4.13.1'
 
     api 'com.squareup.okhttp3:okhttp:3.12.1'
 

build.gradle

@@ -25,7 +25,7 @@ mavenGroupId         = com.microsoft.graph
 mavenArtifactId      = microsoft-graph-core
 mavenMajorVersion    = 1
 mavenMinorVersion    = 0
-mavenPatchVersion    = 5
+mavenPatchVersion    = 6
 mavenArtifactSuffix = 
 nightliesUrl         = http://dl.bintray.com/MicrosoftGraph/Maven