Skip to content

Commit

Permalink
docs: [owlbot-java] samples do not need deploy plugin and deps upgrade (
Browse files Browse the repository at this point in the history
#1583)

* docs: samples do not need deploy plugin

* deps: upgrading shared deps 3.0.3

* fixing golden test
  • Loading branch information
suztomo committed Sep 26, 2022
1 parent d7d1a87 commit b61387e
Show file tree
Hide file tree
Showing 13 changed files with 18 additions and 39 deletions.
2 changes: 1 addition & 1 deletion docker/owlbot/java/templates/poms/bom_pom.xml.j2
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-shared-config</artifactId>
<version>1.2.7</version>
<version>1.5.3</version>
</parent>

<name>Google {{name}} BOM</name>
Expand Down
4 changes: 2 additions & 2 deletions docker/owlbot/java/templates/poms/parent_pom.xml.j2
Expand Up @@ -14,7 +14,7 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-shared-config</artifactId>
<version>1.5.0</version>
<version>1.5.3</version>
</parent>

<developers>
Expand Down Expand Up @@ -75,7 +75,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-shared-dependencies</artifactId>
<version>2.13.0</version>
<version>3.0.3</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-shared-config</artifactId>
<version>1.2.1</version>
<version>1.5.3</version>
</parent>

<name>Google Example API BOM</name>
Expand Down
4 changes: 2 additions & 2 deletions docker/owlbot/java/tests/fix-poms/golden/pom.xml
Expand Up @@ -14,7 +14,7 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-shared-config</artifactId>
<version>1.5.0</version>
<version>1.5.3</version>
</parent>

<developers>
Expand Down Expand Up @@ -90,7 +90,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-shared-dependencies</artifactId>
<version>2.13.0</version>
<version>3.0.3</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-shared-config</artifactId>
<version>1.2.1</version>
<version>1.5.3</version>
</parent>

<name>Google Example API BOM</name>
Expand Down
4 changes: 2 additions & 2 deletions docker/owlbot/java/tests/fix-poms/input/pom.xml
Expand Up @@ -14,7 +14,7 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-shared-config</artifactId>
<version>1.5.0</version>
<version>1.5.3</version>
</parent>

<developers>
Expand Down Expand Up @@ -90,7 +90,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-shared-dependencies</artifactId>
<version>2.13.0</version>
<version>3.0.3</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-shared-config</artifactId>
<version>1.2.7</version>
<version>1.5.3</version>
</parent>

<name>Google Example API BOM</name>
Expand Down
4 changes: 2 additions & 2 deletions docker/owlbot/java/tests/new-client/golden/pom.xml
Expand Up @@ -14,7 +14,7 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-shared-config</artifactId>
<version>1.5.0</version>
<version>1.5.3</version>
</parent>

<developers>
Expand Down Expand Up @@ -85,7 +85,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-shared-dependencies</artifactId>
<version>2.13.0</version>
<version>3.0.3</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-shared-config</artifactId>
<version>1.2.7</version>
<version>1.5.3</version>
</parent>

<name>Google Example API BOM</name>
Expand Down
4 changes: 2 additions & 2 deletions docker/owlbot/java/tests/new-version/golden/pom.xml
Expand Up @@ -14,7 +14,7 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-shared-config</artifactId>
<version>1.5.0</version>
<version>1.5.3</version>
</parent>

<developers>
Expand Down Expand Up @@ -95,7 +95,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-shared-dependencies</artifactId>
<version>2.13.0</version>
<version>3.0.3</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-shared-config</artifactId>
<version>1.2.7</version>
<version>1.5.3</version>
</parent>

<name>Google Example API BOM</name>
Expand Down
4 changes: 2 additions & 2 deletions docker/owlbot/java/tests/new-version/input/pom.xml
Expand Up @@ -14,7 +14,7 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-shared-config</artifactId>
<version>1.5.0</version>
<version>1.5.3</version>
</parent>

<developers>
Expand Down Expand Up @@ -85,7 +85,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-shared-dependencies</artifactId>
<version>2.13.0</version>
<version>3.0.3</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
21 changes: 0 additions & 21 deletions synthtool/gcp/templates/java_library/samples/pom.xml
Expand Up @@ -32,25 +32,4 @@
<module>snapshot</module>
<module>snippets</module>
</modules>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.13</version>
<configuration>
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
</configuration>
</plugin>
</plugins>
</build>
</project>

0 comments on commit b61387e

Please sign in to comment.