Merge pull request #53 from microsoftgraph/dev

release/1.0.2

Author: baywet

.azure-pipelines/buildAndPackage.yml

@@ -23,6 +23,7 @@ trigger:
       - gradlew.bat
       - readme.md
       - settings.gradle
+      - Scripts/*
 
 pr: none
 
@@ -82,6 +83,7 @@ steps:
       settings.gradle
       gradle.properties
       **/gradle/wrapper/*
+      Scripts/getLatestVersion.ps1
     TargetFolder: '$(Build.ArtifactStagingDirectory)/'
 
 - task: PublishBuildArtifacts@1

.azure-pipelines/prValidate.yml

@@ -1,4 +1,8 @@
-# Build and test Java Core to make sure a valid pull request is being made 
+#Copyright (c) Microsoft Corporation. All rights reserved.
+#Licensed under the MIT License.
+#Build and test Java Core to make sure a valid pull request is being made
+#Validate that the versions dont conflict with those online in case a pull request is made to main or master
+
 pr: 
   branches:
     include:
@@ -18,6 +22,7 @@ pr:
       - gradlew.bat
       - readme.md
       - settings.gradle
+      - Scripts/*
 
 trigger: none # disable triggers based on commits.
 
@@ -62,4 +67,4 @@ steps:
     title: '$(Build.DefinitionName) failure notification'
     text: 'This pipeline has failed. View the build details for further information. This is a blocking failure. '
   condition: and(failed(), ne(variables['Build.Reason'], 'Manual'))
-  enabled: true
+  enabled: true

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,37 @@
+<!-- Read me before you submit this issue
+
+First off, thank you for taking the time to open this issue! We do appreciate it. Please bear with us if we don't get to this right away.
+
+If this is a question about the Microsoft Graph service API, or a question about how to use this SDK, please post your question to StackOverflow with the [microsoftgraph] tag.
+https://stackoverflow.com/questions/tagged/microsoft-graph
+
+This repo is for the Microsoft Graph Java SDK. Issues opened in this repo should only target this SDK.
+
+Before you open this issue, did you:
+- Search the issues to determine whether someone already opened this issue?
+- Search StackOverflow for an answer?
+- Capture the repro steps and gather the information requested in the steps below to reproduce your scenario?
+- Review the samples under github.com/microsoftgraph? They can help for some scenarios.
+- Take a look at the functional tests in this repo? They may have an example for you. See the [functional tests](https://github.com/microsoftgraph/msgraph-sdk-java/tree/master/src/test/java/com/microsoft/graph/functional)
+
+Please provide the following before submitting this issue:
+- Expected behavior. Please provide **links to the specific [Microsoft Graph documentation](https://developer.microsoft.com/en-us/graph/docs/concepts/overview)** you used to determine the expected behavior. 
+- Actual behavior. Provide error codes, stack information, and a [Fiddler](http://www.telerik.com/fiddler) capture of the request and response (please remove personally identifiable information before posting).
+- Steps to reproduce the behavior. Include your code, IDE versions, client library versions, and any other information that might be helpful to understand your scenario.
+-->
+
+### Expected behavior
+
+
+
+
+### Actual behavior
+
+
+
+
+### Steps to reproduce the behavior
+
+
+
+

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,19 @@
+<!-- Read me before you submit this pull request
+
+First off, thank you for opening this pull request! We do appreciate it.
+
+The requests and models for this client library are generated. We won't be accepting pull requests for those code files. With that said, we do appreciate
+it when you open pull requests with the proposed file changes, as we'll use that to help guide us in updating our template files.
+
+-->
+
+<!-- Optional. Set the issues that this pull request fixes. Delete 'Fixes #' if there isn't an issue associated with this pull request. -->
+Fixes #
+
+<!-- Required. Provide specifics about what the changes are and why you're proposing these changes. -->
+### Changes proposed in this pull request
+-
+
+<!-- Optional. Provide related links. This might be other pull requests, code files, StackOverflow posts. Delete this section if it is not used. -->
+### Other links
+-

.github/dependabot.yml

@@ -0,0 +1,12 @@
+version: 2
+updates:
+- package-ecosystem: gradle
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
+- package-ecosystem: maven
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,54 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [dev, master]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [dev]
+  schedule:
+    - cron: '0 1 * * 4'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        # We must fetch at least the immediate parents so that if this is
+        # a pull request then we can checkout the head.
+        fetch-depth: 2
+
+    # If this run was triggered by a pull request event, then checkout
+    # the head of the pull request instead of the merge commit.
+    - run: git checkout HEAD^2
+      if: ${{ github.event_name == 'pull_request' }}
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      # Override language selection by uncommenting this and choosing your languages
+      with:
+        languages: java
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.github/workflows/conflicting-pr-label.yml

@@ -0,0 +1,34 @@
+# This is a basic workflow to help you get started with Actions
+
+name: PullRequestConflicting
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the master branch
+on:
+  push:
+    branches: [ master, dev ]
+  pull_request:
+    types: [synchronize]
+    branches: [ master, dev ]
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+    - name: check if prs are dirty
+      uses: eps1lon/actions-label-merge-conflict@releases/2.x
+      if: env.LABELING_TOKEN != '' && env.LABELING_TOKEN != null
+      id: check
+      with:
+        dirtyLabel: "conflicting"
+        repoToken: "${{ secrets.GITHUB_TOKEN  }}"
+        continueOnMissingPermissions: true
+        commentOnDirty: 'This pull request has conflicting changes, the author must resolve the conflicts before this pull request can be merged.'
+        commentOnClean: 'Conflicts have been resolved. A maintainer will take a look shortly.'
+      env:
+        LABELING_TOKEN: ${{secrets.GITHUB_TOKEN }}

Scripts/getLatestVersion.ps1

@@ -0,0 +1,31 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+<# 
+.Synopsis
+    Retrieve the latest version of the library
+.Description 
+    Retrieves the latest version specified in the Gradle.Properties file
+    Uses the retrieved values to update the enviornment variable VERSION_STRING
+.Parameter propertiesPath
+#>
+Param(
+    [string]$propertiesPath
+)
+
+#Retrieve the current version from the Gradle.Properties file given the specified path
+if($propertiesPath -eq "" -or $null -eq $propertiesPath) {
+    $propertiesPath = Join-Path -Path $PSScriptRoot -ChildPath "../gradle.properties"
+}
+$file = get-item $propertiesPath
+$findVersions = $file | Select-String -Pattern "mavenMajorVersion" -Context 0,2
+$findVersions = $findVersions -split "`r`n"
+
+$majorVersion = $findVersions[0].Substring($findVersions[0].Length-1)
+$minorVersion = $findVersions[1].Substring($findVersions[1].Length-1)
+$patchVersion = $findVersions[2].Substring($findVersions[2].Length-1)
+$version = "$majorVersion.$minorVersion.$patchVersion"
+
+#Update the VERSION_STRING env variable and inform the user
+Write-Host "##vso[task.setVariable variable=VERSION_STRING]$($version)";
+Write-Host "Updated the VERSION_STRING enviornment variable with the current Gradle.Properties, $version"

Scripts/validateMavenVersion.ps1

@@ -9,23 +9,22 @@
     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 propertiesPath
 #>
 
-.Parameter packageName
-.Parameter propertiesPath
 
 Param(
-    [parameter(Mandatory = $true)]
-    [string]$packageName,
-
-    [parameter(Mandatory = $true)]
     [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)
@@ -43,18 +42,26 @@ $bintrayAPIurl = "https://api.bintray.com/search/packages?name=$packageName"
 $jsonResult = $web_client.DownloadString($bintrayAPIurl) | ConvertFrom-Json
 $bintrayVersion = [version]$jsonResult.latest_version
 
+#If the api calls return empty then this library cannot be compared to the online versions
+#may proceed with the pull request
+if(($mavenVersion -eq $null) -and ($bintrayVersion -eq $null))
+{
+    Write-Information "This package does not exist yet in the online repository, therefore there are no versions to compare."
+    return
+}
+
 #Inform host of current Maven and Bintray versions
-write-host 'The current version in the Maven central repository is:' $mavenVersion
-write-host 'The current version in the Bintray central repository is:' $bintrayVersion
+Write-Host 'The current version in the Maven central repository is:' $mavenVersion
+Write-Host 'The current version in the Bintray central repository is:' $bintrayVersion
 
 #Warn in case Maven and Bintray versions are not the same.
 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."
-} 
+}