Skip to content

chore: adjust download-maven-plugin usages to reduce release flakiness #13272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
whowes wants to merge 3 commits into
base: main
Choose a base branch
from
Open

chore: adjust download-maven-plugin usages to reduce release flakiness #13272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f4ac6e
chore: set separate cacheDirectory configuration for download-maven-p…
whowes May 26, 2026
d5a8bc2
chore: disable cache completely for download-maven-plugin usages
whowes May 26, 2026
ba94110
chore: check in common protos for gapic-generator-java
whowes May 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions java-showcase/gapic-showcase/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
https://raw.githubusercontent.com/googleapis/gapic-showcase/v${gapic-showcase.version}/server/services/compliance_suite.json
</url>
<outputDirectory>src/test/resources</outputDirectory>
<skipCache>true</skipCache>
<!-- Set this to always download the latest version and overwrite the existing file -->
<overwrite>true</overwrite>
</configuration>
Expand Down
136 changes: 0 additions & 136 deletions sdk-platform-java/gapic-generator-java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,122 +121,6 @@
</configuration>
</plugin>

<plugin>
<groupId>com.googlecode.maven-download-plugin</groupId>
<artifactId>download-maven-plugin</artifactId>
<version>1.6.8</version>
<executions>
<execution>
<id>download-metadata-proto</id>
<phase>generate-sources</phase>
<goals>
<goal>wget</goal>
</goals>
<configuration>
<url>
https://raw.githubusercontent.com/googleapis/googleapis/${googleapis.commit}/gapic/metadata/gapic_metadata.proto
</url>
<outputDirectory>target/generated-sources/proto</outputDirectory>
</configuration>
</execution>
<execution>
<id>download-common-resources-proto</id>
<phase>generate-test-sources</phase>
<goals>
<goal>wget</goal>
</goals>
<configuration>
<url>
https://raw.githubusercontent.com/googleapis/googleapis/${googleapis.commit}/google/cloud/common_resources.proto
</url>
<outputDirectory>target/generated-test-sources/proto</outputDirectory>
</configuration>
</execution>
<execution>
<id>download-pubsub-proto</id>
<phase>generate-test-sources</phase>
<goals>
<goal>wget</goal>
</goals>
<configuration>
<url>
https://raw.githubusercontent.com/googleapis/googleapis/${googleapis.commit}/google/pubsub/v1/pubsub.proto
</url>
<outputDirectory>target/generated-test-sources/proto</outputDirectory>
</configuration>
</execution>
<execution>
<id>download-schema-proto</id>
<phase>generate-test-sources</phase>
<goals>
<goal>wget</goal>
</goals>
<configuration>
<url>
https://raw.githubusercontent.com/googleapis/googleapis/${googleapis.commit}/google/pubsub/v1/schema.proto
</url>
<outputDirectory>target/generated-test-sources/proto/google/pubsub/v1
</outputDirectory>
</configuration>
</execution>
<execution>
<id>download-logging-proto</id>
<phase>generate-test-sources</phase>
<goals>
<goal>wget</goal>
</goals>
<configuration>
<url>
https://raw.githubusercontent.com/googleapis/googleapis/${googleapis.commit}/google/logging/v2/logging.proto
</url>
<outputDirectory>target/generated-test-sources/proto</outputDirectory>
</configuration>
</execution>
<execution>
<id>download-log-entry-proto</id>
<phase>generate-test-sources</phase>
<goals>
<goal>wget</goal>
</goals>
<configuration>
<url>
https://raw.githubusercontent.com/googleapis/googleapis/${googleapis.commit}/google/logging/v2/log_entry.proto
</url>
<outputDirectory>target/generated-test-sources/proto/google/logging/v2
</outputDirectory>
</configuration>
</execution>
<execution>
<id>download-logging-config-proto</id>
<phase>generate-test-sources</phase>
<goals>
<goal>wget</goal>
</goals>
<configuration>
<url>
https://raw.githubusercontent.com/googleapis/googleapis/${googleapis.commit}/google/logging/v2/logging_config.proto
</url>
<outputDirectory>target/generated-test-sources/proto/google/logging/v2
</outputDirectory>
</configuration>
</execution>
<execution>
<id>download-logging-metrics-proto</id>
<phase>generate-test-sources</phase>
<goals>
<goal>wget</goal>
</goals>
<configuration>
<url>
https://raw.githubusercontent.com/googleapis/googleapis/${googleapis.commit}/google/logging/v2/logging_metrics.proto
</url>
<outputDirectory>target/generated-test-sources/proto/google/logging/v2
</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.xolstice.maven.plugins</groupId>
<artifactId>protobuf-maven-plugin</artifactId>
Expand All @@ -256,16 +140,6 @@
<protoSourceRoot>src/main/proto</protoSourceRoot>
</configuration>
</execution>
<execution>
<id>compile-downloaded-protos</id>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<protoSourceRoot>target/generated-sources/proto</protoSourceRoot>
<clearOutputDirectory>false</clearOutputDirectory>
</configuration>
</execution>
<execution>
<id>compile-test-protos</id>
<goals>
Expand All @@ -279,16 +153,6 @@
<descriptorSetFileName>test-proto.descriptorset</descriptorSetFileName>
</configuration>
</execution>
<execution>
<id>compile-downloaded-test-protos</id>
<goals>
<goal>test-compile</goal>
</goals>
<configuration>
<protoTestSourceRoot>target/generated-test-sources/proto</protoTestSourceRoot>
<clearOutputDirectory>false</clearOutputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
Expand Down
98 changes: 98 additions & 0 deletions sdk-platform-java/gapic-generator-java/src/main/proto/gapic/metadata/gapic_metadata.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
// Copyright 2020 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.
//

