Skip to content

Commit

Permalink
chore(java): add a note in README for migrated split repos (googleapi…
Browse files Browse the repository at this point in the history
…s#1687) (googleapis#271)

* chore(java): add a note in README for migrated split repos

Disable renovate bot and flaky bot for split repositories
that have moved to the Java monorepo.
The Java monorepo will pass the "monorepo=True" parameter
to java.common_templates method in its owlbot.py files so that
the migration note will not appear in the README in the monorepo.

Co-authored-by: Jeff Ching <[email protected]>
Source-Link: https://togithub.com/googleapis/synthtool/commit/d4b291604f148cde065838c498bc8aa79b8dc10e
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:edae91ccdd2dded2f572ec341a768ad180305a3e8fbfd93064b28e237d35920a
  • Loading branch information
gcf-owl-bot[bot] and chingor13 authored Nov 7, 2022
1 parent 4634d23 commit faf380a
Show file tree
Hide file tree
Showing 11 changed files with 36 additions and 63 deletions.
2 changes: 1 addition & 1 deletion java-private-catalog/.github/.OwlBot.lock.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
# limitations under the License.
docker:
image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
digest: sha256:f14e3fefe8e361e85752bd9890c8e56f2fe25f1e89cbb9597e4e3c7a429203a3
digest: sha256:edae91ccdd2dded2f572ec341a768ad180305a3e8fbfd93064b28e237d35920a
5 changes: 5 additions & 0 deletions java-private-catalog/.github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ about: Create a report to help us improve

---

:bus: This library has moved to
[google-cloud-java/java-private-catalog](
https://github.com/googleapis/google-cloud-java/tree/main/java-private-catalog).
This repository will be archived in the future.

Thanks for stopping by to let us know something could be better!

**PLEASE READ**: If you have a support contract with Google, please create an issue in the [support console](https://cloud.google.com/support/) instead of filing on GitHub. This will ensure a timely response.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ about: Suggest an idea for this library

---

:bus: This library has moved to
[google-cloud-java/java-private-catalog](
https://github.com/googleapis/google-cloud-java/tree/main/java-private-catalog).
This repository will be archived in the future.

Thanks for stopping by to let us know something could be better!

**PLEASE READ**: If you have a support contract with Google, please create an issue in the [support console](https://cloud.google.com/support/) instead of filing on GitHub. This will ensure a timely response.
Expand Down
51 changes: 0 additions & 51 deletions java-private-catalog/.kokoro/dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,54 +57,3 @@ retry_with_backoff 3 10 \
-Dclirr.skip=true

mvn -B dependency:analyze -DfailOnWarning=true

echo "****************** DEPENDENCY LIST COMPLETENESS CHECK *******************"
## Run dependency list completeness check
function completenessCheck() {
# Output dep list with compile scope generated using the original pom
# Running mvn dependency:list on Java versions that support modules will also include the module of the dependency.
# This is stripped from the output as it is not present in the flattened pom.
# Only dependencies with 'compile' or 'runtime' scope are included from original dependency list.
msg "Generating dependency list using original pom..."
mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e 's/ --.*//' >.org-list.txt

# Output dep list generated using the flattened pom (only 'compile' and 'runtime' scopes)
msg "Generating dependency list using flattened pom..."
mvn dependency:list -f .flattened-pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' >.new-list.txt

# Compare two dependency lists
msg "Comparing dependency lists..."
diff .org-list.txt .new-list.txt >.diff.txt
if [[ $? == 0 ]]
then
msg "Success. No diff!"
else
msg "Diff found. See below: "
msg "You can also check .diff.txt file located in $1."
cat .diff.txt
return 1
fi
}

# Allow failures to continue running the script
set +e

error_count=0
for path in **/.flattened-pom.xml
do
# Check flattened pom in each dir that contains it for completeness
dir=$(dirname "$path")
pushd "$dir"
completenessCheck "$dir"
error_count=$(($error_count + $?))
popd
done

if [[ $error_count == 0 ]]
then
msg "All checks passed."
exit 0
else
msg "Errors found. See log statements above."
exit 1
fi
2 changes: 1 addition & 1 deletion java-private-catalog/.kokoro/nightly/integration.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ env_vars: {

env_vars: {
key: "ENABLE_FLAKYBOT"
value: "true"
value: "false"
}

env_vars: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ env_vars: {

env_vars: {
key: "ENABLE_FLAKYBOT"
value: "true"
value: "false"
}

env_vars: {
Expand Down
2 changes: 1 addition & 1 deletion java-private-catalog/.kokoro/nightly/samples.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@ env_vars: {

env_vars: {
key: "ENABLE_FLAKYBOT"
value: "true"
value: "false"
}
2 changes: 2 additions & 0 deletions java-private-catalog/.kokoro/requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@ pycparser==2.21
pyperclip==1.8.2
python-dateutil==2.8.2
requests==2.27.1
certifi==2022.9.24
importlib-metadata==4.8.3
zipp==3.6.0
google_api_core==2.8.2
google-cloud-storage==2.0.0
google-resumable-media==2.3.3
google-cloud-core==2.3.1
typing-extensions==4.1.1
urllib3==1.26.12
Expand Down
14 changes: 9 additions & 5 deletions java-private-catalog/.kokoro/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@ cachetools==4.2.4 \
# via
# -r requirements.in
# google-auth
certifi==2022.9.14 \
--hash=sha256:36973885b9542e6bd01dea287b2b4b3b21236307c56324fcc3f1160f2d655ed5 \
--hash=sha256:e232343de1ab72c2aa521b625c80f699e356830fd0e2c620b465b304b17b0516
# via requests
certifi==2022.9.24 \
--hash=sha256:0d9c601124e5a6ba9712dbc60d9c53c21e34f5f641fe83002317394311bdce14 \
--hash=sha256:90c1a32f1d68f940488354e36370f6cca89f0f106db09518524c88d6ed83f382
# via
# -r requirements.in
# requests
cffi==1.15.1 \
--hash=sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5 \
--hash=sha256:03425bdae262c76aad70202debd780501fabeaca237cdfddc008987c0e0f59ef \
Expand Down Expand Up @@ -218,7 +220,9 @@ google-crc32c==1.3.0 \
google-resumable-media==2.3.3 \
--hash=sha256:27c52620bd364d1c8116eaac4ea2afcbfb81ae9139fb3199652fcac1724bfb6c \
--hash=sha256:5b52774ea7a829a8cdaa8bd2d4c3d4bc660c91b30857ab2668d0eb830f4ea8c5
# via google-cloud-storage
# via
# -r requirements.in
# google-cloud-storage
googleapis-common-protos==1.56.3 \
--hash=sha256:6f1369b58ed6cf3a4b7054a44ebe8d03b29c309257583a2bbdc064cd1e4a1442 \
--hash=sha256:87955d7b3a73e6e803f2572a33179de23989ebba725e05ea42f24838b792e461
Expand Down
13 changes: 10 additions & 3 deletions java-private-catalog/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@ Java idiomatic client for [Private Catalog][product-docs].
> make backwards-incompatible changes.

:bus: In October 2022, this library has moved to
[google-cloud-java/java-private-catalog](
https://github.com/googleapis/google-cloud-java/tree/main/java-private-catalog).
This repository will be archived in the future.
Future releases will appear in the new repository (https://github.com/googleapis/google-cloud-java/releases).
The Maven artifact coordinates (`com.google.cloud:google-cloud-private-catalog`) remain the same.

## Quickstart


Expand All @@ -22,20 +29,20 @@ If you are using Maven, add this to your pom.xml file:
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-private-catalog</artifactId>
<version>0.5.5</version>
<version>0.7.0</version>
</dependency>
```

If you are using Gradle without BOM, add this to your dependencies:

```Groovy
implementation 'com.google.cloud:google-cloud-private-catalog:0.5.5'
implementation 'com.google.cloud:google-cloud-private-catalog:0.7.0'
```

If you are using SBT, add this to your dependencies:

```Scala
libraryDependencies += "com.google.cloud" % "google-cloud-private-catalog" % "0.5.5"
libraryDependencies += "com.google.cloud" % "google-cloud-private-catalog" % "0.7.0"
```

## Authentication
Expand Down
1 change: 1 addition & 0 deletions java-private-catalog/renovate.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"enabled": false,
"extends": [
":separateMajorReleases",
":combinePatchMinorReleases",
Expand Down

0 comments on commit faf380a

Please sign in to comment.