Skip to content
This repository has been archived by the owner on Sep 19, 2023. It is now read-only.

Commit

Permalink
fix(java): skip fixing poms for special modules (#1744) (#433)
Browse files Browse the repository at this point in the history
fix(java): handle empty modules

Fixes https://togithub.com/googleapis/synthtool/issues/1743
Source-Link: https://togithub.com/googleapis/synthtool/commit/482d649d5d705c18028076985f64b214f6b6c14e
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:bd5071596a47614d1fe15eb766c4255bae330f823b606e1196a3b0c8d2e96fd1
  • Loading branch information
gcf-owl-bot[bot] committed Jan 20, 2023
1 parent 0425f4f commit 88bb27b
Show file tree
Hide file tree
Showing 7 changed files with 196 additions and 206 deletions.
4 changes: 2 additions & 2 deletions .github/.OwlBot.lock.yaml
@@ -1,4 +1,4 @@
# Copyright 2022 Google LLC
# Copyright 2023 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -13,4 +13,4 @@
# limitations under the License.
docker:
image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
digest: sha256:edae91ccdd2dded2f572ec341a768ad180305a3e8fbfd93064b28e237d35920a
digest: sha256:bd5071596a47614d1fe15eb766c4255bae330f823b606e1196a3b0c8d2e96fd1
2 changes: 1 addition & 1 deletion .kokoro/presubmit/graalvm-native-17.cfg
Expand Up @@ -3,7 +3,7 @@
# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17"
value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17:22.3.0"
}

env_vars: {
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/presubmit/graalvm-native.cfg
Expand Up @@ -3,7 +3,7 @@
# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-kokoro-resources/graalvm"
value: "gcr.io/cloud-devrel-kokoro-resources/graalvm:22.3.0"
}

