From 0be15f67f76b93a674f887cdc78831e6e5f374f8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Feb 2025 05:30:03 +0000 Subject: [PATCH 1/8] chore(deps): bump com.microsoft.graph:microsoft-graph-core Bumps [com.microsoft.graph:microsoft-graph-core](https://github.com/microsoftgraph/msgraph-sdk-java-core) from 3.6.0 to 3.6.1. - [Release notes](https://github.com/microsoftgraph/msgraph-sdk-java-core/releases) - [Changelog](https://github.com/microsoftgraph/msgraph-sdk-java-core/blob/main/CHANGELOG.md) - [Commits](https://github.com/microsoftgraph/msgraph-sdk-java-core/compare/v3.6.0...v3.6.1) --- updated-dependencies: - dependency-name: com.microsoft.graph:microsoft-graph-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4b3f0530960..823df36444e 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ com.microsoft.graph microsoft-graph-core - 3.6.0 + 3.6.1 org.junit.jupiter From dfc2f8e91990b6b62980020028db93c0d7d514dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Feb 2025 09:31:00 +0000 Subject: [PATCH 2/8] chore(deps): bump com.microsoft.graph:microsoft-graph-core Bumps [com.microsoft.graph:microsoft-graph-core](https://github.com/microsoftgraph/msgraph-sdk-java-core) from 3.6.0 to 3.6.1. - [Release notes](https://github.com/microsoftgraph/msgraph-sdk-java-core/releases) - [Changelog](https://github.com/microsoftgraph/msgraph-sdk-java-core/blob/main/CHANGELOG.md) - [Commits](https://github.com/microsoftgraph/msgraph-sdk-java-core/compare/v3.6.0...v3.6.1) --- updated-dependencies: - dependency-name: com.microsoft.graph:microsoft-graph-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- gradle/dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index ef374cc4057..51e41f505ec 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -4,7 +4,7 @@ dependencies { implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1' // Core Http library - api 'com.microsoft.graph:microsoft-graph-core:3.6.0' + api 'com.microsoft.graph:microsoft-graph-core:3.6.1' implementation 'com.microsoft.kiota:microsoft-kiota-authentication-azure:1.8.4' implementation 'com.microsoft.kiota:microsoft-kiota-http-okHttp:1.8.4' From 4219e68fe0deadce062e5247aef9dd1c90d04eb9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Feb 2025 09:31:02 +0000 Subject: [PATCH 3/8] chore(deps): bump com.microsoft.graph:microsoft-graph-core in /java-8 Bumps [com.microsoft.graph:microsoft-graph-core](https://github.com/microsoftgraph/msgraph-sdk-java-core) from 3.6.0 to 3.6.1. - [Release notes](https://github.com/microsoftgraph/msgraph-sdk-java-core/releases) - [Changelog](https://github.com/microsoftgraph/msgraph-sdk-java-core/blob/main/CHANGELOG.md) - [Commits](https://github.com/microsoftgraph/msgraph-sdk-java-core/compare/v3.6.0...v3.6.1) --- updated-dependencies: - dependency-name: com.microsoft.graph:microsoft-graph-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- gradle/dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index ef374cc4057..51e41f505ec 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -4,7 +4,7 @@ dependencies { implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1' // Core Http library - api 'com.microsoft.graph:microsoft-graph-core:3.6.0' + api 'com.microsoft.graph:microsoft-graph-core:3.6.1' implementation 'com.microsoft.kiota:microsoft-kiota-authentication-azure:1.8.4' implementation 'com.microsoft.kiota:microsoft-kiota-http-okHttp:1.8.4' From e6c2da16fe4d4561f2f8c15ea7ef7a6eac1855aa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 27 Feb 2025 10:15:35 +0000 Subject: [PATCH 4/8] chore(deps): bump com.android.tools.build:gradle in /android Bumps com.android.tools.build:gradle from 8.8.1 to 8.8.2. --- updated-dependencies: - dependency-name: com.android.tools.build:gradle dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index b4416bb9149..f0392baea30 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -9,7 +9,7 @@ buildscript { classpath "com.gradle:gradle-enterprise-gradle-plugin:3.19.2" classpath "gradle.plugin.com.github.viswaramamoorthy:gradle-util-plugins:0.1.0-RELEASE" classpath "com.github.ben-manes:gradle-versions-plugin:0.52.0" - classpath "com.android.tools.build:gradle:8.8.1" + classpath "com.android.tools.build:gradle:8.8.2" } } From 9eec01c4cabc7baeeede058d6e7c35c05b93b587 Mon Sep 17 00:00:00 2001 From: Andrew Omondi Date: Thu, 27 Feb 2025 14:43:42 +0300 Subject: [PATCH 5/8] fix: align build files and javadoc file strcuture --- .github/workflows/api-level-lint.yml | 3 +++ .github/workflows/gradle-build.yml | 6 +++++ .github/workflows/preview-and-release.yml | 9 +++++++ scripts/copyFilesOnBuild.ps1 | 30 +++++++++++++++++++++++ 4 files changed, 48 insertions(+) create mode 100644 scripts/copyFilesOnBuild.ps1 diff --git a/.github/workflows/api-level-lint.yml b/.github/workflows/api-level-lint.yml index 974414af971..fb463ddfc6c 100644 --- a/.github/workflows/api-level-lint.yml +++ b/.github/workflows/api-level-lint.yml @@ -17,6 +17,9 @@ jobs: distribution: 'temurin' java-version: 21 cache: gradle + - name: Move generated sources to correct package + run: .\scripts\copyFilesOnBuild.ps1 -inputPath '.\src\main\java\com\microsoft\graph\generated' + shell: pwsh - name: Setup Android SDK uses: android-actions/setup-android@v3.2.2 - name: Add execution right to the script diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml index b8f28ab3585..d17258cb582 100644 --- a/.github/workflows/gradle-build.yml +++ b/.github/workflows/gradle-build.yml @@ -22,6 +22,9 @@ jobs: run: | pip install detect-secrets git ls-files -z | xargs -0 detect-secrets-hook --baseline .secrets.baseline + - name: Move generated sources to correct package + run: .\scripts\copyFilesOnBuild.ps1 -inputPath '.\src\main\java\com\microsoft\graph\generated' + shell: pwsh - name: Grant Execute permission for gradlew run: chmod +x gradlew - name: Build with Gradle @@ -60,6 +63,9 @@ jobs: java-version: 8 distribution: 'temurin' cache: gradle + - name: Move generated sources to correct package + run: .\scripts\copyFilesOnBuild.ps1 -inputPath '.\src\main\java\com\microsoft\graph\generated' + shell: pwsh - name: Grant Execute permission for gradlew run: chmod +x gradlew - name: Build with Java 8 diff --git a/.github/workflows/preview-and-release.yml b/.github/workflows/preview-and-release.yml index b6218f8cc52..352d7cc02c8 100644 --- a/.github/workflows/preview-and-release.yml +++ b/.github/workflows/preview-and-release.yml @@ -37,6 +37,9 @@ jobs: java-version: ${{ env.JAVA_VERSION }} distribution: ${{ env.JAVA_DISTRIBUTION}} cache: gradle + - name: Move generated sources to correct package + run: .\scripts\copyFilesOnBuild.ps1 -inputPath '.\src\main\java\com\microsoft\graph\generated' + shell: pwsh - name: Detect secrets run: | pip install detect-secrets @@ -76,6 +79,9 @@ jobs: run: | pip install detect-secrets git ls-files -z | xargs -0 detect-secrets-hook --baseline .secrets.baseline + - name: Move generated sources to correct package + run: .\scripts\copyFilesOnBuild.ps1 -inputPath '.\src\main\java\com\microsoft\graph\generated' + shell: pwsh - name: Download File run: .\scripts\decodeAndWrite.ps1 -encodedValue $env:ENCODED_VALUE -outputPath $env:OUTPUT_PATH shell: pwsh @@ -129,6 +135,9 @@ jobs: java-version: ${{ env.JAVA_VERSION }} distribution: ${{ env.JAVA_DISTRIBUTION}} cache: gradle + - name: Move generated sources to correct package + run: .\scripts\copyFilesOnBuild.ps1 -inputPath '.\src\main\java\com\microsoft\graph\generated' + shell: pwsh - name: Download file run: .\scripts\decodeAndWrite.ps1 -encodedValue $env:ENCODED_VALUE -outputPath $env:OUTPUT_PATH shell: pwsh diff --git a/scripts/copyFilesOnBuild.ps1 b/scripts/copyFilesOnBuild.ps1 new file mode 100644 index 00000000000..ab43ce7b5fd --- /dev/null +++ b/scripts/copyFilesOnBuild.ps1 @@ -0,0 +1,30 @@ +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. + +<# +.Synopsis + Copy files to a new location that is the parent of the current directory. +.Description + Receives an encoded string value and decodes it using base64. + Write the new decoded string to a local file for later consumption. +.Parameter inputPath + The encoded string we wish to decode. +#> + +Param( + [Parameter(Mandatory = $true)][string]$inputPath +) + +$fullPath = (Get-Item $inputPath).FullName +$parentDirectory = (Get-Item $inputPath).Parent +Push-Location $inputPath + +Get-ChildItem '*' -Filter *.java -recurse | ForEach-Object { + $TargetDirectory = $_.DirectoryName.Replace($fullPath, "") + $TargetPath = Join-Path -Path $parentDirectory -ChildPath $TargetDirectory + If (!(Test-Path $TargetPath)) { + New-Item -Path $TargetPath -Type Directory -Force | out-null + } + $_ | Move-Item -Destination $TargetPath -Force +} +Pop-Location From 455f6698125f692b556369c7d14972ddeeada53e Mon Sep 17 00:00:00 2001 From: Andrew Omondi Date: Thu, 27 Feb 2025 15:52:26 +0300 Subject: [PATCH 6/8] fix: ensure javadocs are generated --- build.gradle | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 314c8ae1518..36d9556b34d 100644 --- a/build.gradle +++ b/build.gradle @@ -47,7 +47,10 @@ def pomConfig = { } } -tasks.withType(Javadoc).all { enabled = false } +tasks.withType(Javadoc).configureEach { + enabled = false + options.addStringOption('Xdoclint:-missing', '-quiet') +} tasks.jar { From 0475eef48c9f84b2d3b0d82203c6ce913c97b93d Mon Sep 17 00:00:00 2001 From: Andrew Omondi Date: Thu, 27 Feb 2025 16:11:11 +0300 Subject: [PATCH 7/8] chore: fix boolean value --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 36d9556b34d..beb4723ca85 100644 --- a/build.gradle +++ b/build.gradle @@ -48,7 +48,7 @@ def pomConfig = { } tasks.withType(Javadoc).configureEach { - enabled = false + enabled = true options.addStringOption('Xdoclint:-missing', '-quiet') } From 8e9d74cc6c4d5fdf3637ae163c835b6d1e3eef21 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 27 Feb 2025 15:02:53 +0000 Subject: [PATCH 8/8] chore(main): release 6.30.1 --- .release-please-manifest.json | 2 +- CHANGELOG.md | 9 +++++++++ README.md | 4 ++-- gradle.properties | 2 +- pom.xml | 2 +- src/main/java/com/microsoft/graph/info/Constants.java | 2 +- 6 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index fe523d1d5d2..22fefa7400b 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "6.30.0" + ".": "6.30.1" } diff --git a/CHANGELOG.md b/CHANGELOG.md index 98b22e7d738..349e938e0a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,15 @@ All notable changes to this project will be documented in this file. +## [6.30.1](https://github.com/microsoftgraph/msgraph-sdk-java/compare/v6.30.0...v6.30.1) (2025-02-27) + + +### Bug Fixes + +* align build files and javadoc file strcuture ([9eec01c](https://github.com/microsoftgraph/msgraph-sdk-java/commit/9eec01c4cabc7baeeede058d6e7c35c05b93b587)) +* ensure javadocs are generated ([455f669](https://github.com/microsoftgraph/msgraph-sdk-java/commit/455f6698125f692b556369c7d14972ddeeada53e)) +* resolve javadoc and source locations ([a8478a1](https://github.com/microsoftgraph/msgraph-sdk-java/commit/a8478a17744d6c830ae2d9999f4c5e24eeb5be28)) + ## [6.30.0](https://github.com/microsoftgraph/msgraph-sdk-java/compare/v6.29.0...v6.30.0) (2025-02-25) diff --git a/README.md b/README.md index 30f989ee25a..d86f15e3ef9 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ repositories { dependencies { // Include the sdk as a dependency // x-release-please-start-version - implementation 'com.microsoft.graph:microsoft-graph:6.30.0' + implementation 'com.microsoft.graph:microsoft-graph:6.30.1' // x-release-please-end // This dependency is only needed if you are using a TokenCredential object for authentication implementation 'com.azure:azure-identity:1.15.0' @@ -38,7 +38,7 @@ Add the dependency in `dependencies` in pom.xml com.microsoft.graph microsoft-graph - 6.30.0 + 6.30.1 diff --git a/gradle.properties b/gradle.properties index 9b837da1f89..11d614dba59 100644 --- a/gradle.properties +++ b/gradle.properties @@ -32,7 +32,7 @@ mavenMajorVersion = 6 mavenMinorVersion = 30 # x-release-please-end # x-release-please-start-patch -mavenPatchVersion = 0 +mavenPatchVersion = 1 # x-release-please-end mavenArtifactSuffix = diff --git a/pom.xml b/pom.xml index 823df36444e..5a68f0eac9e 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ com.microsoft.graph microsoft-graph - 6.30.0 + 6.30.1 pom diff --git a/src/main/java/com/microsoft/graph/info/Constants.java b/src/main/java/com/microsoft/graph/info/Constants.java index bcf6448120f..47b7b6af0d8 100644 --- a/src/main/java/com/microsoft/graph/info/Constants.java +++ b/src/main/java/com/microsoft/graph/info/Constants.java @@ -4,7 +4,7 @@ public final class Constants { /** The SDK version */ // x-release-please-start-version - public static final String VERSION_NAME = "6.30.0"; + public static final String VERSION_NAME = "6.30.1"; // x-release-please-end }