Skip to content

Commit

Permalink
Merge branch 'main' into release-please--branches--main
Browse files Browse the repository at this point in the history
  • Loading branch information
ddixit14 authored Jan 5, 2023
2 parents 05b8dcc + 29273a6 commit 6186a9a
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 39 deletions.
Empty file modified .kokoro/release/publish_javadoc11.sh
100644 → 100755
Empty file.
6 changes: 0 additions & 6 deletions api-common-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<packaging>jar</packaging>
<version>2.4.0</version><!-- {x-version-update:api-common:current} -->
<name>API Common</name>
<url>https://github.com/googleapis/api-common-java</url>
<description>Common utilities for Google APIs in Java</description>

<parent>
Expand All @@ -27,11 +26,6 @@
</developer>
</developers>

<scm>
<connection>scm:git:https://github.com/googleapis/api-common-java.git</connection>
<url>https://github.com/googleapis/api-common-java</url>
</scm>

<licenses>
<license>
<name>BSD</name>
Expand Down
10 changes: 5 additions & 5 deletions gapic-generator-java-pom-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<version>2.13.0</version><!-- {x-version-update:gapic-generator-java:current} -->
<packaging>pom</packaging>
<name>GAPIC Generator Java POM Parent</name>
<url>https://github.com/googleapis/google-cloud-java</url>
<url>https://github.com/googleapis/gapic-generator-java</url>
<description>
The top-level parent for all modules in the repository.
</description>
Expand Down Expand Up @@ -50,13 +50,13 @@
</organization>
<scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false"
child.scm.url.inherit.append.path="false">
<connection>scm:git:git@github.com:googleapis/google-cloud-java.git</connection>
<developerConnection>scm:git:git@github.com:googleapis/google-cloud-java.git</developerConnection>
<url>https://github.com/googleapis/google-cloud-java</url>
<connection>scm:git:git@github.com:googleapis/gapic-generator-java.git</connection>
<developerConnection>scm:git:git@github.com:googleapis/gapic-generator-java.git</developerConnection>
<url>https://github.com/googleapis/gapic-generator-java</url>
<tag>HEAD</tag>
</scm>
<issueManagement>
<url>https://github.com/googleapis/google-cloud-java/issues</url>
<url>https://github.com/googleapis/gapic-generator-java/issues</url>
<system>GitHub Issues</system>
</issueManagement>

Expand Down
1 change: 1 addition & 0 deletions gapic-generator-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<artifactId>gapic-generator-java</artifactId>
<version>2.13.0</version><!-- {x-version-update:gapic-generator-java:current} -->
<name>GAPIC Generator Java</name>
<description>GAPIC generator Java</description>

<properties>
<checkstyle.skip>true</checkstyle.skip>
Expand Down
6 changes: 0 additions & 6 deletions gax-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<packaging>pom</packaging>
<version>2.21.0</version><!-- {x-version-update:gax:current} -->
<name>GAX (Google Api eXtensions) for Java (Parent)</name>
<url>https://github.com/googleapis/gax-java</url>
<description>Google Api eXtensions for Java (Parent)</description>

<parent>
Expand All @@ -26,11 +25,6 @@
</developer>
</developers>

<scm>
<connection>scm:git:https://github.com/googleapis/gax-java.git</connection>
<url>https://github.com/googleapis/gax-java</url>
</scm>

<licenses>
<license>
<name>BSD</name>
Expand Down
11 changes: 0 additions & 11 deletions java-common-protos/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<packaging>pom</packaging>
<version>2.12.0</version><!-- {x-version-update:proto-google-common-protos:current} -->
<name>Google Common Protos Parent</name>
<url>https://github.com/googleapis/java-iam</url>
<description>
Java idiomatic client for Google Cloud Platform services.
</description>
Expand All @@ -32,16 +31,6 @@
<organization>
<name>Google LLC</name>
</organization>
<scm>
<connection>scm:git@github.com:googleapis/java-common-protos.git</connection>
<developerConnection>scm:git@github.com:googleapis/java-common-protos.git</developerConnection>
<url>https://github.com/googleapis/java-common-protos</url>
<tag>HEAD</tag>
</scm>
<issueManagement>
<url>https://github.com/googleapis/java-common-protos/issues</url>
<system>GitHub Issues</system>
</issueManagement>
<distributionManagement>
<snapshotRepository>
<id>sonatype-nexus-snapshots</id>
Expand Down
11 changes: 0 additions & 11 deletions java-iam/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<packaging>pom</packaging>
<version>1.7.0</version><!-- {x-version-update:proto-google-iam-v1:current} -->
<name>Google IAM Parent</name>
<url>https://github.com/googleapis/java-iam</url>
<description>
Java idiomatic client for Google Cloud Platform services.
</description>
Expand All @@ -32,16 +31,6 @@
<organization>
<name>Google LLC</name>
</organization>
<scm>
<connection>scm:git:git@github.com:googleapis/java-iam.git</connection>
<developerConnection>scm:git:git@github.com:googleapis/java-iam.git</developerConnection>
<url>https://github.com/googleapis/java-iam</url>
<tag>HEAD</tag>
</scm>
<issueManagement>
<url>https://github.com/googleapis/java-iam/issues</url>
<system>GitHub Issues</system>
</issueManagement>
<distributionManagement>
<snapshotRepository>
<id>sonatype-nexus-snapshots</id>
Expand Down

0 comments on commit 6186a9a

Please sign in to comment.