Skip to content

Commit

Permalink
chore: Adding non-java diffs
Browse files Browse the repository at this point in the history
  • Loading branch information
gcf-merge-on-green[bot] committed Oct 18, 2022
1 parent a959a35 commit d4ccf68
Show file tree
Hide file tree
Showing 1,400 changed files with 24,261 additions and 14,726 deletions.
35 changes: 0 additions & 35 deletions java-accessapproval/.OwlBot.yaml

This file was deleted.

22 changes: 0 additions & 22 deletions java-accessapproval/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,27 +1,5 @@
# Changelog

## [2.5.0](https://github.com/googleapis/google-cloud-java/compare/google-cloud-accessapproval-v2.4.10...google-cloud-accessapproval-v2.5.0) (2022-10-17)


### Features

* [analyticsdata] add `subject_to_thresholding` field to `ResponseMetadata` type ([#8545](https://github.com/googleapis/google-cloud-java/issues/8545)) ([8fdc6c1](https://github.com/googleapis/google-cloud-java/commit/8fdc6c1f10f88f30f4d1407579d645f75366b4cf))
* add `tokens_per_project_per_hour` field to `PropertyQuota` type ([8fdc6c1](https://github.com/googleapis/google-cloud-java/commit/8fdc6c1f10f88f30f4d1407579d645f75366b4cf))


### Bug Fixes

* **deps:** update dependency com.google.cloud:google-cloud-shared-dependencies to v3.0.2 ([#8325](https://github.com/googleapis/google-cloud-java/issues/8325)) ([01f492b](https://github.com/googleapis/google-cloud-java/commit/01f492be424acdb90edb23ba66656aeff7cf39eb))
* **deps:** update dependency com.google.cloud:google-cloud-shared-dependencies to v3.0.4 ([#8528](https://github.com/googleapis/google-cloud-java/issues/8528)) ([bd36199](https://github.com/googleapis/google-cloud-java/commit/bd361998ac4eb7c78eef3b3eac39aef31a0cf44e))
* **deps:** update dependency com.google.cloud:libraries-bom to v26.1.1 ([#8254](https://github.com/googleapis/google-cloud-java/issues/8254)) ([e4760da](https://github.com/googleapis/google-cloud-java/commit/e4760da4ac8fa6fa91bc82b90b83d0518eca2692))
* owl-bot-staging should not be commited ([#8337](https://github.com/googleapis/google-cloud-java/issues/8337)) ([c9bb4a9](https://github.com/googleapis/google-cloud-java/commit/c9bb4a97aa19032b78c86c951fe9920f24ac4eec))
* revert reverting [Many APIs] Update WORKSPACE files for rules_gapic, gax_java, generator_java versions ([#8340](https://github.com/googleapis/google-cloud-java/issues/8340)) ([dedef71](https://github.com/googleapis/google-cloud-java/commit/dedef71f600e85b1c38e7110f5ffd44bf2ba32b4))


### Dependencies

* reverting renovate bot pull requests ([#8417](https://github.com/googleapis/google-cloud-java/issues/8417)) ([8f0c60b](https://github.com/googleapis/google-cloud-java/commit/8f0c60bde446acccc665eb7894723632eefc3503))

## [2.4.10](https://github.com/googleapis/java-accessapproval/compare/v2.4.9...v2.4.10) (2022-10-07)


Expand Down
44 changes: 36 additions & 8 deletions java-accessapproval/google-cloud-accessapproval-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-accessapproval-bom</artifactId>
<version>2.5.0</version><!-- {x-version-update:google-cloud-accessapproval:current} -->
<version>2.4.11-SNAPSHOT</version><!-- {x-version-update:google-cloud-accessapproval:current} -->
<packaging>pom</packaging>

<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-pom-parent</artifactId>
<version>0.1.0</version><!-- {x-version-update:google-cloud-pom-parent:current} -->
<relativePath>../../google-cloud-pom-parent/pom.xml</relativePath>
<artifactId>google-cloud-shared-config</artifactId>
<version>1.5.3</version>
</parent>

<name>Google Cloud Access Approval BOM</name>
Expand All @@ -19,22 +17,52 @@
BOM for Google Cloud Access Approval
</description>

<organization>
<name>Google LLC</name>
</organization>

<developers>
<developer>
<id>chingor13</id>
<name>Jeff Ching</name>
<email>chingor@google.com</email>
<organization>Google LLC</organization>
<roles>
<role>Developer</role>
</roles>
</developer>
</developers>

<scm>
<connection>scm:git:https://github.com/googleapis/java-accessapproval.git</connection>
<developerConnection>scm:git:git@github.com:googleapis/java-accessapproval.git</developerConnection>
<url>https://github.com/googleapis/java-accessapproval</url>
</scm>

<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-accessapproval</artifactId>
<version>2.5.0</version><!-- {x-version-update:google-cloud-accessapproval:current} -->
<version>2.4.11-SNAPSHOT</version><!-- {x-version-update:google-cloud-accessapproval:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-accessapproval-v1</artifactId>
<version>2.5.0</version><!-- {x-version-update:grpc-google-cloud-accessapproval-v1:current} -->
<version>2.4.11-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-accessapproval-v1:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-accessapproval-v1</artifactId>
<version>2.5.0</version><!-- {x-version-update:proto-google-cloud-accessapproval-v1:current} -->
<version>2.4.11-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-accessapproval-v1:current} -->
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
4 changes: 2 additions & 2 deletions java-accessapproval/google-cloud-accessapproval/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-accessapproval</artifactId>
<version>2.5.0</version><!-- {x-version-update:google-cloud-accessapproval:current} -->
<version>2.4.11-SNAPSHOT</version><!-- {x-version-update:google-cloud-accessapproval:current} -->
<packaging>jar</packaging>
<name>Google Cloud Access Approval</name>
<url>https://github.com/googleapis/java-accessapproval</url>
<description>Java idiomatic client for Google Cloud accessapproval</description>
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-accessapproval-parent</artifactId>
<version>2.5.0</version><!-- {x-version-update:google-cloud-accessapproval:current} -->
<version>2.4.11-SNAPSHOT</version><!-- {x-version-update:google-cloud-accessapproval:current} -->
</parent>
<properties>
<site.installationModule>google-cloud-accessapproval</site.installationModule>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-accessapproval-v1</artifactId>
<version>2.5.0</version><!-- {x-version-update:grpc-google-cloud-accessapproval-v1:current} -->
<version>2.4.11-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-accessapproval-v1:current} -->
<name>grpc-google-cloud-accessapproval-v1</name>
<description>GRPC library for grpc-google-cloud-accessapproval-v1</description>
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-accessapproval-parent</artifactId>
<version>2.5.0</version><!-- {x-version-update:google-cloud-accessapproval:current} -->
<version>2.4.11-SNAPSHOT</version><!-- {x-version-update:google-cloud-accessapproval:current} -->
</parent>
<dependencies>
<dependency>
Expand Down
13 changes: 1 addition & 12 deletions java-accessapproval/owlbot.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,4 @@
s.move(library)

s.remove_staging_dirs()
java.common_templates(excludes=[
".github/*",
".kokoro/*",
"samples/*",
"CODE_OF_CONDUCT.md",
"CONTRIBUTING.md",
"LICENSE",
"SECURITY.md",
"java.header",
"license-checks.xml",
"renovate.json"
])
java.common_templates()
129 changes: 122 additions & 7 deletions java-accessapproval/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-accessapproval-parent</artifactId>
<packaging>pom</packaging>
<version>2.5.0</version><!-- {x-version-update:google-cloud-accessapproval:current} -->
<version>2.4.11-SNAPSHOT</version><!-- {x-version-update:google-cloud-accessapproval:current} -->
<name>Google Cloud Access Approval Parent</name>
<url>https://github.com/googleapis/java-accessapproval</url>
<description>
Expand All @@ -13,11 +13,42 @@

<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-jar-parent</artifactId>
<version>0.1.0</version><!-- {x-version-update:google-cloud-jar-parent:current} -->
<relativePath>../google-cloud-jar-parent/pom.xml</relativePath>
<artifactId>google-cloud-shared-config</artifactId>
<version>1.5.3</version>
</parent>

<developers>
<developer>
<id>chingor</id>
<name>Jeff Ching</name>
<email>chingor@google.com</email>
<organization>Google</organization>
<roles>
<role>Developer</role>
</roles>
</developer>
</developers>
<organization>
<name>Google LLC</name>
</organization>
<scm>
<connection>scm:git:git@github.com:googleapis/java-accessapproval.git</connection>
<developerConnection>scm:git:git@github.com:googleapis/java-accessapproval.git</developerConnection>
<url>https://github.com/googleapis/java-accessapproval</url>
<tag>HEAD</tag>
</scm>
<issueManagement>
<url>https://github.com/googleapis/java-accessapproval/issues</url>
<system>GitHub Issues</system>
</issueManagement>

<licenses>
<license>
<name>Apache-2.0</name>
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
</license>
</licenses>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
Expand All @@ -30,20 +61,34 @@
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-accessapproval-v1</artifactId>
<version>2.5.0</version><!-- {x-version-update:proto-google-cloud-accessapproval-v1:current} -->
<version>2.4.11-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-accessapproval-v1:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-accessapproval-v1</artifactId>
<version>2.5.0</version><!-- {x-version-update:grpc-google-cloud-accessapproval-v1:current} -->
<version>2.4.11-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-accessapproval-v1:current} -->
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-accessapproval</artifactId>
<version>2.5.0</version><!-- {x-version-update:google-cloud-accessapproval:current} -->
<version>2.4.11-SNAPSHOT</version><!-- {x-version-update:google-cloud-accessapproval:current} -->
</dependency>

<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-shared-dependencies</artifactId>
<version>3.0.4</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<!-- Test dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>

Expand All @@ -70,4 +115,74 @@
<module>proto-google-cloud-accessapproval-v1</module>
<module>google-cloud-accessapproval-bom</module>
</modules>

<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>3.4.1</version>
<reportSets>
<reportSet>
<reports>
<report>index</report>
<report>dependency-info</report>
<report>team</report>
<report>ci-management</report>
<report>issue-management</report>
<report>licenses</report>
<report>scm</report>
<report>dependency-management</report>
<report>distribution-management</report>
<report>summary</report>
<report>modules</report>
</reports>
</reportSet>
</reportSets>
<configuration>
<dependencyDetailsEnabled>true</dependencyDetailsEnabled>
<artifactId>${site.installationModule}</artifactId>
<packaging>jar</packaging>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.4.1</version>
<reportSets>
<reportSet>
<id>html</id>
<reports>
<report>aggregate</report>
<report>javadoc</report>
</reports>
</reportSet>
</reportSets>
<configuration>
<doclint>none</doclint>
<show>protected</show>
<nohelp>true</nohelp>
<outputDirectory>${project.build.directory}/javadoc</outputDirectory>
<groups>
<group>
<title>Test helpers packages</title>
<packages>com.google.cloud.testing</packages>
</group>
<group>
<title>SPI packages</title>
<packages>com.google.cloud.spi*</packages>
</group>
</groups>

<links>
<link>https://grpc.io/grpc-java/javadoc/</link>
<link>https://developers.google.com/protocol-buffers/docs/reference/java/</link>
<link>https://googleapis.dev/java/google-auth-library/latest/</link>
<link>https://googleapis.dev/java/gax/latest/</link>
<link>https://googleapis.github.io/api-common-java/${google.api-common.version}/apidocs/</link>
</links>
</configuration>
</plugin>
</plugins>
</reporting>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-accessapproval-v1</artifactId>
<version>2.5.0</version><!-- {x-version-update:proto-google-cloud-accessapproval-v1:current} -->
<version>2.4.11-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-accessapproval-v1:current} -->
<name>proto-google-cloud-accessapproval-v1beta1</name>
<description>PROTO library for proto-google-cloud-accessapproval-v1</description>
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-accessapproval-parent</artifactId>
<version>2.5.0</version><!-- {x-version-update:google-cloud-accessapproval:current} -->
<version>2.4.11-SNAPSHOT</version><!-- {x-version-update:google-cloud-accessapproval:current} -->
</parent>
<dependencies>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions java-accessapproval/versions.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Format:
# module:released-version:current-version

google-cloud-accessapproval:2.5.0:2.5.0
grpc-google-cloud-accessapproval-v1:2.5.0:2.5.0
proto-google-cloud-accessapproval-v1:2.5.0:2.5.0
google-cloud-accessapproval:2.4.10:2.4.11-SNAPSHOT
grpc-google-cloud-accessapproval-v1:2.4.10:2.4.11-SNAPSHOT
proto-google-cloud-accessapproval-v1:2.4.10:2.4.11-SNAPSHOT
Loading

0 comments on commit d4ccf68

Please sign in to comment.