From 94ceb69d69df941a5ffcb944cc2f896357a95d99 Mon Sep 17 00:00:00 2001
From: Alice <65933803+alicejli@users.noreply.github.com>
Date: Tue, 28 Nov 2023 15:55:43 -0500
Subject: [PATCH 01/18] chore: update version for release (#227)
---
third_party/docfx-doclet-143274/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/third_party/docfx-doclet-143274/pom.xml b/third_party/docfx-doclet-143274/pom.xml
index c7af9ac3..1cef0557 100644
--- a/third_party/docfx-doclet-143274/pom.xml
+++ b/third_party/docfx-doclet-143274/pom.xml
@@ -6,7 +6,7 @@
com.microsoft
docfx-doclet
- 1.11.1-SNAPSHOT
+ 1.12.0-SNAPSHOT
UTF-8
From a0dc4717d659c76e853fab84e03cbfda595b6df7 Mon Sep 17 00:00:00 2001
From: Mend Renovate
Date: Wed, 29 Nov 2023 00:09:57 +0100
Subject: [PATCH 02/18] fix(deps): update dependency org.jsoup:jsoup to v1.17.1
(#218)
---
third_party/docfx-doclet-143274/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/third_party/docfx-doclet-143274/pom.xml b/third_party/docfx-doclet-143274/pom.xml
index 1cef0557..a486a3b2 100644
--- a/third_party/docfx-doclet-143274/pom.xml
+++ b/third_party/docfx-doclet-143274/pom.xml
@@ -159,7 +159,7 @@
org.jsoup
jsoup
- 1.16.1
+ 1.17.1
com.google.guava
From e01fa55ea6765b0b1b52eb495e0a4be4b23693e5 Mon Sep 17 00:00:00 2001
From: Mend Renovate
Date: Wed, 29 Nov 2023 00:11:51 +0100
Subject: [PATCH 03/18] fix(deps): update dependency commons-io:commons-io to
v2.15.0 (#220)
Co-authored-by: Alice <65933803+alicejli@users.noreply.github.com>
---
third_party/docfx-doclet-143274/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/third_party/docfx-doclet-143274/pom.xml b/third_party/docfx-doclet-143274/pom.xml
index a486a3b2..0aff2a6a 100644
--- a/third_party/docfx-doclet-143274/pom.xml
+++ b/third_party/docfx-doclet-143274/pom.xml
@@ -16,7 +16,7 @@
2.15.3
3.13.0
4.4
- 2.14.0
+ 2.15.0
1.10.0
1.1.0
From 4dfede16f31214f983f9ed70c401a21d7d54278c Mon Sep 17 00:00:00 2001
From: Mend Renovate
Date: Wed, 29 Nov 2023 00:13:47 +0100
Subject: [PATCH 04/18] fix(deps): update dependency
org.apache.commons:commons-text to v1.11.0 (#221)
---
third_party/docfx-doclet-143274/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/third_party/docfx-doclet-143274/pom.xml b/third_party/docfx-doclet-143274/pom.xml
index 0aff2a6a..ac02e79d 100644
--- a/third_party/docfx-doclet-143274/pom.xml
+++ b/third_party/docfx-doclet-143274/pom.xml
@@ -17,7 +17,7 @@
3.13.0
4.4
2.15.0
- 1.10.0
+ 1.11.0
1.1.0
From e5d7445c4d2e775dc8baabe91e9d7438c901377b Mon Sep 17 00:00:00 2001
From: Mend Renovate
Date: Wed, 29 Nov 2023 00:17:38 +0100
Subject: [PATCH 05/18] fix(deps): update jackson.version to v2.16.0 (#224)
Co-authored-by: Alice <65933803+alicejli@users.noreply.github.com>
---
third_party/docfx-doclet-143274/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/third_party/docfx-doclet-143274/pom.xml b/third_party/docfx-doclet-143274/pom.xml
index ac02e79d..467d9469 100644
--- a/third_party/docfx-doclet-143274/pom.xml
+++ b/third_party/docfx-doclet-143274/pom.xml
@@ -13,7 +13,7 @@
11
${java.version}
${java.version}
- 2.15.3
+ 2.16.0
3.13.0
4.4
2.15.0
From 0659c3ae7be1bfe2fdd305bdfc440b6b08106d8e Mon Sep 17 00:00:00 2001
From: Mend Renovate
Date: Wed, 29 Nov 2023 00:19:42 +0100
Subject: [PATCH 06/18] fix(deps): update dependency
org.apache.commons:commons-lang3 to v3.14.0 (#225)
---
third_party/docfx-doclet-143274/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/third_party/docfx-doclet-143274/pom.xml b/third_party/docfx-doclet-143274/pom.xml
index 467d9469..476aa22b 100644
--- a/third_party/docfx-doclet-143274/pom.xml
+++ b/third_party/docfx-doclet-143274/pom.xml
@@ -14,7 +14,7 @@
${java.version}
${java.version}
2.16.0
- 3.13.0
+ 3.14.0
4.4
2.15.0
1.11.0
From 8d710f40c050b07640a3f7e7e78e8a0c30711e4f Mon Sep 17 00:00:00 2001
From: Alice <65933803+alicejli@users.noreply.github.com>
Date: Fri, 9 Feb 2024 17:43:26 -0500
Subject: [PATCH 07/18] fix: initialize uncategorized array (#242)
---
.../src/main/java/com/microsoft/model/StubPackageToc.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/third_party/docfx-doclet-143274/src/main/java/com/microsoft/model/StubPackageToc.java b/third_party/docfx-doclet-143274/src/main/java/com/microsoft/model/StubPackageToc.java
index 9d1e4986..92802fa6 100644
--- a/third_party/docfx-doclet-143274/src/main/java/com/microsoft/model/StubPackageToc.java
+++ b/third_party/docfx-doclet-143274/src/main/java/com/microsoft/model/StubPackageToc.java
@@ -18,6 +18,7 @@ public StubPackageToc() {
visibleCategories.put(STUBS, new ArrayList<>());
visibleCategories.put(SETTINGS, new ArrayList<>());
visibleCategories.put(CALLABLE_FACTORIES, new ArrayList<>());
+ visibleCategories.put(UNCATEGORIZED, new ArrayList<>());
}
public void addStub(TocItem tocItem) {
From 52f95e8a093be53eab996afe59f789e98d2b3537 Mon Sep 17 00:00:00 2001
From: Mend Renovate
Date: Mon, 12 Feb 2024 17:23:26 +0100
Subject: [PATCH 08/18] chore(deps): update actions/setup-java action to v4
(#229)
Co-authored-by: Alice <65933803+alicejli@users.noreply.github.com>
---
.github/workflows/ci.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7195a82a..32c9fac6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- - uses: actions/setup-java@v3
+ - uses: actions/setup-java@v4
with:
java-version: 11
distribution: temurin
@@ -26,7 +26,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- - uses: actions/setup-java@v3
+ - uses: actions/setup-java@v4
with:
java-version: 11
distribution: temurin
@@ -36,7 +36,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- - uses: actions/setup-java@v3
+ - uses: actions/setup-java@v4
with:
java-version: 11
distribution: temurin
From e3627ebee12a14b1eb9838f19fbe2ce9a4f2015c Mon Sep 17 00:00:00 2001
From: Mend Renovate
Date: Mon, 12 Feb 2024 20:28:23 +0100
Subject: [PATCH 09/18] fix(deps): update dependency commons-io:commons-io to
v2.15.1 (#230)
---
third_party/docfx-doclet-143274/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/third_party/docfx-doclet-143274/pom.xml b/third_party/docfx-doclet-143274/pom.xml
index 476aa22b..9be61de1 100644
--- a/third_party/docfx-doclet-143274/pom.xml
+++ b/third_party/docfx-doclet-143274/pom.xml
@@ -16,7 +16,7 @@
2.16.0
3.14.0
4.4
- 2.15.0
+ 2.15.1
1.11.0
1.1.0
From d17519a20cffced22a03e46f8096fac192bf7cd3 Mon Sep 17 00:00:00 2001
From: Mend Renovate
Date: Mon, 12 Feb 2024 20:29:45 +0100
Subject: [PATCH 10/18] chore(deps): update dependency
org.apache.maven.plugins:maven-compiler-plugin to v3.12.1 (#232)
---
third_party/docfx-doclet-143274/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/third_party/docfx-doclet-143274/pom.xml b/third_party/docfx-doclet-143274/pom.xml
index 9be61de1..5ad9d5b4 100644
--- a/third_party/docfx-doclet-143274/pom.xml
+++ b/third_party/docfx-doclet-143274/pom.xml
@@ -26,7 +26,7 @@
org.apache.maven.plugins
maven-compiler-plugin
- 3.11.0
+ 3.12.1
-Xlint:unchecked
From 5b32c5bf0abe57c620da021e449ea4ee7333fab1 Mon Sep 17 00:00:00 2001
From: Mend Renovate
Date: Mon, 12 Feb 2024 20:32:03 +0100
Subject: [PATCH 11/18] fix(deps): update dependency com.google.guava:guava to
v33 (#233)
---
third_party/docfx-doclet-143274/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/third_party/docfx-doclet-143274/pom.xml b/third_party/docfx-doclet-143274/pom.xml
index 5ad9d5b4..0e086187 100644
--- a/third_party/docfx-doclet-143274/pom.xml
+++ b/third_party/docfx-doclet-143274/pom.xml
@@ -164,7 +164,7 @@
com.google.guava
guava
- 32.1.3-jre
+ 33.0.0-jre
com.google.code.gson
From 9b1df6b9e265b13dd47e1c7d03996890e9bb4e9a Mon Sep 17 00:00:00 2001
From: Mend Renovate
Date: Mon, 12 Feb 2024 20:34:47 +0100
Subject: [PATCH 12/18] chore(deps): update dependency
com.google.googlejavaformat:google-java-format to v1.19.2 (#234)
---
third_party/docfx-doclet-143274/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/third_party/docfx-doclet-143274/pom.xml b/third_party/docfx-doclet-143274/pom.xml
index 0e086187..f6b4878d 100644
--- a/third_party/docfx-doclet-143274/pom.xml
+++ b/third_party/docfx-doclet-143274/pom.xml
@@ -106,7 +106,7 @@
com.google.googlejavaformat
google-java-format
- 1.18.1
+ 1.19.2
From ba98e0f567b7102161966c6872ffa67c1fee2d71 Mon Sep 17 00:00:00 2001
From: Mend Renovate
Date: Mon, 12 Feb 2024 20:36:53 +0100
Subject: [PATCH 13/18] fix(deps): update jackson.version to v2.16.1 (#235)
---
third_party/docfx-doclet-143274/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/third_party/docfx-doclet-143274/pom.xml b/third_party/docfx-doclet-143274/pom.xml
index f6b4878d..7259721c 100644
--- a/third_party/docfx-doclet-143274/pom.xml
+++ b/third_party/docfx-doclet-143274/pom.xml
@@ -13,7 +13,7 @@
11
${java.version}
${java.version}
- 2.16.0
+ 2.16.1
3.14.0
4.4
2.15.1
From 9a7ebcd19e3145d917c8742dca1cb4fc363e2891 Mon Sep 17 00:00:00 2001
From: Mend Renovate
Date: Mon, 12 Feb 2024 20:38:05 +0100
Subject: [PATCH 14/18] fix(deps): update dependency org.jsoup:jsoup to v1.17.2
(#236)
---
third_party/docfx-doclet-143274/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/third_party/docfx-doclet-143274/pom.xml b/third_party/docfx-doclet-143274/pom.xml
index 7259721c..ad4e6900 100644
--- a/third_party/docfx-doclet-143274/pom.xml
+++ b/third_party/docfx-doclet-143274/pom.xml
@@ -159,7 +159,7 @@
org.jsoup
jsoup
- 1.17.1
+ 1.17.2
com.google.guava
From 0ab51b2643eca1ae2bf43db6a33a1bbdbc16ce84 Mon Sep 17 00:00:00 2001
From: Mend Renovate
Date: Wed, 21 Feb 2024 17:35:41 +0100
Subject: [PATCH 15/18] chore(deps): update dependency
com.google.googlejavaformat:google-java-format to v1.20.0 (#243)
---
third_party/docfx-doclet-143274/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/third_party/docfx-doclet-143274/pom.xml b/third_party/docfx-doclet-143274/pom.xml
index ad4e6900..1f50249c 100644
--- a/third_party/docfx-doclet-143274/pom.xml
+++ b/third_party/docfx-doclet-143274/pom.xml
@@ -106,7 +106,7 @@
com.google.googlejavaformat
google-java-format
- 1.19.2
+ 1.20.0
From e0fd4b65861e8bfa3e71a7fb5f13047d49d1e329 Mon Sep 17 00:00:00 2001
From: Alice <65933803+alicejli@users.noreply.github.com>
Date: Wed, 21 Feb 2024 12:07:29 -0500
Subject: [PATCH 16/18] feat: update golden tests for usage with Java17 (#244)
* feat: update golden tests for usage with Java17
* update ci.yml to run with java17
* revert lint to use java 11
---
.github/workflows/ci.yml | 4 ++--
third_party/docfx-doclet-143274/README.md | 14 +++++++-------
.../com/microsoft/doclet/DocletRunnerTest.java | 4 ++--
...es.ExceptionHandler.Interceptor.RetryResult.yml | 8 +++++++-
...les.google.RecognitionAudio.AudioSourceCase.yml | 8 +++++++-
...subpackage.Person.IdentificationInfo.Gender.yml | 6 ++++++
6 files changed, 31 insertions(+), 13 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 32c9fac6..ea531de5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
- java-version: 11
+ java-version: 17
distribution: temurin
- run: mvn -B -ntp install -DskipTests
@@ -28,7 +28,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
- java-version: 11
+ java-version: 17
distribution: temurin
- run: mvn -B -ntp test
diff --git a/third_party/docfx-doclet-143274/README.md b/third_party/docfx-doclet-143274/README.md
index 4d88be6a..f1c9131a 100644
--- a/third_party/docfx-doclet-143274/README.md
+++ b/third_party/docfx-doclet-143274/README.md
@@ -1,15 +1,15 @@
## JavaDoc Doclet for DocFX
-[![Build status](https://apidrop.visualstudio.com/Toolshed/_apis/build/status/Toolshed-Maven-CI)](https://apidrop.visualstudio.com/Toolshed/_build/latest?definitionId=1633)
-
This doclet is designed to produce a YAML representation of the Javadoc-generated documentation, that can be integrated into [DocFX](https://dotnet.github.io/docfx/).
+It contains some Google-specific configurations to render pages on cloud.google.com.
+The latest version of this doclet has been updated to be run with Java 17. It should work with Java 11 to generate Yaml files; however, the unit tests within this repo will fail.
## Getting started
-The easiest way is to just get the JAR files directly from our [releases](https://github.com/dendeli-msft/docfx-doclet/releases).
+This repo is a fork off of: [https://github.com/docascode/docfx-doclet](https://github.com/dendeli-msft/docfx-doclet/releases).
-Alternatively, you can clone the repository and build it with the help of Maven. You can do so by calling:
+You can clone this repository and build it with the help of Maven. You can do so by calling:
```bash
mvn compile
@@ -38,7 +38,7 @@ To cut a new release of the doclet for updated Cloud RAD content, do the followi
`git push origin v1..`
-3) Update the `publish_javadoc11.sh` script within g3 to use the latest version of the doclet.
+3) Update the `publish_javadoc17.sh` script within g3 to use the latest version of the doclet.
## Usage
@@ -50,7 +50,7 @@ When there is an existing java project where Maven is used as a build tool, one
org.apache.maven.plugins
maven-javadoc-plugin
- 3.0.1
+ 3.5.0
com.microsoft.doclet.DocFxDoclet
@@ -97,7 +97,7 @@ One can execute the `javadoc` command with the command line parameters:
```bash
javadoc \
-encoding UTF-8 \
--docletpath ./target/docfx-doclet-1.0-SNAPSHOT-jar-with-dependencies.jar \
+-docletpath ./target/docfx-doclet-1.0-SNAPSHOT-jar-with-dependencies.jar \ # Update the version here to the doclet version you want to use
-doclet com.microsoft.doclet.DocFxDoclet \
-classpath \
-sourcepath ./src/test/java \
diff --git a/third_party/docfx-doclet-143274/src/test/java/com/microsoft/doclet/DocletRunnerTest.java b/third_party/docfx-doclet-143274/src/test/java/com/microsoft/doclet/DocletRunnerTest.java
index cfd29039..e4c9b46c 100644
--- a/third_party/docfx-doclet-143274/src/test/java/com/microsoft/doclet/DocletRunnerTest.java
+++ b/third_party/docfx-doclet-143274/src/test/java/com/microsoft/doclet/DocletRunnerTest.java
@@ -93,8 +93,8 @@ public void testFilesGeneration() throws IOException {
assertEquals(
"Unexpected amount of lines in file " + generatedFilePath,
- generatedFileLines.length,
- expectedFileLines.length);
+ expectedFileLines.length,
+ generatedFileLines.length);
for (int i = 0; i < generatedFileLines.length; i++) {
assertEquals(
diff --git a/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.ExceptionHandler.Interceptor.RetryResult.yml b/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.ExceptionHandler.Interceptor.RetryResult.yml
index 96e630fa..80ec1aed 100644
--- a/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.ExceptionHandler.Interceptor.RetryResult.yml
+++ b/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.ExceptionHandler.Interceptor.RetryResult.yml
@@ -25,6 +25,7 @@ items:
- "java.lang.Enum.valueOf(java.lang.Class,java.lang.String)"
- "java.lang.Enum.clone()"
- "java.lang.Enum.compareTo(E)"
+ - "java.lang.Enum.describeConstable()"
- "java.lang.Enum.equals(java.lang.Object)"
- "java.lang.Enum.finalize()"
- "java.lang.Enum.getDeclaringClass()"
@@ -195,6 +196,11 @@ references:
name: "Enum.finalize()"
nameWithType: "Enum.finalize()"
fullName: "java.lang.Enum.finalize()"
+- uid: "java.lang.Enum.describeConstable()"
+ href: "https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html#describeConstable--"
+ name: "Enum.describeConstable()"
+ nameWithType: "Enum.describeConstable()"
+ fullName: "java.lang.Enum.describeConstable()"
- uid: "java.lang.Object.notifyAll()"
href: "https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html#notifyAll--"
name: "Object.notifyAll()"
@@ -267,4 +273,4 @@ references:
- uid: "T>valueOf(java.lang.Class"
name: "T>valueOf(Class"
nameWithType: "T>valueOf(Class"
- fullName: "T>valueOf(java.lang.Class"
+ fullName: "T>valueOf(java.lang.Class"
\ No newline at end of file
diff --git a/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.RecognitionAudio.AudioSourceCase.yml b/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.RecognitionAudio.AudioSourceCase.yml
index 3ceed122..3f3224c4 100644
--- a/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.RecognitionAudio.AudioSourceCase.yml
+++ b/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.RecognitionAudio.AudioSourceCase.yml
@@ -31,6 +31,7 @@ items:
- "java.lang.Enum.valueOf(java.lang.Class,java.lang.String)"
- "java.lang.Enum.clone()"
- "java.lang.Enum.compareTo(E)"
+ - "java.lang.Enum.describeConstable()"
- "java.lang.Enum.equals(java.lang.Object)"
- "java.lang.Enum.finalize()"
- "java.lang.Enum.getDeclaringClass()"
@@ -287,6 +288,11 @@ references:
name: "Enum.finalize()"
nameWithType: "Enum.finalize()"
fullName: "java.lang.Enum.finalize()"
+- uid: "java.lang.Enum.describeConstable()"
+ href: "https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html#describeConstable--"
+ name: "Enum.describeConstable()"
+ nameWithType: "Enum.describeConstable()"
+ fullName: "java.lang.Enum.describeConstable()"
- uid: "java.lang.Object.notifyAll()"
href: "https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html#notifyAll--"
name: "Object.notifyAll()"
@@ -359,4 +365,4 @@ references:
- uid: "T>valueOf(java.lang.Class"
name: "T>valueOf(Class"
nameWithType: "T>valueOf(Class"
- fullName: "T>valueOf(java.lang.Class"
+ fullName: "T>valueOf(java.lang.Class"
\ No newline at end of file
diff --git a/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.subpackage.Person.IdentificationInfo.Gender.yml b/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.subpackage.Person.IdentificationInfo.Gender.yml
index ede81fa9..1fb375dd 100644
--- a/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.subpackage.Person.IdentificationInfo.Gender.yml
+++ b/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.subpackage.Person.IdentificationInfo.Gender.yml
@@ -25,6 +25,7 @@ items:
- "java.lang.Enum.valueOf(java.lang.Class,java.lang.String)"
- "java.lang.Enum.clone()"
- "java.lang.Enum.compareTo(E)"
+ - "java.lang.Enum.describeConstable()"
- "java.lang.Enum.equals(java.lang.Object)"
- "java.lang.Enum.finalize()"
- "java.lang.Enum.getDeclaringClass()"
@@ -179,6 +180,11 @@ references:
name: "Enum.finalize()"
nameWithType: "Enum.finalize()"
fullName: "java.lang.Enum.finalize()"
+- uid: "java.lang.Enum.describeConstable()"
+ href: "https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html#describeConstable--"
+ name: "Enum.describeConstable()"
+ nameWithType: "Enum.describeConstable()"
+ fullName: "java.lang.Enum.describeConstable()"
- uid: "java.lang.Object.notifyAll()"
href: "https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html#notifyAll--"
name: "Object.notifyAll()"
From 14621377515b9a8d8641096a08fa0abbeaf0076f Mon Sep 17 00:00:00 2001
From: Mend Renovate
Date: Wed, 21 Feb 2024 21:07:57 +0100
Subject: [PATCH 17/18] fix(deps): update dependency
com.google.cloud:libraries-bom to v26.32.0 (#231)
* fix(deps): update dependency com.google.cloud:libraries-bom to v26.32.0
* fix(deps): update dependency com.google.cloud:libraries-bom to v26.32.0
* update goldens
---------
Co-authored-by: Alice Li
---
third_party/docfx-doclet-143274/pom.xml | 7 +++----
...amples.google.ProductSearchSettings.Builder.yml | 8 +++++++-
...rosoft.samples.google.ProductSearchSettings.yml | 6 ++++++
...m.microsoft.samples.google.RecognitionAudio.yml | 8 +++++++-
...osoft.samples.google.SpeechSettings.Builder.yml | 8 +++++++-
...com.microsoft.samples.google.SpeechSettings.yml | 8 +++++++-
...s.google.v1.stub.SpeechStubSettings.Builder.yml | 8 +++++++-
...t.samples.google.v1.stub.SpeechStubSettings.yml | 14 +++++++++++++-
8 files changed, 57 insertions(+), 10 deletions(-)
diff --git a/third_party/docfx-doclet-143274/pom.xml b/third_party/docfx-doclet-143274/pom.xml
index 1f50249c..3669bfb5 100644
--- a/third_party/docfx-doclet-143274/pom.xml
+++ b/third_party/docfx-doclet-143274/pom.xml
@@ -10,9 +10,8 @@
UTF-8
- 11
- ${java.version}
- ${java.version}
+ 17
+ 17
2.16.1
3.14.0
4.4
@@ -118,7 +117,7 @@
com.google.cloud
libraries-bom
- 26.27.0
+ 26.32.0
pom
import
diff --git a/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.ProductSearchSettings.Builder.yml b/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.ProductSearchSettings.Builder.yml
index 6afb0cb7..dce80be2 100644
--- a/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.ProductSearchSettings.Builder.yml
+++ b/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.ProductSearchSettings.Builder.yml
@@ -72,6 +72,7 @@ items:
- "com.google.api.gax.rpc.ClientSettings.Builder.setInternalHeaderProvider(com.google.api.gax.rpc.HeaderProvider)"
- "com.google.api.gax.rpc.ClientSettings.Builder.setQuotaProjectId(java.lang.String)"
- "com.google.api.gax.rpc.ClientSettings.Builder.setTransportChannelProvider(com.google.api.gax.rpc.TransportChannelProvider)"
+ - "com.google.api.gax.rpc.ClientSettings.Builder.setUniverseDomain(java.lang.String)"
- "com.google.api.gax.rpc.ClientSettings.Builder.setWatchdogCheckInterval(org.threeten.bp.Duration)"
- "com.google.api.gax.rpc.ClientSettings.Builder.setWatchdogProvider(com.google.api.gax.rpc.WatchdogProvider)"
- "com.google.api.gax.rpc.ClientSettings.Builder.toString()"
@@ -1408,6 +1409,11 @@ references:
name: "ClientSettings.Builder.setQuotaProjectId(String)"
nameWithType: "ClientSettings.Builder.setQuotaProjectId(String)"
fullName: "com.google.api.gax.rpc.ClientSettings.Builder.setQuotaProjectId(java.lang.String)"
+- uid: "com.google.api.gax.rpc.ClientSettings.Builder.setUniverseDomain(java.lang.String)"
+ isExternal: true
+ name: "ClientSettings.Builder.setUniverseDomain(String)"
+ nameWithType: "ClientSettings.Builder.setUniverseDomain(String)"
+ fullName: "com.google.api.gax.rpc.ClientSettings.Builder.setUniverseDomain(java.lang.String)"
- uid: "com.google.api.gax.rpc.ClientSettings.Builder.getCredentialsProvider()"
isExternal: true
name: "ClientSettings.Builder.getCredentialsProvider()"
@@ -1602,4 +1608,4 @@ references:
- uid: "?,?>,java.lang.Void>)"
name: "?,?>,Void>)"
nameWithType: "?,?>,Void>)"
- fullName: "?,?>,java.lang.Void>)"
+ fullName: "?,?>,java.lang.Void>)"
\ No newline at end of file
diff --git a/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.ProductSearchSettings.yml b/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.ProductSearchSettings.yml
index 85f63d92..8087c567 100644
--- a/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.ProductSearchSettings.yml
+++ b/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.ProductSearchSettings.yml
@@ -64,6 +64,7 @@ items:
- "com.google.api.gax.rpc.ClientSettings.getQuotaProjectId()"
- "com.google.api.gax.rpc.ClientSettings.getStubSettings()"
- "com.google.api.gax.rpc.ClientSettings.getTransportChannelProvider()"
+ - "com.google.api.gax.rpc.ClientSettings.getUniverseDomain()"
- "com.google.api.gax.rpc.ClientSettings.getWatchdogCheckInterval()"
- "com.google.api.gax.rpc.ClientSettings.getWatchdogProvider()"
- "com.google.api.gax.rpc.ClientSettings.toString()"
@@ -1492,6 +1493,11 @@ references:
name: "Object.wait(long,int)"
nameWithType: "Object.wait(long,int)"
fullName: "java.lang.Object.wait(long,int)"
+- uid: "com.google.api.gax.rpc.ClientSettings.getUniverseDomain()"
+ isExternal: true
+ name: "ClientSettings.getUniverseDomain()"
+ nameWithType: "ClientSettings.getUniverseDomain()"
+ fullName: "com.google.api.gax.rpc.ClientSettings.getUniverseDomain()"
- uid: "com.google.api.gax.rpc.ClientSettings.getHeaderProvider()"
isExternal: true
name: "ClientSettings.getHeaderProvider()"
diff --git a/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.RecognitionAudio.yml b/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.RecognitionAudio.yml
index 291b652e..979c33f4 100644
--- a/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.RecognitionAudio.yml
+++ b/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.RecognitionAudio.yml
@@ -92,6 +92,7 @@ items:
- "com.google.protobuf.GeneratedMessageV3.hasOneof(com.google.protobuf.Descriptors.OneofDescriptor)"
- "com.google.protobuf.GeneratedMessageV3.internalGetFieldAccessorTable()"
- "com.google.protobuf.GeneratedMessageV3.internalGetMapField(int)"
+ - "com.google.protobuf.GeneratedMessageV3.internalGetMapFieldReflection(int)"
- "com.google.protobuf.GeneratedMessageV3.isInitialized()"
- "com.google.protobuf.GeneratedMessageV3.isStringEmpty(java.lang.Object)"
- "com.google.protobuf.GeneratedMessageV3.makeExtensionsImmutable()"
@@ -977,6 +978,11 @@ references:
name: "GeneratedMessageV3.getParserForType()"
nameWithType: "GeneratedMessageV3.getParserForType()"
fullName: "com.google.protobuf.GeneratedMessageV3.getParserForType()"
+- uid: "com.google.protobuf.GeneratedMessageV3.internalGetMapFieldReflection(int)"
+ isExternal: true
+ name: "GeneratedMessageV3.internalGetMapFieldReflection(int)"
+ nameWithType: "GeneratedMessageV3.internalGetMapFieldReflection(int)"
+ fullName: "com.google.protobuf.GeneratedMessageV3.internalGetMapFieldReflection(int)"
- uid: "com.google.protobuf.GeneratedMessageV3.getRepeatedFieldCount(com.google.protobuf.Descriptors.FieldDescriptor)"
isExternal: true
name: "GeneratedMessageV3.getRepeatedFieldCount(Descriptors.FieldDescriptor)"
@@ -1250,4 +1256,4 @@ references:
- uid: "ListT>makeMutableCopy(ListT,int)"
name: "ListT>makeMutableCopy(ListT,int)"
nameWithType: "ListT>makeMutableCopy(ListT,int)"
- fullName: "ListT>makeMutableCopy(ListT,int)"
+ fullName: "ListT>makeMutableCopy(ListT,int)"
\ No newline at end of file
diff --git a/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.SpeechSettings.Builder.yml b/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.SpeechSettings.Builder.yml
index 01550e46..48f81f4e 100644
--- a/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.SpeechSettings.Builder.yml
+++ b/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.SpeechSettings.Builder.yml
@@ -55,6 +55,7 @@ items:
- "com.google.api.gax.rpc.ClientSettings.Builder.setInternalHeaderProvider(com.google.api.gax.rpc.HeaderProvider)"
- "com.google.api.gax.rpc.ClientSettings.Builder.setQuotaProjectId(java.lang.String)"
- "com.google.api.gax.rpc.ClientSettings.Builder.setTransportChannelProvider(com.google.api.gax.rpc.TransportChannelProvider)"
+ - "com.google.api.gax.rpc.ClientSettings.Builder.setUniverseDomain(java.lang.String)"
- "com.google.api.gax.rpc.ClientSettings.Builder.setWatchdogCheckInterval(org.threeten.bp.Duration)"
- "com.google.api.gax.rpc.ClientSettings.Builder.setWatchdogProvider(com.google.api.gax.rpc.WatchdogProvider)"
- "com.google.api.gax.rpc.ClientSettings.Builder.toString()"
@@ -601,6 +602,11 @@ references:
name: "ClientSettings.Builder.setQuotaProjectId(String)"
nameWithType: "ClientSettings.Builder.setQuotaProjectId(String)"
fullName: "com.google.api.gax.rpc.ClientSettings.Builder.setQuotaProjectId(java.lang.String)"
+- uid: "com.google.api.gax.rpc.ClientSettings.Builder.setUniverseDomain(java.lang.String)"
+ isExternal: true
+ name: "ClientSettings.Builder.setUniverseDomain(String)"
+ nameWithType: "ClientSettings.Builder.setUniverseDomain(String)"
+ fullName: "com.google.api.gax.rpc.ClientSettings.Builder.setUniverseDomain(java.lang.String)"
- uid: "com.google.api.gax.rpc.ClientSettings.Builder.getCredentialsProvider()"
isExternal: true
name: "ClientSettings.Builder.getCredentialsProvider()"
@@ -727,4 +733,4 @@ references:
- uid: "?,?>,java.lang.Void>)"
name: "?,?>,Void>)"
nameWithType: "?,?>,Void>)"
- fullName: "?,?>,java.lang.Void>)"
+ fullName: "?,?>,java.lang.Void>)"
\ No newline at end of file
diff --git a/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.SpeechSettings.yml b/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.SpeechSettings.yml
index a979f9c3..a51808b5 100644
--- a/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.SpeechSettings.yml
+++ b/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.SpeechSettings.yml
@@ -47,6 +47,7 @@ items:
- "com.google.api.gax.rpc.ClientSettings.getQuotaProjectId()"
- "com.google.api.gax.rpc.ClientSettings.getStubSettings()"
- "com.google.api.gax.rpc.ClientSettings.getTransportChannelProvider()"
+ - "com.google.api.gax.rpc.ClientSettings.getUniverseDomain()"
- "com.google.api.gax.rpc.ClientSettings.getWatchdogCheckInterval()"
- "com.google.api.gax.rpc.ClientSettings.getWatchdogProvider()"
- "com.google.api.gax.rpc.ClientSettings.toString()"
@@ -676,6 +677,11 @@ references:
name: "Object.wait(long,int)"
nameWithType: "Object.wait(long,int)"
fullName: "java.lang.Object.wait(long,int)"
+- uid: "com.google.api.gax.rpc.ClientSettings.getUniverseDomain()"
+ isExternal: true
+ name: "ClientSettings.getUniverseDomain()"
+ nameWithType: "ClientSettings.getUniverseDomain()"
+ fullName: "com.google.api.gax.rpc.ClientSettings.getUniverseDomain()"
- uid: "com.google.api.gax.rpc.ClientSettings.getHeaderProvider()"
isExternal: true
name: "ClientSettings.getHeaderProvider()"
@@ -780,4 +786,4 @@ references:
- uid: "B>toBuilder()"
name: "B>toBuilder()"
nameWithType: "B>toBuilder()"
- fullName: "B>toBuilder()"
+ fullName: "B>toBuilder()"
\ No newline at end of file
diff --git a/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.v1.stub.SpeechStubSettings.Builder.yml b/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.v1.stub.SpeechStubSettings.Builder.yml
index ef8d0393..9fa53bd5 100644
--- a/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.v1.stub.SpeechStubSettings.Builder.yml
+++ b/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.v1.stub.SpeechStubSettings.Builder.yml
@@ -60,6 +60,7 @@ items:
- "com.google.api.gax.rpc.StubSettings.Builder.setSwitchToMtlsEndpointAllowed(boolean)"
- "com.google.api.gax.rpc.StubSettings.Builder.setTracerFactory(com.google.api.gax.tracing.ApiTracerFactory)"
- "com.google.api.gax.rpc.StubSettings.Builder.setTransportChannelProvider(com.google.api.gax.rpc.TransportChannelProvider)"
+ - "com.google.api.gax.rpc.StubSettings.Builder.setUniverseDomain(java.lang.String)"
- "com.google.api.gax.rpc.StubSettings.Builder.toString()"
- "java.lang.Object.clone()"
- "java.lang.Object.equals(java.lang.Object)"
@@ -541,6 +542,11 @@ references:
name: "StubSettings.Builder.setTracerFactory(ApiTracerFactory)"
nameWithType: "StubSettings.Builder.setTracerFactory(ApiTracerFactory)"
fullName: "com.google.api.gax.rpc.StubSettings.Builder.setTracerFactory(com.google.api.gax.tracing.ApiTracerFactory)"
+- uid: "com.google.api.gax.rpc.StubSettings.Builder.setUniverseDomain(java.lang.String)"
+ isExternal: true
+ name: "StubSettings.Builder.setUniverseDomain(String)"
+ nameWithType: "StubSettings.Builder.setUniverseDomain(String)"
+ fullName: "com.google.api.gax.rpc.StubSettings.Builder.setUniverseDomain(java.lang.String)"
- uid: "com.google.api.gax.rpc.StubSettings.Builder.setSwitchToMtlsEndpointAllowed(boolean)"
isExternal: true
name: "StubSettings.Builder.setSwitchToMtlsEndpointAllowed(boolean)"
@@ -769,4 +775,4 @@ references:
- uid: "B>build()"
name: "B>build()"
nameWithType: "B>build()"
- fullName: "B>build()"
+ fullName: "B>build()"
\ No newline at end of file
diff --git a/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.v1.stub.SpeechStubSettings.yml b/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.v1.stub.SpeechStubSettings.yml
index 44bc1f60..8951f4cf 100644
--- a/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.v1.stub.SpeechStubSettings.yml
+++ b/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.v1.stub.SpeechStubSettings.yml
@@ -50,10 +50,12 @@ items:
- "com.google.api.gax.rpc.StubSettings.getInternalHeaderProvider()"
- "com.google.api.gax.rpc.StubSettings.getMtlsEndpoint()"
- "com.google.api.gax.rpc.StubSettings.getQuotaProjectId()"
+ - "com.google.api.gax.rpc.StubSettings.getServiceName()"
- "com.google.api.gax.rpc.StubSettings.getStreamWatchdogCheckInterval()"
- "com.google.api.gax.rpc.StubSettings.getStreamWatchdogProvider()"
- "com.google.api.gax.rpc.StubSettings.getTracerFactory()"
- "com.google.api.gax.rpc.StubSettings.getTransportChannelProvider()"
+ - "com.google.api.gax.rpc.StubSettings.getUniverseDomain()"
- "com.google.api.gax.rpc.StubSettings.toBuilder()"
- "com.google.api.gax.rpc.StubSettings.toString()"
- "java.lang.Object.clone()"
@@ -804,6 +806,11 @@ references:
name: "StubSettings.getQuotaProjectId()"
nameWithType: "StubSettings.getQuotaProjectId()"
fullName: "com.google.api.gax.rpc.StubSettings.getQuotaProjectId()"
+- uid: "com.google.api.gax.rpc.StubSettings.getServiceName()"
+ isExternal: true
+ name: "StubSettings.getServiceName()"
+ nameWithType: "StubSettings.getServiceName()"
+ fullName: "com.google.api.gax.rpc.StubSettings.getServiceName()"
- uid: "java.lang.Object.notify()"
href: "https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html#notify--"
name: "Object.notify()"
@@ -814,6 +821,11 @@ references:
name: "StubSettings.toBuilder()"
nameWithType: "StubSettings.toBuilder()"
fullName: "com.google.api.gax.rpc.StubSettings.toBuilder()"
+- uid: "com.google.api.gax.rpc.StubSettings.getUniverseDomain()"
+ isExternal: true
+ name: "StubSettings.getUniverseDomain()"
+ nameWithType: "StubSettings.getUniverseDomain()"
+ fullName: "com.google.api.gax.rpc.StubSettings.getUniverseDomain()"
- uid: "java.lang.Object.notifyAll()"
href: "https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html#notifyAll--"
name: "Object.notifyAll()"
@@ -894,4 +906,4 @@ references:
isExternal: true
name: "StubSettings"
nameWithType: "StubSettings"
- fullName: "com.google.api.gax.rpc.StubSettings"
+ fullName: "com.google.api.gax.rpc.StubSettings"
\ No newline at end of file
From 1f3ac62ba464a19dd7ff3822a8fa69eb232b5094 Mon Sep 17 00:00:00 2001
From: Mend Renovate
Date: Wed, 21 Feb 2024 21:09:28 +0100
Subject: [PATCH 18/18] chore(deps): update dependency
org.apache.maven.plugins:maven-javadoc-plugin to v3.6.3 (#196)
Co-authored-by: Alice <65933803+alicejli@users.noreply.github.com>
---
third_party/docfx-doclet-143274/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/third_party/docfx-doclet-143274/pom.xml b/third_party/docfx-doclet-143274/pom.xml
index 3669bfb5..b95ec913 100644
--- a/third_party/docfx-doclet-143274/pom.xml
+++ b/third_party/docfx-doclet-143274/pom.xml
@@ -58,7 +58,7 @@
org.apache.maven.plugins
maven-javadoc-plugin
- 3.5.0
+ 3.6.3
com.microsoft.doclet.DocFxDoclet