env_vars: {
Expand Down
39 changes: 6 additions & 33 deletions .kokoro/requirements.in
@@ -1,33 +1,6 @@
gcp-docuploader==0.6.3
google-crc32c==1.3.0
googleapis-common-protos==1.56.3
gcp-releasetool==1.8.7
cachetools==4.2.4
cffi==1.15.1
jeepney==0.7.1
jinja2==3.0.3
markupsafe==2.0.1
keyring==23.4.1
packaging==21.3
protobuf==3.19.5
pyjwt==2.4.0
pyparsing==3.0.9
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
zipp==3.6.0
rsa==4.9
six==1.16.0
attrs==22.1.0
google-auth==2.11.0
idna==3.4
gcp-docuploader
gcp-releasetool
wheel
setuptools
typing-extensions
click<8.1.0
252 changes: 102 additions & 150 deletions .kokoro/requirements.txt

Large diffs are not rendered by default.

101 changes: 83 additions & 18 deletions README.md
Expand Up @@ -8,35 +8,48 @@ Java idiomatic client for [Cloud Organization Policy][product-docs].
- [Product Documentation][product-docs]
- [Client Library Documentation][javadocs]


:bus: In October 2022, this library has moved to
[google-cloud-java/java-orgpolicy](
https://github.com/googleapis/google-cloud-java/tree/main/java-orgpolicy).
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-orgpolicy`) remain the same.

## Quickstart


If you are using Maven, add this to your pom.xml file:


```xml
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-orgpolicy-v1</artifactId>
<version>1.0.2</version>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-orgpolicy</artifactId>
<version>2.8.0</version>
</dependency>
```

[//]: # ({x-version-update-start:proto-google-cloud-orgpolicy-v1:released})
If you are using Gradle without BOM, add this to your dependencies:

If you are using Gradle, add this to your dependencies
```Groovy
compile 'com.google.api.grpc:proto-google-cloud-orgpolicy-v1:2.0.8'
implementation 'com.google.cloud:google-cloud-orgpolicy:2.8.0'
```
If you are using SBT, add this to your dependencies

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

```Scala
libraryDependencies += "com.google.api.grpc" % "proto-google-cloud-orgpolicy-v1" % "2.0.8"
libraryDependencies += "com.google.cloud" % "google-cloud-orgpolicy" % "2.8.0"
```
[//]: # ({x-version-update-end})

## Authentication

See the [Authentication][authentication] section in the base directory's README.

## Authorization

The client application making API calls must be granted [authorization scopes][auth-scopes] required for the desired Cloud Organization Policy APIs, and the authenticated principal must have the [IAM role(s)][predefined-iam-roles] required to access GCP resources using the Cloud Organization Policy API calls.

## Getting Started

### Prerequisites
Expand All @@ -49,8 +62,8 @@ You will need to [enable billing][enable-billing] to use Google Cloud Organizati

### Installation and setup

You'll need to obtain the `proto-google-cloud-orgpolicy-v1` library. See the [Quickstart](#quickstart) section
to add `proto-google-cloud-orgpolicy-v1` as a dependency in your code.
You'll need to obtain the `google-cloud-orgpolicy` library. See the [Quickstart](#quickstart) section
to add `google-cloud-orgpolicy` as a dependency in your code.

## About Cloud Organization Policy

Expand All @@ -73,16 +86,57 @@ To get help, follow the instructions in the [shared Troubleshooting document][tr

Cloud Organization Policy uses gRPC for the transport layer.

## Java Versions
## Supported Java Versions

Java 8 or above is required for using this client.

Google's Java client libraries,
[Google Cloud Client Libraries][cloudlibs]
and
[Google Cloud API Libraries][apilibs],
follow the
[Oracle Java SE support roadmap][oracle]
(see the Oracle Java SE Product Releases section).

### For new development

In general, new feature development occurs with support for the lowest Java
LTS version covered by Oracle's Premier Support (which typically lasts 5 years
from initial General Availability). If the minimum required JVM for a given
library is changed, it is accompanied by a [semver][semver] major release.

Java 7 or above is required for using this client.
Java 11 and (in September 2021) Java 17 are the best choices for new
development.

### Keeping production systems current

Google tests its client libraries with all current LTS versions covered by
Oracle's Extended Support (which typically lasts 8 years from initial
General Availability).

#### Legacy support

Google's client libraries support legacy versions of Java runtimes with long
term stable libraries that don't receive feature updates on a best efforts basis
as it may not be possible to backport all patches.

Google provides updates on a best efforts basis to apps that continue to use
Java 7, though apps might need to upgrade to current versions of the library
that supports their JVM.

#### Where to find specific information

The latest versions and the supported Java versions are identified on
the individual GitHub repository `github.com/GoogleAPIs/java-SERVICENAME`
and on [google-cloud-java][g-c-j].

## Versioning


This library follows [Semantic Versioning](http://semver.org/).



## Contributing


Expand All @@ -94,6 +148,7 @@ Please note that this project is released with a Contributor Code of Conduct. By
this project you agree to abide by its terms. See [Code of Conduct][code-of-conduct] for more
information.


## License

Apache 2.0 - See [LICENSE][license] for more information.
Expand All @@ -102,14 +157,15 @@ Apache 2.0 - See [LICENSE][license] for more information.

Java Version | Status
------------ | ------
Java 7 | [![Kokoro CI][kokoro-badge-image-1]][kokoro-badge-link-1]
Java 8 | [![Kokoro CI][kokoro-badge-image-2]][kokoro-badge-link-2]
Java 8 OSX | [![Kokoro CI][kokoro-badge-image-3]][kokoro-badge-link-3]
Java 8 Windows | [![Kokoro CI][kokoro-badge-image-4]][kokoro-badge-link-4]
Java 11 | [![Kokoro CI][kokoro-badge-image-5]][kokoro-badge-link-5]

Java is a registered trademark of Oracle and/or its affiliates.

[product-docs]: n/a
[javadocs]: https://googleapis.dev/java/proto-google-cloud-orgpolicy-v1/latest/index.html
[javadocs]: https://cloud.google.com/java/docs/reference/proto-google-cloud-orgpolicy-v1/latest/history
[kokoro-badge-image-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-orgpolicy/java7.svg
[kokoro-badge-link-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-orgpolicy/java7.html
[kokoro-badge-image-2]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-orgpolicy/java8.svg
Expand All @@ -120,10 +176,13 @@ Java 11 | [![Kokoro CI][kokoro-badge-image-5]][kokoro-badge-link-5]
[kokoro-badge-link-4]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-orgpolicy/java8-win.html
[kokoro-badge-image-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-orgpolicy/java11.svg
[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-orgpolicy/java11.html
[stability-image]: https://img.shields.io/badge/stability-ga-green
[maven-version-image]: https://img.shields.io/maven-central/v/com.google.api.grpc/proto-google-cloud-orgpolicy-v1.svg
[maven-version-link]: https://search.maven.org/search?q=g:com.google.api.grpc%20AND%20a:proto-google-cloud-orgpolicy-v1&core=gav
[stability-image]: https://img.shields.io/badge/stability-stable-green
[maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-orgpolicy.svg
[maven-version-link]: https://search.maven.org/search?q=g:com.google.cloud%20AND%20a:google-cloud-orgpolicy&core=gav
[authentication]: https://github.com/googleapis/google-cloud-java#authentication
[auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
[predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
[iam-policy]: https://cloud.google.com/iam/docs/overview#cloud-iam-policy
[developer-console]: https://console.developers.google.com/
[create-project]: https://cloud.google.com/resource-manager/docs/creating-managing-projects
[cloud-sdk]: https://cloud.google.com/sdk/
Expand All @@ -135,3 +194,9 @@ Java 11 | [![Kokoro CI][kokoro-badge-image-5]][kokoro-badge-link-5]

[libraries-bom]: https://github.com/GoogleCloudPlatform/cloud-opensource-java/wiki/The-Google-Cloud-Platform-Libraries-BOM
[shell_img]: https://gstatic.com/cloudssh/images/open-btn.png

[semver]: https://semver.org/
[cloudlibs]: https://cloud.google.com/apis/docs/client-libraries-explained
[apilibs]: https://cloud.google.com/apis/docs/client-libraries-explained#google_api_client_libraries
[oracle]: https://www.oracle.com/java/technologies/java-se-support-roadmap.html
[g-c-j]: http://github.com/googleapis/google-cloud-java
2 changes: 1 addition & 1 deletion owlbot.py
Expand Up @@ -22,5 +22,5 @@

s.remove_staging_dirs()
java.common_templates(
excludes=["README.md", "samples/*", ".github/workflows/samples.yaml"]
excludes=["samples/*", ".github/workflows/samples.yaml"]
)

0 comments on commit 88bb27b

Please sign in to comment.