Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
edff92a
chore(java-pubsub): improve monorepo migration tooling
meltsufin Apr 29, 2026
ab46772
chore(java-pubsub): inject SHAs and fetch-depth for lint jobs
meltsufin Apr 29, 2026
3114ef5
chore(java-pubsub): add conditional version check to core migration s…
meltsufin Apr 29, 2026
b333519
Merge branch 'main' into chore/pubsub-migration-tooling
meltsufin Apr 30, 2026
a5b66ea
impl(java-pubsub): dynamically exempt unmanaged modules from global m…
meltsufin Apr 30, 2026
d798235
chore: fix owlbot formatting mismatch in maps-mapmanagement
meltsufin Apr 30, 2026
d009d0b
chore: align parent and module versions using apply_versions
meltsufin Apr 30, 2026
14f80a4
chore: integrate version alignment and owlbot formatting into migrate…
meltsufin Apr 30, 2026
b7b18ce
chore: allow MIGRATION_HEAD_BRANCH override in migrate-pubsub.sh
meltsufin Apr 30, 2026
eed800f
chore: revert MIGRATION_HEAD_BRANCH to main
meltsufin Apr 30, 2026
5f9abe6
chore: migrate GraalVM Native presubmit config in migration script
meltsufin Apr 30, 2026
a3eefd2
chore: migrate GraalVM and Integration presubmit configs in migration…
meltsufin Apr 30, 2026
412d413
chore: preserve GEMINI.md and DEVELOPMENT.md during migration
meltsufin May 1, 2026
09ea338
chore: add update_ci_filters.py and integrate with migrate script
meltsufin May 1, 2026
e001ddc
feat: add script to transfer issues
chingor13 Mar 26, 2026
d55b97b
chore: add update_changes_filters.py and integrate into migrate script
meltsufin May 1, 2026
9d024fc
chore: update repo-metadata.json repo and repo_short entries
meltsufin May 1, 2026
ab4696b
chore: add bulkTests profile automatically during pom modernization
meltsufin May 1, 2026
0e71587
chore: switch migration from read-tree to filter-repo
meltsufin May 1, 2026
2d59b5b
chore: add local git-filter-repo PATH injection in migrate script
meltsufin May 1, 2026
a3950aa
chore: add SKIP_SOURCE_UPDATE option to migrate script
meltsufin May 1, 2026
022d1bd
chore: fix syntax error in apply_versions.sh
meltsufin May 1, 2026
a2e4fd7
chore: fix OwlBot pathing and origin remote bug
meltsufin May 1, 2026
dc069a2
chore: remove unnecessary repo_short update to prevent clash with bot
meltsufin May 1, 2026
6f7097f
chore: strip java- prefix from migrated Kokoro cfg filenames
meltsufin May 1, 2026
4eaccad
chore: auto-substitute java8 trampoline image for java11 in migrated …
meltsufin May 1, 2026
02733fb
chore(migration): optimize paths, add workspace protection guard and …
meltsufin May 3, 2026
ba75e49
chore(migration): add initial source repository cleanup at startup
meltsufin May 3, 2026
9e0649a
chore: enhance monorepo migration scripts with generic exclusions and…
meltsufin May 3, 2026
e0a10d8
chore: isolate bulkTests profile injection to library root POM only
meltsufin May 3, 2026
6d7b0c8
chore(migration): support root centralized custom conformance migration
meltsufin May 3, 2026
29b2dda
chore(migration): support glob-based loop migration for all integrati…
meltsufin May 4, 2026
079f634
chore(migration): exclude hyphenated unmanaged dependency check workf…
meltsufin May 4, 2026
5c0d356
fix(migration): correct variable expansion for known failures databas…
meltsufin May 4, 2026
831eb7a
chore(migration): register custom test-proxy submodules inside parent…
meltsufin May 4, 2026
455cb2b
fix(migration): dynamically patch .kokoro/build.sh in target clone fo…
meltsufin May 4, 2026
49b5eec
chore(migration): automatically upgrade java-version from 8 to 11 ins…
meltsufin May 4, 2026
0ee1f84
fix(migration): pre-install library BOM modules to cache snapshots fo…
meltsufin May 4, 2026
b28142b
fix(migration): pre-install shared dependencies BOM into local m2 cac…
meltsufin May 5, 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
2 changes: 1 addition & 1 deletion generation/apply_versions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ if [[ "$column_name" == "released" ]]; then
column_index=2
elif [[ "$column_name" == "current" ]]; then
column_index=3
elif "$column_name" != "current" ]]; then
elif [[ "$column_name" != "current" ]]; then
echo "Error: column_name must be either 'released' or 'current'"
exit 1
fi
Expand Down
5 changes: 4 additions & 1 deletion generation/update_owlbot_postprocessor_config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@

set -e

for dir in $(find . -mindepth 2 -maxdepth 2 -name owlbot.py | grep -v 'java-common-protos/' | grep -v 'java-iam/' | grep -v 'java-showcase/' | sort | xargs dirname ); do
TARGET_MODULE="${1:-.}"

