Skip to content

Commit

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

* 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 <chingor@google.com>
Source-Link: googleapis/synthtool@d4b2916
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:edae91ccdd2dded2f572ec341a768ad180305a3e8fbfd93064b28e237d35920a

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
Co-authored-by: Jeff Ching <chingor@google.com>
Co-authored-by: Tomo Suzuki <suztomo@google.com>
  • Loading branch information
4 people committed Nov 15, 2022
1 parent 55b2a58 commit 12e71ea
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 58 deletions.
2 changes: 1 addition & 1 deletion java-network-security/.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:264c6d5da60ff1684fbdd2b268d6a3ffca2038246e0948a06f15ca0c3cf28ce8
digest: sha256:edae91ccdd2dded2f572ec341a768ad180305a3e8fbfd93064b28e237d35920a
5 changes: 5 additions & 0 deletions java-network-security/.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-network-security](
https://github.com/googleapis/google-cloud-java/tree/main/java-network-security).
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-network-security](
https://github.com/googleapis/google-cloud-java/tree/main/java-network-security).
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-network-security/.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-network-security/.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-network-security/.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"
}
13 changes: 10 additions & 3 deletions java-network-security/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@ Java idiomatic client for [Network Security API][product-docs].
> make backwards-incompatible changes.

:bus: In October 2022, this library has moved to
[google-cloud-java/java-network-security](
https://github.com/googleapis/google-cloud-java/tree/main/java-network-security).
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-network-security`) 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-network-security</artifactId>
<version>0.7.0</version>
<version>0.8.0</version>
</dependency>
```

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

```Groovy
implementation 'com.google.cloud:google-cloud-network-security:0.7.0'
implementation 'com.google.cloud:google-cloud-network-security:0.8.0'
```

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

```Scala
libraryDependencies += "com.google.cloud" % "google-cloud-network-security" % "0.7.0"
libraryDependencies += "com.google.cloud" % "google-cloud-network-security" % "0.8.0"
```

## Authentication
Expand Down
1 change: 1 addition & 0 deletions java-network-security/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 12e71ea

Please sign in to comment.