Skip to content

Commit 74e2a15

Browse files
lqiu96lqiu96
committed
chore: Reset pom properties names to original value
1 parent 6682d84 commit 74e2a15

11 files changed

Lines changed: 67 additions & 73 deletions

File tree

‎.kokoro/nightly/downstream-protobuf-source-compatibility.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ for repo in ${REPOS_UNDER_TEST//,/ }; do # Split on comma
4848
-Denforcer.skip \
4949
-Dmaven.javadoc.skip \
5050
-Denforcer.skip \
51-
-Dprotobuf-java.version=${PROTOBUF_RUNTIME_VERSION} \
51+
-Dprotobuf.version=${PROTOBUF_RUNTIME_VERSION} \
5252
-pl "${google_cloud_java_handwritten_maven_args}" -am \
5353
"${surefire_opt}" \
5454
-T 1C
@@ -58,7 +58,7 @@ for repo in ${REPOS_UNDER_TEST//,/ }; do # Split on comma
5858
-Denforcer.skip \
5959
-Dmaven.javadoc.skip \
6060
-Denforcer.skip \
61-
-Dprotobuf-java.version=${PROTOBUF_RUNTIME_VERSION} \
61+
-Dprotobuf.version=${PROTOBUF_RUNTIME_VERSION} \
6262
"${surefire_opt}" \
6363
-T 1C
6464
fi

‎api-common-java/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<dependency>
6464
<groupId>com.google.errorprone</groupId>
6565
<artifactId>error_prone_annotations</artifactId>
66-
<version>${error_prone_annotations.version}</version>
66+
<version>${errorprone.version}</version>
6767
<scope>compile</scope>
6868
</dependency>
6969

‎gapic-generator-java-bom/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,22 @@
2525
<dependency>
2626
<groupId>com.google.auth</groupId>
2727
<artifactId>google-auth-library-bom</artifactId>
28-
<version>${google-auth-library-bom.version}</version>
28+
<version>${google.auth.version}</version>
2929
<type>pom</type>
3030
<scope>import</scope>
3131
</dependency>
3232
<dependency>
3333
<groupId>com.google.auth</groupId>
3434
<artifactId>google-auth-library-oauth2-http</artifactId>
35-
<version>${google-auth-library-bom.version}</version>
35+
<version>${google.auth.version}</version>
3636
<type>test-jar</type>
3737
<classifier>testlib</classifier>
3838
<scope>test</scope>
3939
</dependency>
4040
<dependency>
4141
<groupId>com.google.http-client</groupId>
4242
<artifactId>google-http-client-bom</artifactId>
43-
<version>${google-http-client.version}</version>
43+
<version>${google.http-client.version}</version>
4444
<type>pom</type>
4545
<scope>import</scope>
4646
</dependency>
@@ -59,14 +59,14 @@
5959
<dependency>
6060
<groupId>com.google.protobuf</groupId>
6161
<artifactId>protobuf-bom</artifactId>
62-
<version>${protobuf-java.version}</version>
62+
<version>${protobuf.version}</version>
6363
<type>pom</type>
6464
<scope>import</scope>
6565
</dependency>
6666
<dependency>
6767
<groupId>io.grpc</groupId>
6868
<artifactId>grpc-bom</artifactId>
69-
<version>${grpc-bom.version}</version>
69+
<version>${grpc.version}</version>
7070
<type>pom</type>
7171
<scope>import</scope>
7272
</dependency>

‎gapic-generator-java/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@
247247
<version>0.6.1</version>
248248
<configuration>
249249
<protocArtifact>
250-
com.google.protobuf:protoc:${protobuf-java.version}:exe:${os.detected.classifier}
250+
com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}
251251
</protocArtifact>
252252
</configuration>
253253
<executions>
@@ -450,7 +450,7 @@
450450
<dependency>
451451
<groupId>com.google.errorprone</groupId>
452452
<artifactId>error_prone_annotations</artifactId>
453-
<version>${error_prone_annotations.version}</version>
453+
<version>${errorprone.version}</version>
454454
</dependency>
455455

456456
<!--

‎gax-java/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<dependency>
5656
<groupId>com.google.auth</groupId>
5757
<artifactId>google-auth-library-bom</artifactId>
58-
<version>${google-auth-library-bom.version}</version>
58+
<version>${google.auth.version}</version>
5959
<type>pom</type>
6060
<scope>import</scope>
6161
</dependency>
@@ -120,7 +120,7 @@
120120
<dependency>
121121
<groupId>io.grpc</groupId>
122122
<artifactId>grpc-bom</artifactId>
123-
<version>${grpc-bom.version}</version>
123+
<version>${grpc.version}</version>
124124
<type>pom</type>
125125
<scope>import</scope>
126126
</dependency>
@@ -137,26 +137,26 @@
137137
<dependency>
138138
<groupId>org.slf4j</groupId>
139139
<artifactId>slf4j-api</artifactId>
140-
<version>${slf4j-api.version}</version>
140+
<version>${slf4j.version}</version>
141141
</dependency>
142142
<dependency>
143143
<groupId>com.google.http-client</groupId>
144144
<artifactId>google-http-client-bom</artifactId>
145-
<version>${google-http-client.version}</version>
145+
<version>${google.http-client.version}</version>
146146
<type>pom</type>
147147
<scope>import</scope>
148148
</dependency>
149149
<dependency>
150150
<groupId>com.google.protobuf</groupId>
151151
<artifactId>protobuf-bom</artifactId>
152-
<version>${protobuf-java.version}</version>
152+
<version>${protobuf.version}</version>
153153
<type>pom</type>
154154
<scope>import</scope>
155155
</dependency>
156156
<dependency>
157157
<groupId>io.opentelemetry</groupId>
158158
<artifactId>opentelemetry-bom</artifactId>
159-
<version>${opentelemetry-bom.version}</version>
159+
<version>${opentelemetry.version}</version>
160160
<type>pom</type>
161161
<scope>import</scope>
162162
</dependency>

‎java-common-protos/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<dependency>
5858
<groupId>com.google.protobuf</groupId>
5959
<artifactId>protobuf-bom</artifactId>
60-
<version>${protobuf-java.version}</version>
60+
<version>${protobuf.version}</version>
6161
<type>pom</type>
6262
<scope>import</scope>
6363
</dependency>
@@ -69,7 +69,7 @@
6969
<dependency>
7070
<groupId>io.grpc</groupId>
7171
<artifactId>grpc-bom</artifactId>
72-
<version>${grpc-bom.version}</version>
72+
<version>${grpc.version}</version>
7373
<type>pom</type>
7474
<scope>import</scope>
7575
</dependency>

‎java-core/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@
6464
</dependency>
6565
<dependency>
6666
<groupId>com.google.errorprone</groupId>
67-
<artifactId>error_prone_annotations</artifactId>
68-
<version>${error_prone_annotations.version}</version>
67+
<artifactId>error_prone_annotationsa</artifactId>
68+
<version>${errorprone.version}</version>
6969
</dependency>
7070
</dependencies>
7171
</dependencyManagement>

‎java-iam/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,14 @@
7474
<dependency>
7575
<groupId>com.google.protobuf</groupId>
7676
<artifactId>protobuf-bom</artifactId>
77-
<version>${protobuf-java.version}</version>
77+
<version>${protobuf.version}</version>
7878
<type>pom</type>
7979
<scope>import</scope>
8080
</dependency>
8181
<dependency>
8282
<groupId>io.grpc</groupId>
8383
<artifactId>grpc-bom</artifactId>
84-
<version>${grpc-bom.version}</version>
84+
<version>${grpc.version}</version>
8585
<type>pom</type>
8686
<scope>import</scope>
8787
</dependency>

‎java-shared-dependencies/first-party-dependencies/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2424
<site.installationModule>${project.artifactId}</site.installationModule>
2525
<grpc-gcp.version>1.6.1</grpc-gcp.version>
26-
<google-oauth-client.version>1.39.0</google-oauth-client.version>
27-
<google-api-client.version>2.7.2</google-api-client.version>
26+
<google.oauth-client.version>1.39.0</google.oauth-client.version>
27+
<google.api-client.version>2.7.2</google.api-client.version>
2828
</properties>
2929

3030
<dependencyManagement>
@@ -52,14 +52,14 @@
5252
<dependency>
5353
<groupId>com.google.oauth-client</groupId>
5454
<artifactId>google-oauth-client-bom</artifactId>
55-
<version>${google-oauth-client.version}</version>
55+
<version>${google.oauth-client.version}</version>
5656
<type>pom</type>
5757
<scope>import</scope>
5858
</dependency>
5959
<dependency>
6060
<groupId>com.google.api-client</groupId>
6161
<artifactId>google-api-client-bom</artifactId>
62-
<version>${google-api-client.version}</version>
62+
<version>${google.api-client.version}</version>
6363
<type>pom</type>
6464
<scope>import</scope>
6565
</dependency>

0 commit comments

Comments
 (0)