for owlbot_script in $(find "$TARGET_MODULE" -name owlbot.py | grep -v 'java-common-protos/' | grep -v 'java-iam/' | grep -v 'java-showcase/' | sort); do
dir=$(dirname "$owlbot_script")
pushd "$dir"

# form a perl command to replace java.common_templates() invocation
Expand Down
4 changes: 2 additions & 2 deletions java-datastore/google-cloud-datastore/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -208,12 +208,12 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-monitoring</artifactId>
<version>3.91.0</version><!-- {x-version-update:google-cloud-monitoring:current} -->
<version>3.93.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-monitoring:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-monitoring-v3</artifactId>
<version>3.91.0</version><!-- {x-version-update:google-cloud-monitoring:current} -->
<version>3.93.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-monitoring:current} -->
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-pom-parent</artifactId>
<version>1.85.0</version><!-- {x-version-update:google-cloud-java:current} -->
<version>1.86.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-java:current} -->
<relativePath>../../google-cloud-pom-parent/pom.xml</relativePath>
</parent>

Expand Down
5 changes: 2 additions & 3 deletions java-maps-mapmanagement/owlbot.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,5 @@
"java.header",
"license-checks.xml",
"renovate.json",
".gitignore",
],
)
".gitignore"
])
3 changes: 3 additions & 0 deletions monorepo-migration/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.git-filter-repo/
__pycache__/
*.pyc
45 changes: 45 additions & 0 deletions monorepo-migration/migrate-bigtable.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
#!/bin/bash
# Copyright 2026 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.

# Exit on error
set -e

# Get absolute paths
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
MONOREPO_ROOT="$(dirname "$SCRIPT_DIR")"

echo "========================================================"
echo " Staging java-bigtable migration"
echo "========================================================"

# 1. Configure environment for the base migrate.sh script
export SOURCE_REPO_URL="https://github.com/googleapis/java-bigtable"
export MIGRATION_HEAD_BRANCH="main"
export SQUASH_COMMITS="false"
export CODEOWNER="@googleapis/bigtable-team"
export BOM_SUBSTITUTIONS="gapic-libraries-bom:google-cloud-monitoring-bom"
export PRE_INSTALL_DEPS="java-monitoring/google-cloud-monitoring-bom"

# 2. Execute the central migration script
"${SCRIPT_DIR}/migrate.sh"

echo ""
echo "========================================================"
echo "Migration staged successfully!"
echo "Results are available in the isolated clone:"
echo " migration-work/google-cloud-java-target"
echo "Current Branch: migrate-java-bigtable"
echo "Next Steps: cd migration-work/google-cloud-java-target && mvn clean install -DskipTests"
echo "========================================================"
43 changes: 43 additions & 0 deletions monorepo-migration/migrate-firestore.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
#!/bin/bash
# Copyright 2026 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.

# Exit on error
set -e

# Get absolute paths
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
MONOREPO_ROOT="$(dirname "$SCRIPT_DIR")"

echo "========================================================"
echo " Staging java-firestore migration"
echo "========================================================"

# 1. Configure environment for the base migrate.sh script
export SOURCE_REPO_URL="https://github.com/googleapis/java-firestore"
export MIGRATION_HEAD_BRANCH="main"
export SQUASH_COMMITS="false"
export CODEOWNER="@googleapis/firestore-team"

# 2. Execute the central migration script
"${SCRIPT_DIR}/migrate.sh"

echo ""
echo "========================================================"
echo "Migration staged successfully!"
echo "Results are available in the isolated clone:"
echo " migration-work/google-cloud-java-target"
echo "Current Branch: migrate-java-firestore"
echo "Next Steps: cd migration-work/google-cloud-java-target && mvn clean install -DskipTests"
echo "========================================================"
45 changes: 45 additions & 0 deletions monorepo-migration/migrate-pubsub.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
#!/bin/bash
# Copyright 2026 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.

# Exit on error
set -e

# Get absolute paths
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
MONOREPO_ROOT="$(dirname "$SCRIPT_DIR")"

echo "========================================================"
echo " Staging java-pubsub migration"
echo "========================================================"

# 1. Configure environment for the base migrate.sh script
export SOURCE_REPO_URL="https://github.com/googleapis/java-pubsub"
export MIGRATION_HEAD_BRANCH="main"
export SQUASH_COMMITS="false"
export CODEOWNER="@googleapis/pubsub-team"

# 2. Execute the central migration script
# This performs git read-tree, POM modernization, workflow transformation, and generation config updates.
# Note: migrate.sh works in an isolated sibling clone to avoid polluting the active workspace.
"${SCRIPT_DIR}/migrate.sh"

echo ""
echo "========================================================"
echo "Migration staged successfully!"
echo "Results are available in the isolated clone:"
echo " ../../migration-work/google-cloud-java-target"
echo "Current Branch: migrate-java-pubsub"
echo "Next Steps: cd ../../migration-work/google-cloud-java-target && mvn clean install -DskipTests"
echo "========================================================"
Loading
Loading