Merge branch 'main' into chore/update-action-ver

googleapis · Nov 26, 2024 · 8ddcb0b · 8ddcb0b
2 parents 9b45c94 + 6544539
commit 8ddcb0b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml
@@ -24,7 +24,7 @@ jobs:
           cache: maven
       - run: mvn -version
       - name: Install
-        run: mvn install --errors --batch-mode --no-transfer-progress -Dcheckstyle.skip -T 1C
+        run: mvn install --errors --batch-mode --no-transfer-progress -Dcheckstyle.skip
       - name: Create issue if previous step fails
         if: ${{ failure() }}
         env:
@@ -49,7 +49,7 @@ jobs:
           cache: maven
       - run: mvn -version
       - name: Install with Java 11
-        run: mvn install --errors --batch-mode --no-transfer-progress -Dcheckstyle.skip -DskipTests -T 1C
+        run: mvn install --errors --batch-mode --no-transfer-progress -Dcheckstyle.skip -DskipTests
 
       - uses: actions/setup-java@v3
         with:
@@ -58,7 +58,7 @@ jobs:
       - run: mvn -version
       - name: Test with Java 8
         # Direct goal invocation ("surefire:test") prevents recompiling tests
-        run: mvn surefire:test --errors --batch-mode --no-transfer-progress -T 1C
+        run: mvn surefire:test --errors --batch-mode --no-transfer-progress
       - name: Create issue if previous step fails
         if: ${{ failure() }}
         env:

diff --git a/gax-java/dependencies.properties b/gax-java/dependencies.properties
@@ -35,10 +35,8 @@ version.io_grpc=1.68.1
 # It should be constructed the following way:
 #   1) Take full artifact id (including the group and classifier (if any) portions) and remove version portion.
 #   2) Replace all characters which are neither alphabetic nor digits with the underscore ('_') character
-# {x-version-update-start:proto-google-common-protos:current}
 maven.com_google_api_grpc_proto_google_common_protos=com.google.api.grpc:proto-google-common-protos:2.46.0
 maven.com_google_api_grpc_grpc_google_common_protos=com.google.api.grpc:grpc-google-common-protos:2.46.0
-# {x-version-update-end}
 maven.com_google_auth_google_auth_library_oauth2_http=com.google.auth:google-auth-library-oauth2-http:1.30.0
 maven.com_google_auth_google_auth_library_credentials=com.google.auth:google-auth-library-credentials:1.30.0
 maven.io_opentelemetry_opentelemetry_api=io.opentelemetry:opentelemetry-api:1.42.1
@@ -69,14 +67,10 @@ maven.com_google_errorprone_error_prone_annotations=com.google.errorprone:error_
 maven.com_google_j2objc_j2objc_annotations=com.google.j2objc:j2objc-annotations:2.8
 maven.com_google_auto_value_auto_value=com.google.auto.value:auto-value:1.11.0
 maven.com_google_auto_value_auto_value_annotations=com.google.auto.value:auto-value-annotations:1.11.0
-# {x-version-update-start:api-common:current}
 maven.com_google_api_api_common=com.google.api:api-common:2.38.0
-# {x-version-update-end}
 maven.org_threeten_threetenbp=org.threeten:threetenbp:1.7.0
-# {x-version-update-start:proto-google-iam-v1:current}
 maven.com_google_api_grpc_grpc_google_iam_v1=com.google.api.grpc:grpc-google-iam-v1:1.41.0
 maven.com_google_api_grpc_proto_google_iam_v1=com.google.api.grpc:proto-google-iam-v1:1.41.0
-# {x-version-update-end}
 maven.com_google_http_client_google_http_client=com.google.http-client:google-http-client:1.45.0
 maven.com_google_http_client_google_http_client_gson=com.google.http-client:google-http-client-gson:1.45.0
 maven.org_codehaus_mojo_animal_sniffer_annotations=org.codehaus.mojo:animal-sniffer-annotations:1.24