Skip to content

Commit 857afcd

Browse files
Merge branch 'googleapis:main' into main
2 parents 1eb3f69 + 4d5aad6 commit 857afcd

File tree

3 files changed

+14
-11
lines changed

3 files changed

+14
-11
lines changed

java-iam/google-iam-policy/pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
<dependency>
5757
<groupId>com.google.api.grpc</groupId>
5858
<artifactId>proto-google-iam-v3beta</artifactId>
59-
<version>1.51.0</version>
6059
</dependency>
6160
<dependency>
6261
<groupId>com.google.guava</groupId>
@@ -104,7 +103,6 @@
104103
<dependency>
105104
<groupId>com.google.api.grpc</groupId>
106105
<artifactId>grpc-google-iam-v3beta</artifactId>
107-
<version>1.51.0</version>
108106
<scope>test</scope>
109107
</dependency>
110108
<!-- Need testing utility classes for generated gRPC clients tests -->

java-samples/native-image-sample/pom.xml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,6 @@
4444

4545
<build>
4646
<plugins>
47-
<plugin>
48-
<groupId>org.apache.maven.plugins</groupId>
49-
<artifactId>maven-deploy-plugin</artifactId>
50-
<version>3.1.2</version>
51-
<configuration>
52-
<skip>true</skip>
53-
</configuration>
54-
</plugin>
55-
5647
<!-- This plugin enables building the application to a JAR *not* using native image compilation -->
5748
<plugin>
5849
<groupId>org.apache.maven.plugins</groupId>

java-samples/pom.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<name>Google Cloud Client Library for Java Samples</name>
66
<artifactId>google-cloud-samples</artifactId>
77
<groupId>com.google.cloud</groupId>
8+
<!-- We do not release this module. The "-SNAPSHOT" version avoids accidental releases -->
89
<version>0.1.0-SNAPSHOT</version>
910
<packaging>pom</packaging>
1011
<modelVersion>4.0.0</modelVersion>
@@ -31,6 +32,19 @@
3132
<build>
3233
<pluginManagement>
3334
<plugins>
35+
<plugin>
36+
<groupId>org.apache.maven.plugins</groupId>
37+
<artifactId>maven-deploy-plugin</artifactId>
38+
<configuration>
39+
<!--
40+
When we use OSSRH with nexus-staging-maven-plugin, this "skip" configuration
41+
is overridden and ignored by nexus-staging-maven-plugin.
42+
Once we start publishing artifacts via Central Portal using maven-deploy-plugin
43+
(without nexus-staging-maven-plugin), we no longer rely on skipNexusStagingDeployMojo.
44+
-->
45+
<skip>true</skip>
46+
</configuration>
47+
</plugin>
3448
<plugin>
3549
<groupId>org.sonatype.plugins</groupId>
3650
<artifactId>nexus-staging-maven-plugin</artifactId>

0 commit comments

Comments
 (0)