Skip to content

Commit af446f4

Browse files
committed
Merge branch 'dev' into feature/v2
2 parents 3a69c83 + d0fbb70 commit af446f4

5 files changed

Lines changed: 36 additions & 3 deletions

File tree

‎.github/dependabot.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ updates:
55
schedule:
66
interval: daily
77
open-pull-requests-limit: 10
8-
- package-ecosystem: maven
8+
- package-ecosystem: github-actions
99
directory: "/"
1010
schedule:
1111
interval: daily

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,4 @@ hs_err_pid*
3131

3232
# Maven
3333
/target/
34-
/pom.xml
3534
local.properties

‎build.gradle‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,14 @@ java {
2020
modularity.inferModulePath = true
2121
}
2222

23+
sourceSets {
24+
main {
25+
java {
26+
exclude 'pom.xml'
27+
}
28+
}
29+
}
30+
2331
// In this section you declare where to find the dependencies of your project
2432
repositories {
2533
// Use jcenter for resolving your dependencies.

‎gradle/dependencies.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies {
22
// Use JUnit test framework
3-
testImplementation 'junit:junit:4.13'
3+
testImplementation 'junit:junit:4.13.1'
44

55
api 'com.squareup.okhttp3:okhttp:4.9.0'
66

‎pom.xml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<project>
2+
<!--
3+
This package file is a place holder to enable the dependency graph https://github.com/microsoftgraph/msgraph-sdk-java-core/network/dependencies
4+
as the dependency graph is not compatible with gradle https://docs.github.com/en/free-pro-team@latest/github/visualizing-repository-data-with-graphs/about-the-dependency-graph#supported-package-ecosystems
5+
build.gradle is the source of truth
6+
-->
7+
<modelVersion>4.0.0</modelVersion>
8+
9+
<groupId>com.microsoft.graph</groupId>
10+
<artifactId>microsoft-graph-core</artifactId>
11+
<version>1.0.5</version>
12+
<packaging>pom</packaging>
13+
14+
<dependencies>
15+
<dependency>
16+
<groupId>com.google.code.gson</groupId>
17+
<artifactId>gson</artifactId>
18+
<version>2.8.6</version>
19+
</dependency>
20+
<dependency>
21+
<groupId>com.squareup.okhttp3</groupId>
22+
<artifactId>gson</artifactId>
23+
<version>3.12.1</version>
24+
</dependency>
25+
</dependencies>
26+
</project>

0 commit comments

Comments
 (0)