Revert "merge from main to datacatalog branch (#7449)" (#7450)

This reverts commit 361657a.

Author: charlieyu1996

.github/CODEOWNERS

@@ -1,23 +1,18 @@
-# Code owners file
-
-# This file controls who is tagged for review for any given pull request
+# Code owners file.
+# This file controls who is tagged for review for any given pull request.
 
 # The java-samples-reviewers team is the default owner for anything not
+# explicitly taken by someone else.
 
-# explicitly taken by someone else
-
-* @GoogleCloudPlatform/java-samples-reviewers @yoshi-approver
+*                         @GoogleCloudPlatform/java-samples-reviewers @yoshi-approver
 
 /bigtable/**/*.java             @GoogleCloudPlatform/cloud-native-db-dpes @GoogleCloudPlatform/java-samples-reviewers @yoshi-approver
 /cloud-sql/**/*.java            @GoogleCloudPlatform/infra-db-dpes @GoogleCloudPlatform/java-samples-reviewers @yoshi-approver
 /datastore/**/*.java            @GoogleCloudPlatform/cloud-native-db-dpes @GoogleCloudPlatform/java-samples-reviewers @yoshi-approver
 /firestore/**/*.java            @GoogleCloudPlatform/cloud-native-db-dpes @GoogleCloudPlatform/java-samples-reviewers @yoshi-approver
 /iot/                           @gcseh @GoogleCloudPlatform/api-iot @GoogleCloudPlatform/java-samples-reviewers @yoshi-approver
-/logging/                       @GoogleCloudPlatform/dee-platform-ops @GoogleCloudPlatform/java-samples-reviewers @yoshi-approver
+/logging/                       @GoogleCloudPlatform/observability-devx @GoogleCloudPlatform/java-samples-reviewers @yoshi-approver
 /pubsub/                        @GoogleCloudPlatform/api-pubsub-and-pubsublite @GoogleCloudPlatform/java-samples-reviewers @yoshi-approver
 /pubsublite/                    @GoogleCloudPlatform/api-pubsub-and-pubsublite @GoogleCloudPlatform/java-samples-reviewers @yoshi-approver
 /storage/**/*.java              @GoogleCloudPlatform/cloud-storage-dpes @GoogleCloudPlatform/java-samples-reviewers @yoshi-approver
 .github/auto-approve.yml        @googleapis/github-automation/ @sofisl @GoogleCloudPlatform/java-samples-reviewers
-/asset/                         @GoogleCloudPlatform/dee-infra @GoogleCloudPlatform/java-samples-reviewers @yoshi-approver
-/errorreporting/                @GoogleCloudPlatform/dee-platform-ops @GoogleCloudPlatform/java-samples-reviewers @yoshi-approver
-/monitoring/                    @GoogleCloudPlatform/dee-platform-ops @GoogleCloudPlatform/java-samples-reviewers @yoshi-approver

.kokoro/tests/run_tests.sh

@@ -74,8 +74,7 @@ if [[ "$SCRIPT_DEBUG" != "true" ]]; then
     "java-functions-samples-secrets.txt" \
     "java-firestore-samples-secrets.txt" \
     "java-cts-v4-samples-secrets.txt" \
-    "java-cloud-sql-samples-secrets.txt" \
-    "java-scc-samples-secrets.txt")
+    "java-cloud-sql-samples-secrets.txt")
 
     # create secret dir
     mkdir -p "${KOKORO_GFILE_DIR}/secrets"

appengine-java8/firebase-tictactoe/pom.xml

@@ -72,7 +72,7 @@
     <dependency>
       <groupId>com.google.api-client</groupId>
       <artifactId>google-api-client-appengine</artifactId>
-      <version>2.0.1</version>
+      <version>1.34.1</version>
     </dependency>