syntax = "proto3";

package google.gapic.metadata;

option csharp_namespace = "Google.Gapic.Metadata";
option go_package = "google.golang.org/genproto/googleapis/gapic/metadata;metadata";
option java_multiple_files = true;
option java_outer_classname = "GapicMetadataProto";
option java_package = "com.google.gapic.metadata";
option php_namespace = "Google\\Gapic\\Metadata";
option ruby_package = "Google::Gapic::Metadata";

// Metadata about a GAPIC library service for a specific combination of API,
// version, and computer language.
message GapicMetadata {
// Schema version of this proto. Current value: 1.0
string schema = 1;

// Any human-readable comments to be included in this file.
string comment = 2;

// Computer language of this generated language. This must be
// spelled out as it spoken in English, with no capitalization or
// separators (e.g. "csharp", "nodejs").
string language = 3;

// The proto package containing the API definition for which this
// GAPIC library was generated.
string proto_package = 4;

// The language-specific library package for this GAPIC library.
string library_package = 5;

// A map from each proto-defined service to ServiceForTransports,
// which allows listing information about transport-specific
// implementations of the service.
//
// The key is the name of the service as it appears in the .proto
// file.
map<string, ServiceForTransport> services = 6;

// A map from a transport name to ServiceAsClient, which allows
// listing information about the client objects that implement the
// parent RPC service for the specified transport.
message ServiceForTransport {
// Map of transport name to ServiceAsClient. The key name is the transport,
// lower-cased with no separators (e.g. "grpc", "rest").
map<string, ServiceAsClient> clients = 1;

// The API version for the interface definition found in the
// `google.api.api_version` annotation of this proto-defined service during
// code generation.
// This is the value populated by the client in the API version request
// parameter as per
// [AIP-4236](https://google.aip.dev/client-libraries/4236).
string api_version = 2;
}

// Information about a specific client implementing a proto-defined service.
message ServiceAsClient {
// The name of the library client formatted as it appears in the source code
string library_client = 1;

// A mapping from each proto-defined RPC name to the the list of
// methods in library_client that implement it. There can be more
// than one library_client method for each RPC. RPCs with no
// library_client methods need not be included.
//
// The key name is the name of the RPC as defined and formatted in
// the proto file.
map<string, MethodList> rpcs = 2;
}

// List of GAPIC client methods implementing the proto-defined RPC
// for the transport and service specified in the containing
// structures.
message MethodList {
// List of methods for a specific proto-service client in the
// GAPIC. These names should be formatted as they appear in the
// source code.
repeated string methods = 1;
}
}
52 changes: 52 additions & 0 deletions sdk-platform-java/gapic-generator-java/src/test/proto/google/cloud/common_resources.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
// 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.

// This file contains stub messages for common resources in GCP.
// It is not intended to be directly generated, and is instead used by
// other tooling to be able to match common resource patterns.
syntax = "proto3";

package google.cloud;

import "google/api/resource.proto";


option (google.api.resource_definition) = {
type: "cloudresourcemanager.googleapis.com/Project"
pattern: "projects/{project}"
};


option (google.api.resource_definition) = {
type: "cloudresourcemanager.googleapis.com/Organization"
pattern: "organizations/{organization}"
};


option (google.api.resource_definition) = {
type: "cloudresourcemanager.googleapis.com/Folder"
pattern: "folders/{folder}"
};


option (google.api.resource_definition) = {
type: "cloudbilling.googleapis.com/BillingAccount"
pattern: "billingAccounts/{billing_account}"
};

option (google.api.resource_definition) = {
type: "locations.googleapis.com/Location"
pattern: "projects/{project}/locations/{location}"
};

Loading
Loading