From d8124dd003e7ab8f485a1158688e2a04a95ae5c4 Mon Sep 17 00:00:00 2001 From: Joe Wang Date: Mon, 31 Mar 2025 10:24:59 -0400 Subject: [PATCH 1/2] chore: remove logging module --- java-sdk-logging/java.header | 29 --------------- java-sdk-logging/license-checks.xml | 10 ------ java-sdk-logging/log4j2-extension/pom.xml | 30 ---------------- java-sdk-logging/logback-extension/pom.xml | 42 ---------------------- java-sdk-logging/pom.xml | 39 -------------------- 5 files changed, 150 deletions(-) delete mode 100644 java-sdk-logging/java.header delete mode 100644 java-sdk-logging/license-checks.xml delete mode 100644 java-sdk-logging/log4j2-extension/pom.xml delete mode 100644 java-sdk-logging/logback-extension/pom.xml delete mode 100644 java-sdk-logging/pom.xml diff --git a/java-sdk-logging/java.header b/java-sdk-logging/java.header deleted file mode 100644 index 0ae9545dbb..0000000000 --- a/java-sdk-logging/java.header +++ /dev/null @@ -1,29 +0,0 @@ -^/\*$ -^ \* 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/license-checks.xml b/java-sdk-logging/license-checks.xml deleted file mode 100644 index 2d5f2071ad..0000000000 --- a/java-sdk-logging/license-checks.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - diff --git a/java-sdk-logging/log4j2-extension/pom.xml b/java-sdk-logging/log4j2-extension/pom.xml deleted file mode 100644 index 6d8b6c79e4..0000000000 --- a/java-sdk-logging/log4j2-extension/pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - 4.0.0 - - com.google.cloud - java-sdk-logging-parent - 0.1.0-SNAPSHOT - ../pom.xml - - log4j2-extension - - - UTF-8 - - - - - org.junit.jupiter - junit-jupiter-api - test - - - org.mockito - mockito-core - test - - - \ No newline at end of file diff --git a/java-sdk-logging/logback-extension/pom.xml b/java-sdk-logging/logback-extension/pom.xml deleted file mode 100644 index 64b1a8958b..0000000000 --- a/java-sdk-logging/logback-extension/pom.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - 4.0.0 - - com.google.cloud - 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 - - - \ No newline at end of file diff --git a/java-sdk-logging/pom.xml b/java-sdk-logging/pom.xml deleted file mode 100644 index c589d50132..0000000000 --- a/java-sdk-logging/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - 4.0.0 - com.google.cloud - java-sdk-logging-parent - 0.1.0-SNAPSHOT - pom - - com.google.api - gapic-generator-java-pom-parent - 2.55.2-SNAPSHOT - ../gapic-generator-java-pom-parent - - - log4j2-extension - logback-extension - - - - - - org.junit - junit-bom - ${junit.version} - import - pom - - - org.mockito - mockito-bom - ${mockito.version} - import - pom - - - - \ No newline at end of file From 9040d8aa91528766f678c7f79b25314dccad18f1 Mon Sep 17 00:00:00 2001 From: Joe Wang Date: Mon, 31 Mar 2025 10:25:25 -0400 Subject: [PATCH 2/2] remove workflow --- .github/workflows/java_sdk_logging.yaml | 85 ------------------------- 1 file changed, 85 deletions(-) delete mode 100644 .github/workflows/java_sdk_logging.yaml diff --git a/.github/workflows/java_sdk_logging.yaml b/.github/workflows/java_sdk_logging.yaml deleted file mode 100644 index 24a82cf9de..0000000000 --- a/.github/workflows/java_sdk_logging.yaml +++ /dev/null @@ -1,85 +0,0 @@ -# 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: Install parent module - run: | - mvn install -B -ntp -pl gapic-generator-java-pom-parent - - name: Unit Tests - working-directory: java-sdk-logging - run: | - mvn test -B -ntp -Dcheckstyle.skip -Dfmt.skip - module-lint: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-java@v4 - with: - java-version: 11 - distribution: temurin - - name: Install parent module - run: | - mvn install -B -ntp -pl gapic-generator-java-pom-parent - - name: Java Linter - run: | - mvn -B -ntp fmt:check - working-directory: java-sdk-logging - module-clirr: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-java@v4 - with: - java-version: 11 - distribution: temurin - - name: Install parent module - run: | - mvn install -B -ntp -pl gapic-generator-java-pom-parent - - name: Clirr check - run: | - mvn -B -ntp -Denforcer.skip=true clirr:check - working-directory: java-sdk-logging - module-enforcer: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-java@v4 - with: - java-version: 11 - distribution: temurin - - name: Install parent module - run: | - mvn install -B -ntp -pl gapic-generator-java-pom-parent - - name: Enforcer check - run: | - mvn -B -ntp enforcer:enforce@enforce -T 1C - working-directory: java-sdk-logging