From c7b1e85c0c9f3b5dd62c8a7f150d3bbc9e8dabcd Mon Sep 17 00:00:00 2001 From: Joe Wang Date: Mon, 17 Mar 2025 10:15:13 -0400 Subject: [PATCH 01/13] chore: create logging module barebone --- java-sdk-logging/java-sdk-logging-bom/pom.xml | 41 ++++++++++++++ java-sdk-logging/java.header | 29 ++++++++++ java-sdk-logging/log4j-extension/pom.xml | 42 ++++++++++++++ java-sdk-logging/logback-extension/pom.xml | 54 ++++++++++++++++++ java-sdk-logging/pom.xml | 55 +++++++++++++++++++ pom.xml | 1 + 6 files changed, 222 insertions(+) create mode 100644 java-sdk-logging/java-sdk-logging-bom/pom.xml create mode 100644 java-sdk-logging/java.header create mode 100644 java-sdk-logging/log4j-extension/pom.xml create mode 100644 java-sdk-logging/logback-extension/pom.xml create mode 100644 java-sdk-logging/pom.xml diff --git a/java-sdk-logging/java-sdk-logging-bom/pom.xml b/java-sdk-logging/java-sdk-logging-bom/pom.xml new file mode 100644 index 0000000000..ed5d894842 --- /dev/null +++ b/java-sdk-logging/java-sdk-logging-bom/pom.xml @@ -0,0 +1,41 @@ + + + 4.0.0 + + com.google.api + java-sdk-logging-parent + 0.1.0-SNAPSHOT + ../pom.xml + + pom + + java-sdk-logging-bom + + + UTF-8 + + + + + + com.google.api + logback-extension + 0.1.0-SNAPSHOT + + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + + \ No newline at end of file diff --git a/java-sdk-logging/java.header b/java-sdk-logging/java.header new file mode 100644 index 0000000000..0ae9545dbb --- /dev/null +++ b/java-sdk-logging/java.header @@ -0,0 +1,29 @@ +^/\*$ +^ \* Copyright 20\d\d Google LLC$ +^ \*$ +^ \* Redistribution and use in source and binary forms, with or without$ +^ \* modification, are permitted provided that the following conditions are$ +^ \* met:$ +^ \*$ +^ \* \* Redistributions of source code must retain the above copyright$ +^ \* notice, this list of conditions and the following disclaimer.$ +^ \* \* Redistributions in binary form must reproduce the above$ +^ \* copyright notice, this list of conditions and the following disclaimer$ +^ \* in the documentation and/or other materials provided with the$ +^ \* distribution.$ +^ \* \* Neither the name of Google LLC nor the names of its$ +^ \* contributors may be used to endorse or promote products derived from$ +^ \* this software without specific prior written permission.$ +^ \*$ +^ \* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS$ +^ \* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT$ +^ \* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR$ +^ \* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT$ +^ \* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,$ +^ \* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES \(INCLUDING, BUT NOT$ +^ \* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,$ +^ \* DATA, OR PROFITS; OR BUSINESS INTERRUPTION\) HOWEVER CAUSED AND ON ANY$ +^ \* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT$ +^ \* \(INCLUDING NEGLIGENCE OR OTHERWISE\) ARISING IN ANY WAY OUT OF THE USE$ +^ \* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.$ +^ \*/$ \ No newline at end of file diff --git a/java-sdk-logging/log4j-extension/pom.xml b/java-sdk-logging/log4j-extension/pom.xml new file mode 100644 index 0000000000..9cc0cd49e0 --- /dev/null +++ b/java-sdk-logging/log4j-extension/pom.xml @@ -0,0 +1,42 @@ + + + 4.0.0 + + com.google.api + java-sdk-logging-parent + 0.1.0-SNAPSHOT + ../pom.xml + + log4j-extension + + + UTF-8 + + + + + org.junit.jupiter + junit-jupiter-api + test + + + org.mockito + mockito-core + test + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + + \ No newline at end of file diff --git a/java-sdk-logging/logback-extension/pom.xml b/java-sdk-logging/logback-extension/pom.xml new file mode 100644 index 0000000000..0016bd4f1d --- /dev/null +++ b/java-sdk-logging/logback-extension/pom.xml @@ -0,0 +1,54 @@ + + + 4.0.0 + + com.google.api + java-sdk-logging-parent + 0.1.0-SNAPSHOT + ../pom.xml + + logback-extension + + + UTF-8 + 1.2.13 + 7.3 + + + + + ch.qos.logback + logback-classic + ${logback.version} + + + net.logstash.logback + logstash-logback-encoder + ${logstash.encoder.version} + + + org.junit.jupiter + junit-jupiter-api + test + + + org.mockito + mockito-core + test + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + + \ No newline at end of file diff --git a/java-sdk-logging/pom.xml b/java-sdk-logging/pom.xml new file mode 100644 index 0000000000..0e577c8138 --- /dev/null +++ b/java-sdk-logging/pom.xml @@ -0,0 +1,55 @@ + + + 4.0.0 + java-sdk-logging-parent + 0.1.0-SNAPSHOT + pom + + com.google.api + gapic-generator-java-pom-parent + 2.55.1 + ../gapic-generator-java-pom-parent + + + java-sdk-logging-bom + log4j-extension + logback-extension + + + + 4.11.0 + + + + + + org.junit + junit-bom + ${junit.version} + import + pom + + + org.mockito + mockito-bom + ${mockito.version} + import + pom + + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 6e328677b6..85fd91a3db 100644 --- a/pom.xml +++ b/pom.xml @@ -24,6 +24,7 @@ gapic-generator-java-bom java-shared-dependencies sdk-platform-java-config + java-sdk-logging From cc41214e530b3daf9544f3f3b1881b6fa708825f Mon Sep 17 00:00:00 2001 From: Joe Wang Date: Mon, 17 Mar 2025 11:19:59 -0400 Subject: [PATCH 02/13] change bom name --- .../pom.xml | 2 +- java-sdk-logging/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename java-sdk-logging/{java-sdk-logging-bom => java-sdk-logging-extensions-bom}/pom.xml (95%) diff --git a/java-sdk-logging/java-sdk-logging-bom/pom.xml b/java-sdk-logging/java-sdk-logging-extensions-bom/pom.xml similarity index 95% rename from java-sdk-logging/java-sdk-logging-bom/pom.xml rename to java-sdk-logging/java-sdk-logging-extensions-bom/pom.xml index ed5d894842..84fdb81e22 100644 --- a/java-sdk-logging/java-sdk-logging-bom/pom.xml +++ b/java-sdk-logging/java-sdk-logging-extensions-bom/pom.xml @@ -11,7 +11,7 @@ pom - java-sdk-logging-bom + java-sdk-logging-extensions-bom UTF-8 diff --git a/java-sdk-logging/pom.xml b/java-sdk-logging/pom.xml index 0e577c8138..684b0ce160 100644 --- a/java-sdk-logging/pom.xml +++ b/java-sdk-logging/pom.xml @@ -13,7 +13,7 @@ ../gapic-generator-java-pom-parent - java-sdk-logging-bom + java-sdk-logging-extensions-bom log4j-extension logback-extension From 97d3c61fac3739af43b64814ccf7fa2b76fd5965 Mon Sep 17 00:00:00 2001 From: Joe Wang Date: Mon, 17 Mar 2025 11:27:38 -0400 Subject: [PATCH 03/13] change bom name --- java-sdk-logging/{log4j-extension => log4j2-extension}/pom.xml | 2 +- java-sdk-logging/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename java-sdk-logging/{log4j-extension => log4j2-extension}/pom.xml (96%) diff --git a/java-sdk-logging/log4j-extension/pom.xml b/java-sdk-logging/log4j2-extension/pom.xml similarity index 96% rename from java-sdk-logging/log4j-extension/pom.xml rename to java-sdk-logging/log4j2-extension/pom.xml index 9cc0cd49e0..d1df1f8541 100644 --- a/java-sdk-logging/log4j-extension/pom.xml +++ b/java-sdk-logging/log4j2-extension/pom.xml @@ -9,7 +9,7 @@ 0.1.0-SNAPSHOT ../pom.xml - log4j-extension + log4j2-extension UTF-8 diff --git a/java-sdk-logging/pom.xml b/java-sdk-logging/pom.xml index 684b0ce160..f12c02cdbd 100644 --- a/java-sdk-logging/pom.xml +++ b/java-sdk-logging/pom.xml @@ -14,7 +14,7 @@ java-sdk-logging-extensions-bom - log4j-extension + log4j2-extension logback-extension From 050b044738a9de3ee895b12733350ad74d1b8190 Mon Sep 17 00:00:00 2001 From: Joe Wang Date: Mon, 17 Mar 2025 11:31:32 -0400 Subject: [PATCH 04/13] remove bom --- .../java-sdk-logging-extensions-bom/pom.xml | 41 ------------------- java-sdk-logging/pom.xml | 1 - 2 files changed, 42 deletions(-) delete mode 100644 java-sdk-logging/java-sdk-logging-extensions-bom/pom.xml diff --git a/java-sdk-logging/java-sdk-logging-extensions-bom/pom.xml b/java-sdk-logging/java-sdk-logging-extensions-bom/pom.xml deleted file mode 100644 index 84fdb81e22..0000000000 --- a/java-sdk-logging/java-sdk-logging-extensions-bom/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - 4.0.0 - - com.google.api - java-sdk-logging-parent - 0.1.0-SNAPSHOT - ../pom.xml - - pom - - java-sdk-logging-extensions-bom - - - UTF-8 - - - - - - com.google.api - logback-extension - 0.1.0-SNAPSHOT - - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - - \ No newline at end of file diff --git a/java-sdk-logging/pom.xml b/java-sdk-logging/pom.xml index f12c02cdbd..cba81dfbc1 100644 --- a/java-sdk-logging/pom.xml +++ b/java-sdk-logging/pom.xml @@ -13,7 +13,6 @@ ../gapic-generator-java-pom-parent - java-sdk-logging-extensions-bom log4j2-extension logback-extension From dff844b6b3975760621229ebfb1cdf6ae9202935 Mon Sep 17 00:00:00 2001 From: Joe Wang Date: Mon, 17 Mar 2025 13:42:30 -0400 Subject: [PATCH 05/13] add mockito version to parent pom --- gapic-generator-java-pom-parent/pom.xml | 1 + gax-java/pom.xml | 2 +- java-sdk-logging/pom.xml | 4 ---- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/gapic-generator-java-pom-parent/pom.xml b/gapic-generator-java-pom-parent/pom.xml index ff3031ad2c..75d9ab38c8 100644 --- a/gapic-generator-java-pom-parent/pom.xml +++ b/gapic-generator-java-pom-parent/pom.xml @@ -38,6 +38,7 @@ 3.0.0 1.7.0 5.11.4 + 4.11.0 2.0.16 diff --git a/gax-java/pom.xml b/gax-java/pom.xml index a3c18f3b3d..fb0db88a72 100644 --- a/gax-java/pom.xml +++ b/gax-java/pom.xml @@ -163,7 +163,7 @@ org.mockito mockito-bom - 4.11.0 + ${mockito.version} pom import diff --git a/java-sdk-logging/pom.xml b/java-sdk-logging/pom.xml index cba81dfbc1..17146f1f54 100644 --- a/java-sdk-logging/pom.xml +++ b/java-sdk-logging/pom.xml @@ -17,10 +17,6 @@ logback-extension - - 4.11.0 - - From c89c3c9fa6b94106da99eb0372502059a022d6cf Mon Sep 17 00:00:00 2001 From: Joe Wang Date: Mon, 17 Mar 2025 14:50:32 -0400 Subject: [PATCH 06/13] remove module from root pom --- .github/workflows/java_sdk_logging.yaml | 0 pom.xml | 1 - 2 files changed, 1 deletion(-) create mode 100644 .github/workflows/java_sdk_logging.yaml diff --git a/.github/workflows/java_sdk_logging.yaml b/.github/workflows/java_sdk_logging.yaml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/pom.xml b/pom.xml index 85fd91a3db..6e328677b6 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,6 @@ gapic-generator-java-bom java-shared-dependencies sdk-platform-java-config - java-sdk-logging From f7f1d5a89097c2df1627ac6aa4982d2c43460493 Mon Sep 17 00:00:00 2001 From: Joe Wang Date: Mon, 17 Mar 2025 14:50:39 -0400 Subject: [PATCH 07/13] add a ci --- .github/workflows/java_sdk_logging.yaml | 49 +++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/.github/workflows/java_sdk_logging.yaml b/.github/workflows/java_sdk_logging.yaml index e69de29bb2..eb602d1762 100644 --- a/.github/workflows/java_sdk_logging.yaml +++ b/.github/workflows/java_sdk_logging.yaml @@ -0,0 +1,49 @@ +# Copyright 2025 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# Github action job to test core java library features on +# downstream client libraries before they are released. +on: + push: + branches: + - main + pull_request: + paths: + - java-sdk-logging/** + +name: java-sdk-logging-ci +jobs: + unit-test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 + with: + java-version: 8 + distribution: temurin + - name: Unit Tests + working-directory: java-sdk-logging + run: | + mvn test -B -ntp -Dcheckstyle.skip -Dfmt.skip + lint: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 + with: + java-version: 11 + distribution: temurin + cache: maven + - name: Java Linter + run: mvn -B -ntp fmt:check + working-directory: java-sdk-logging From 081d7caf523ea2d2459df76d84ec45fe4b880b05 Mon Sep 17 00:00:00 2001 From: Joe Wang Date: Mon, 17 Mar 2025 20:20:45 -0400 Subject: [PATCH 08/13] add a license checks --- java-sdk-logging/license-checks.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 java-sdk-logging/license-checks.xml diff --git a/java-sdk-logging/license-checks.xml b/java-sdk-logging/license-checks.xml new file mode 100644 index 0000000000..1e4f8692f1 --- /dev/null +++ b/java-sdk-logging/license-checks.xml @@ -0,0 +1,10 @@ + + + + + + + + From 905bf8416c9cca7caef3ede87a95d09a47a84592 Mon Sep 17 00:00:00 2001 From: Joe Wang Date: Mon, 17 Mar 2025 20:26:45 -0400 Subject: [PATCH 09/13] build parent module --- .github/workflows/java_sdk_logging.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/java_sdk_logging.yaml b/.github/workflows/java_sdk_logging.yaml index eb602d1762..ad5e3560ea 100644 --- a/.github/workflows/java_sdk_logging.yaml +++ b/.github/workflows/java_sdk_logging.yaml @@ -31,6 +31,9 @@ jobs: with: java-version: 8 distribution: temurin + - name: Build parent module + run: | + mvn clean install -pl gapic-generator-java-pom-parent - name: Unit Tests working-directory: java-sdk-logging run: | @@ -43,7 +46,9 @@ jobs: with: java-version: 11 distribution: temurin - cache: maven + - name: Build parent module + run: | + mvn clean install -pl gapic-generator-java-pom-parent - name: Java Linter run: mvn -B -ntp fmt:check working-directory: java-sdk-logging From 9bc1403eedcbbe3ac19b8ef9a57d94f36ee4d973 Mon Sep 17 00:00:00 2001 From: Joe Wang Date: Mon, 17 Mar 2025 20:38:44 -0400 Subject: [PATCH 10/13] remove clean --- .github/workflows/java_sdk_logging.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/java_sdk_logging.yaml b/.github/workflows/java_sdk_logging.yaml index ad5e3560ea..91f00b4aef 100644 --- a/.github/workflows/java_sdk_logging.yaml +++ b/.github/workflows/java_sdk_logging.yaml @@ -31,9 +31,9 @@ jobs: with: java-version: 8 distribution: temurin - - name: Build parent module + - name: Install parent module run: | - mvn clean install -pl gapic-generator-java-pom-parent + mvn install -pl gapic-generator-java-pom-parent - name: Unit Tests working-directory: java-sdk-logging run: | @@ -46,9 +46,10 @@ jobs: with: java-version: 11 distribution: temurin - - name: Build parent module + - name: Install parent module run: | - mvn clean install -pl gapic-generator-java-pom-parent + mvn install -pl gapic-generator-java-pom-parent - name: Java Linter - run: mvn -B -ntp fmt:check + run: | + mvn -B -ntp fmt:check working-directory: java-sdk-logging From 816d0fe0edaf7f033dffb6f915c2d0ab213c46a2 Mon Sep 17 00:00:00 2001 From: Joe Wang Date: Mon, 17 Mar 2025 20:41:45 -0400 Subject: [PATCH 11/13] change parent version --- .github/workflows/java_sdk_logging.yaml | 4 ++-- java-sdk-logging/pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/java_sdk_logging.yaml b/.github/workflows/java_sdk_logging.yaml index 91f00b4aef..b7189e57b1 100644 --- a/.github/workflows/java_sdk_logging.yaml +++ b/.github/workflows/java_sdk_logging.yaml @@ -33,7 +33,7 @@ jobs: distribution: temurin - name: Install parent module run: | - mvn install -pl gapic-generator-java-pom-parent + mvn install -B -ntp -pl gapic-generator-java-pom-parent - name: Unit Tests working-directory: java-sdk-logging run: | @@ -48,7 +48,7 @@ jobs: distribution: temurin - name: Install parent module run: | - mvn install -pl gapic-generator-java-pom-parent + mvn install -B -ntp -pl gapic-generator-java-pom-parent - name: Java Linter run: | mvn -B -ntp fmt:check diff --git a/java-sdk-logging/pom.xml b/java-sdk-logging/pom.xml index 17146f1f54..ffe88d0f13 100644 --- a/java-sdk-logging/pom.xml +++ b/java-sdk-logging/pom.xml @@ -9,7 +9,7 @@ com.google.api gapic-generator-java-pom-parent - 2.55.1 + 2.55.2-SNAPSHOT ../gapic-generator-java-pom-parent From 5b54c00c9e005c7dcec67c2cfa4b56af3291a36d Mon Sep 17 00:00:00 2001 From: Joe Wang Date: Mon, 17 Mar 2025 20:47:09 -0400 Subject: [PATCH 12/13] change job name --- .github/workflows/java_sdk_logging.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/java_sdk_logging.yaml b/.github/workflows/java_sdk_logging.yaml index b7189e57b1..c363513a81 100644 --- a/.github/workflows/java_sdk_logging.yaml +++ b/.github/workflows/java_sdk_logging.yaml @@ -38,7 +38,7 @@ jobs: working-directory: java-sdk-logging run: | mvn test -B -ntp -Dcheckstyle.skip -Dfmt.skip - lint: + module-lint: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 From 08ede6ec0d513fdda8abf6f0fac54e6139990fa2 Mon Sep 17 00:00:00 2001 From: Joe Wang Date: Tue, 18 Mar 2025 12:28:26 -0400 Subject: [PATCH 13/13] remove plugin customization --- java-sdk-logging/log4j2-extension/pom.xml | 12 ------------ java-sdk-logging/logback-extension/pom.xml | 12 ------------ java-sdk-logging/pom.xml | 12 ------------ 3 files changed, 36 deletions(-) diff --git a/java-sdk-logging/log4j2-extension/pom.xml b/java-sdk-logging/log4j2-extension/pom.xml index d1df1f8541..8bb288adab 100644 --- a/java-sdk-logging/log4j2-extension/pom.xml +++ b/java-sdk-logging/log4j2-extension/pom.xml @@ -27,16 +27,4 @@ test - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - \ No newline at end of file diff --git a/java-sdk-logging/logback-extension/pom.xml b/java-sdk-logging/logback-extension/pom.xml index 0016bd4f1d..86c9d7ca21 100644 --- a/java-sdk-logging/logback-extension/pom.xml +++ b/java-sdk-logging/logback-extension/pom.xml @@ -39,16 +39,4 @@ test - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - \ No newline at end of file diff --git a/java-sdk-logging/pom.xml b/java-sdk-logging/pom.xml index ffe88d0f13..a1e46287a8 100644 --- a/java-sdk-logging/pom.xml +++ b/java-sdk-logging/pom.xml @@ -35,16 +35,4 @@ - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - \ No newline at end of file