Merge branch 'dev' into feature/v3

Author: baywet

CODE_OF_CONDUCT.md

@@ -0,0 +1,9 @@
+# Microsoft Open Source Code of Conduct
+
+This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
+
+Resources:
+
+- [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/)
+- [Microsoft Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/)
+- Contact [[email protected]](mailto:[email protected]) with questions or concerns

CONTRIBUTING.md

@@ -22,7 +22,8 @@ If major functionality is being added, or there will need to be gestation time f
 Revisions of this nature will result in a 0.X.X change of the version number.
 
 ## Submit pull requests for model or request files
-You can revise code in the extension folders of these folders. See [Extending the Library](https://github.com/microsoftgraph/msgraph-sdk-java/wiki/Extending-the-Library) for more information on how to work with the generated parts of the library.
+
+All the code of the current repository is being generated automatically by the [SDK generator](https://github.com/microsoftgraph/MSGraph-SDK-Code-Generator/) in which any change must be reflected.
 
 ## Add yourself as a contributor
 

README.md

@@ -1,6 +1,6 @@
 # Microsoft Graph SDK for Java
 
-[![Download](https://api.bintray.com/packages/microsoftgraph/Maven/microsoft-graph/images/download.svg)](https://bintray.com/microsoftgraph/Maven/microsoft-graph/_latestVersion)
+[![Download](https://img.shields.io/maven-central/v/com.microsoft.graph/microsoft-graph.svg)](https://search.maven.org/artifact/com.microsoft.graph/microsoft-graph)
 
 Get started with the Microsoft Graph SDK for Java by integrating the [Microsoft Graph API](https://developer.microsoft.com/en-us/graph/get-started/java) into your Java application!
 
@@ -14,7 +14,7 @@ Add the repository and a compile dependency for `microsoft-graph` to your projec
 
 ```gradle
 repositories {
-    jcenter()
+    mavenCentral()
 }
 
 dependencies {
@@ -95,18 +95,14 @@ graphClient
   });
 ```
 
-For a general overview of how the SDK is designed, see [overview](https://github.com/microsoftgraph/msgraph-sdk-java/wiki/Overview).
-
 ## 4. Documentation
 
 For more detailed documentation, see:
 
-* [Overview](https://github.com/microsoftgraph/msgraph-sdk-java/wiki/Overview)
-* [Extending the library](https://github.com/microsoftgraph/msgraph-sdk-java/wiki/Extending-the-Library)
-* [Handling Open Types, PATCH support with `null` values](https://github.com/microsoftgraph/msgraph-sdk-java/wiki/Working-with-Open-Types)
-* [Collections](https://github.com/microsoftgraph/msgraph-sdk-java/wiki/Working-with-Collections)
-* [Making custom requests](https://github.com/microsoftgraph/msgraph-sdk-java/wiki/Custom-Requests)
-* [Known issues](https://github.com/microsoftgraph/msgraph-sdk-java/wiki/Known-Issues)
+* [Overview](https://docs.microsoft.com/graph/overview)
+* [Collections](https://docs.microsoft.com/graph/sdks/paging)
+* [Making requests](https://docs.microsoft.com/graph/sdks/create-requests)
+* [Known issues](https://github.com/MicrosoftGraph/msgraph-sdk-java/issues)
 * [Contributions](https://github.com/microsoftgraph/msgraph-sdk-java/blob/master/CONTRIBUTING.md)
 
 ## 5. Issues

SECURITY.md

@@ -0,0 +1,41 @@
+<!-- BEGIN MICROSOFT SECURITY.MD V0.0.5 BLOCK -->
+
+## Security
+
+Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/).
+
+If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://docs.microsoft.com/en-us/previous-versions/tn-archive/cc751383(v=technet.10)), please report it to us as described below.
+
+## Reporting Security Issues
+
+**Please do not report security vulnerabilities through public GitHub issues.**
+
+Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://msrc.microsoft.com/create-report).
+
+If you prefer to submit without logging in, send email to [[email protected]](mailto:[email protected]).  If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://www.microsoft.com/en-us/msrc/pgp-key-msrc).
+
+You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://www.microsoft.com/msrc). 
+
+Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
+
+  * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
+  * Full paths of source file(s) related to the manifestation of the issue
+  * The location of the affected source code (tag/branch/commit or direct URL)
+  * Any special configuration required to reproduce the issue
+  * Step-by-step instructions to reproduce the issue
+  * Proof-of-concept or exploit code (if possible)
+  * Impact of the issue, including how an attacker might exploit the issue
+
+This information will help us triage your report more quickly.
+
+If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://microsoft.com/msrc/bounty) page for more details about our active programs.
+
+## Preferred Languages
+
+We prefer all communications to be in English.
+
+## Policy
+
+Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://www.microsoft.com/en-us/msrc/cvd).
+
+<!-- END MICROSOFT SECURITY.MD BLOCK -->

android/build.gradle

@@ -11,16 +11,13 @@ buildscript {
         classpath "com.gradle:gradle-enterprise-gradle-plugin:3.5"
         classpath "com.android.tools.build:gradle:4.0.1"
         classpath "com.github.ben-manes:gradle-versions-plugin:0.36.0"
-        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5"
     }
 }
 
 repositories {
     google()
     gradlePluginPortal()
-    jcenter {//TODO remove when releasing
-        url 'http://oss.jfrog.org/artifactory/oss-snapshot-local'
-    }
+    maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } //TODO remove when releasing
 }
 
 apply plugin: "com.android.library"

android/gradle.properties

@@ -29,7 +29,6 @@ mavenMajorVersion    = 2
 mavenMinorVersion    = 3
 mavenPatchVersion    = 1
 mavenArtifactSuffix = 
-nightliesUrl         = http://dl.bintray.com/MicrosoftGraph/Maven
 
 #These values are used to run functional tests
 #If you wish to run the functional tests, edit the gradle.properties

build.gradle

@@ -13,7 +13,6 @@ plugins {
     id 'eclipse'
     id 'maven-publish'
     id 'signing'
-    id 'com.jfrog.bintray' version '1.8.5'
 }
 
 java {
@@ -36,13 +35,9 @@ sourceSets {
 
 // In this section you declare where to find the dependencies of your project
 repositories {
-    // Use jcenter for resolving your dependencies.
     // You can declare any Maven/Ivy/file repository here.
-    jcenter()
     mavenCentral()
-    jcenter { //TODO remove when releasing
-        url 'http://oss.jfrog.org/artifactory/oss-snapshot-local'
-	}
+    maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } //TODO remove when releasing
 }
 
 apply from: "gradle/dependencies.gradle"
@@ -139,34 +134,6 @@ publishing {
     			}
             }
         }
-        
-        maven {
-            url = 'http://oss.jfrog.org/artifactory/oss-snapshot-local'
-            name = 'jfrogSnapshot'
-            
-            credentials {
-    			if (project.rootProject.file('local.properties').exists()) {
-        			Properties properties = new Properties()
-        			properties.load(project.rootProject.file('local.properties').newDataInputStream())
-        			username = (properties.containsKey('bintray.user')) ? properties.getProperty('bintray.user').toLowerCase() : "BINTRAY_USERNAME"
-        			password = properties.getProperty('bintray.apikey')
-    			}
-            }
-		}
-
-        maven {
-            url = 'https://oss.jfrog.org/artifactory/libs-release'
-            name = 'jfrog'
-            
-            credentials {
-    			if (project.rootProject.file('local.properties').exists()) {
-        			Properties properties = new Properties()
-        			properties.load(project.rootProject.file('local.properties').newDataInputStream())
-        			username = (properties.containsKey('bintray.user')) ? properties.getProperty('bintray.user').toLowerCase() : "BINTRAY_USERNAME"
-        			password = properties.getProperty('bintray.apikey')
-    			}
-            }
-		}
     }
 }
 
@@ -182,38 +149,6 @@ def fixAscNames = { name ->
         name.replace('msgraph-sdk-java', "${project.property('mavenArtifactId')}-${mavenMajorVersion}.${mavenMinorVersion}.${mavenPatchVersion}")
     }
 }
-bintray {
-    if (project.rootProject.file('local.properties').exists()) {
-        Properties properties = new Properties()
-        properties.load(project.rootProject.file('local.properties').newDataInputStream())
-        user = (properties.containsKey('bintray.user')) ? properties.getProperty('bintray.user').toLowerCase() : "BINTRAY_USERNAME"
-        key = properties.getProperty('bintray.apikey')
-    }
-	publications = ['mavenCentralRelease']
-    filesSpec {
-        from ('build/libs') {
-            include 'msgraph-sdk-java*.jar.asc'
-            rename fixAscNames
-        }
-        from ('build') {
-            include 'generated-pom.xml.asc'
-            rename fixAscNames
-        }
-        into "com/microsoft/graph/${project.property('mavenArtifactId')}/${mavenMajorVersion}.${mavenMinorVersion}.${mavenPatchVersion}/"
-    }
-	pkg {
-		repo = 'Maven'
-		name = project.property('mavenArtifactId')
-		userOrg = 'microsoftgraph'
-		licenses = ['MIT']
-		vcsUrl = 'https://github.com/microsoftgraph/msgraph-sdk-java.git'
-		publicDownloadNumbers = true
-		version {
-			name = "${mavenMajorVersion}.${mavenMinorVersion}.${mavenPatchVersion}"
-			vcsTag = "${mavenMajorVersion}.${mavenMinorVersion}.${mavenPatchVersion}"
-		}
-	}
-}
 
 compileJava {
   options.compilerArgs << "-parameters"

gradle.properties

@@ -29,7 +29,6 @@ mavenMajorVersion = 3
 mavenMinorVersion = 0
 mavenPatchVersion = 0
 mavenArtifactSuffix = 
-nightliesUrl         = http://dl.bintray.com/MicrosoftGraph/Maven
 
 #These values are used to run functional tests
 #If you wish to run the functional tests, edit the gradle.properties
@@ -43,3 +42,5 @@ Password="PASSWORD"
 mavenCentralSnapshotArtifactSuffix = -SNAPSHOT
 mavenCentralPublishingEnabled=false
 
+
+

typesummary/app/build.gradle

@@ -12,22 +12,24 @@ plugins {
 }
 
 repositories {
-    // Use JCenter for resolving dependencies.
-    jcenter()
-    flatDir {
-        dirs '../../build/libs'
-    }
-    jcenter { //TODO remove when releasing
-        url 'http://oss.jfrog.org/artifactory/oss-snapshot-local'
+    maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } //TODO remove when releasing
+    mavenCentral()
+}
+
+sourceSets {
+    main {
+        java {
+            srcDirs 'src'
+            srcDirs '../../src/main'
+        }
     }
 }
 
 dependencies {
-    implementation 'com.google.guava:guava:29.0-jre'
+    implementation 'com.google.guava:guava:30.1-jre'
+    implementation 'com.google.code.gson:gson:2.8.6'
 
     implementation 'com.microsoft.graph:microsoft-graph-core:2.0.0-SNAPSHOT' //TODO update this when releasing
-
-    implementation name: 'msgraph-sdk-java'
 }
 
 application {