Skip to content

Commit 950aa95

Browse files
suztomosuztomo
committed
fixed dependencies
1 parent e338f68 commit 950aa95

File tree

6 files changed

+8
-237
lines changed

6 files changed

+8
-237
lines changed

‎generation/check_non_release_please_versions.sh‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ set -e
44

55
violations=0
66
for pomFile in $(find . -mindepth 2 -name pom.xml | sort ); do
7-
if [[ "${pomFile}" =~ .*google-cloud-jar-parent.* ]] || [[ "${pomFile}" =~ .*google-cloud-pom-parent.* ]] ||[[ "${pomFile}" =~ .*CoverageAggregator.* ]]; then
7+
if [[ "${pomFile}" =~ .*google-cloud-jar-parent.* ]] || \
8+
[[ "${pomFile}" =~ .*google-cloud-pom-parent.* ]] || \
9+
[[ "${pomFile}" =~ .*CoverageAggregator.* ]] || \
10+
[[ "${pomFile}" =~ .*java-shared-dependencies*. ]]; then
811
continue
912
fi
1013
if [[ "${pomFile}" =~ .*owl-bot-postprocessor.* ]]; then

‎java-core/google-cloud-core-bom/pom.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77
<packaging>pom</packaging>
88
<parent>
99
<groupId>com.google.cloud</groupId>
10-
<artifactId>google-cloud-shared-config</artifactId>
11-
<version>1.5.5</version>
10+
<artifactId>google-cloud-pom-parent</artifactId>
11+
<version>1.4.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-java:current} -->
12+
<relativePath>../../google-cloud-pom-parent/pom.xml</relativePath>
1213
</parent>
1314

1415
<name>Google Cloud Core</name>

‎java-core/pom.xml‎

Lines changed: 0 additions & 144 deletions
Original file line numberDiff line numberDiff line change
@@ -174,150 +174,6 @@
174174
<gson.version>2.10.1</gson.version>
175175
</properties>
176176

177-
<dependencyManagement>
178-
<dependencies>
179-
<dependency>
180-
<groupId>com.google.cloud</groupId>
181-
<artifactId>google-cloud-core</artifactId>
182-
<version>${project.version}</version>
183-
</dependency>
184-
185-
<dependency>
186-
<groupId>com.google.auth</groupId>
187-
<artifactId>google-auth-library-bom</artifactId>
188-
<version>${google.auth.version}</version>
189-
<type>pom</type>
190-
<scope>import</scope>
191-
</dependency>
192-
<dependency>
193-
<groupId>com.google.api</groupId>
194-
<artifactId>gax-bom</artifactId>
195-
<version>${gax.version}</version>
196-
<type>pom</type>
197-
<scope>import</scope>
198-
</dependency>
199-
<dependency>
200-
<groupId>com.google.http-client</groupId>
201-
<artifactId>google-http-client-bom</artifactId>
202-
<version>${google.http.version}</version>
203-
<type>pom</type>
204-
<scope>import</scope>
205-
</dependency>
206-
<dependency>
207-
<groupId>com.google.api-client</groupId>
208-
<artifactId>google-api-client-bom</artifactId>
209-
<version>${google.api.version}</version>
210-
<type>pom</type>
211-
<scope>import</scope>
212-
</dependency>
213-
<dependency>
214-
<groupId>io.grpc</groupId>
215-
<artifactId>grpc-bom</artifactId>
216-
<version>${grpc.version}</version>
217-
<type>pom</type>
218-
<scope>import</scope>
219-
</dependency>
220-
<dependency>
221-
<groupId>com.google.protobuf</groupId>
222-
<artifactId>protobuf-bom</artifactId>
223-
<version>${protobuf.version}</version>
224-
<type>pom</type>
225-
<scope>import</scope>
226-
</dependency>
227-
<dependency>
228-
<groupId>com.google.guava</groupId>
229-
<artifactId>guava-bom</artifactId>
230-
<version>${guava.version}</version>
231-
<type>pom</type>
232-
<scope>import</scope>
233-
</dependency>
234-
<dependency>
235-
<groupId>com.google.api</groupId>
236-
<artifactId>api-common</artifactId>
237-
<version>${google.api-common.version}</version>
238-
</dependency>
239-
<dependency>
240-
<groupId>com.google.api.grpc</groupId>
241-
<artifactId>proto-google-common-protos</artifactId>
242-
<version>${google.common-protos.version}</version>
243-
</dependency>
244-
<dependency>
245-
<groupId>com.google.api.grpc</groupId>
246-
<artifactId>proto-google-iam-v1</artifactId>
247-
<version>${google.iam.version}</version>
248-
</dependency>
249-
<!-- TODO(chingor): use bom when opencensus publishes one -->
250-
<dependency>
251-
<groupId>io.opencensus</groupId>
252-
<artifactId>opencensus-api</artifactId>
253-
<version>${opencensus.version}</version>
254-
</dependency>
255-
<dependency>
256-
<groupId>io.opencensus</groupId>
257-
<artifactId>opencensus-contrib-http-util</artifactId>
258-
<version>${opencensus.version}</version>
259-
</dependency>
260-
261-
<dependency>
262-
<groupId>javax.annotation</groupId>
263-
<artifactId>javax.annotation-api</artifactId>
264-
<version>${annotations-api.version}</version>
265-
</dependency>
266-
<dependency>
267-
<groupId>com.google.code.findbugs</groupId>
268-
<artifactId>jsr305</artifactId>
269-
<version>${findbugs.version}</version>
270-
</dependency>
271-
<dependency>
272-
<groupId>org.threeten</groupId>
273-
<artifactId>threetenbp</artifactId>
274-
<version>${threetenbp.version}</version>
275-
</dependency>
276-
<dependency>
277-
<groupId>com.google.errorprone</groupId>
278-
<artifactId>error_prone_annotations</artifactId>
279-
<version>${errorprone.version}</version>
280-
</dependency>
281-
<dependency>
282-
<groupId>com.google.code.gson</groupId>
283-
<artifactId>gson</artifactId>
284-
<version>${gson.version}</version>
285-
</dependency>
286-
287-
<!-- Begin test dependencies -->
288-
<dependency>
289-
<groupId>com.google.truth</groupId>
290-
<artifactId>truth</artifactId>
291-
<version>${truth.version}</version>
292-
<scope>test</scope>
293-
<exclusions>
294-
<exclusion>
295-
<groupId>org.checkerframework</groupId>
296-
<artifactId>checker-qual</artifactId>
297-
</exclusion>
298-
</exclusions>
299-
</dependency>
300-
<dependency>
301-
<groupId>junit</groupId>
302-
<artifactId>junit</artifactId>
303-
<version>${junit.version}</version>
304-
<scope>test</scope>
305-
</dependency>
306-
<dependency>
307-
<groupId>org.easymock</groupId>
308-
<artifactId>easymock</artifactId>
309-
<version>${easymock.version}</version>
310-
<scope>test</scope>
311-
</dependency>
312-
<dependency>
313-
<groupId>org.objenesis</groupId>
314-
<artifactId>objenesis</artifactId>
315-
<version>${objenesis.version}</version>
316-
<scope>test</scope>
317-
</dependency>
318-
</dependencies>
319-
</dependencyManagement>
320-
321177
<modules>
322178
<module>google-cloud-core</module>
323179
<module>google-cloud-core-http</module>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@
7676
<groupId>junit</groupId>
7777
<artifactId>junit</artifactId>
7878
<scope>test</scope>
79-
<version>4.13.2</version>
8079
</dependency>
8180

8281
<dependency>

‎java-iam/pom.xml‎

Lines changed: 0 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -66,96 +66,9 @@
6666
<site.installationModule>google-iam-parent</site.installationModule>
6767
</properties>
6868

69-
<dependencyManagement>
70-
<dependencies>
71-
<dependency>
72-
<groupId>com.google.cloud</groupId>
73-
<artifactId>google-cloud-shared-dependencies</artifactId>
74-
<version>3.1.1</version>
75-
<type>pom</type>
76-
<scope>import</scope>
77-
</dependency>
78-
<dependency>
79-
<groupId>junit</groupId>
80-
<artifactId>junit</artifactId>
81-
<version>4.13.2</version>
82-
<scope>test</scope>
83-
</dependency>
84-
</dependencies>
85-
</dependencyManagement>
86-
8769
<modules>
8870
<module>google-iam-policy</module>
8971
<module>google-iam-policy-bom</module>
9072
</modules>
9173

92-
<reporting>
93-
<plugins>
94-
<plugin>
95-
<groupId>org.apache.maven.plugins</groupId>
96-
<artifactId>maven-project-info-reports-plugin</artifactId>
97-
<version>3.4.1</version>
98-
<reportSets>
99-
<reportSet>
100-
<reports>
101-
<report>index</report>
102-
<report>dependency-info</report>
103-
<report>team</report>
104-
<report>ci-management</report>
105-
<report>issue-management</report>
106-
<report>licenses</report>
107-
<report>scm</report>
108-
<report>dependency-management</report>
109-
<report>distribution-management</report>
110-
<report>summary</report>
111-
<report>modules</report>
112-
</reports>
113-
</reportSet>
114-
</reportSets>
115-
<configuration>
116-
<dependencyDetailsEnabled>true</dependencyDetailsEnabled>
117-
<artifactId>${site.installationModule}</artifactId>
118-
<packaging>jar</packaging>
119-
</configuration>
120-
</plugin>
121-
<plugin>
122-
<groupId>org.apache.maven.plugins</groupId>
123-
<artifactId>maven-javadoc-plugin</artifactId>
124-
<version>3.4.1</version>
125-
<reportSets>
126-
<reportSet>
127-
<id>html</id>
128-
<reports>
129-
<report>aggregate</report>
130-
<report>javadoc</report>
131-
</reports>
132-
</reportSet>
133-
</reportSets>
134-
<configuration>
135-
<doclint>none</doclint>
136-
<show>protected</show>
137-
<nohelp>true</nohelp>
138-
<outputDirectory>${project.build.directory}/javadoc</outputDirectory>
139-
<groups>
140-
<group>
141-
<title>Test helpers packages</title>
142-
<packages>com.google.cloud.testing</packages>
143-
</group>
144-
<group>
145-
<title>SPI packages</title>
146-
<packages>com.google.cloud.spi*</packages>
147-
</group>
148-
</groups>
149-
150-
<links>
151-
<link>https://grpc.io/grpc-java/javadoc/</link>
152-
<link>https://developers.google.com/protocol-buffers/docs/reference/java/</link>
153-
<link>https://googleapis.dev/java/google-auth-library/latest/</link>
154-
<link>https://googleapis.dev/java/gax/latest/</link>
155-
<link>https://googleapis.github.io/api-common-java/</link>
156-
</links>
157-
</configuration>
158-
</plugin>
159-
</plugins>
160-
</reporting>
16174
</project>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
<gapic-generator-java-bom.version>2.14.0</gapic-generator-java-bom.version>
5959
<grpc-gcp.version>1.3.2</grpc-gcp.version>
6060
<gson.version>2.10.1</gson.version>
61-
<google.core.version>2.9.4</google.core.version>
6261
<google.http-client.version>1.42.3</google.http-client.version>
6362
<google.oauth-client.version>1.34.1</google.oauth-client.version>
6463
<google.api-client.version>2.1.2</google.api-client.version>
@@ -88,7 +87,7 @@
8887
<dependency>
8988
<groupId>com.google.cloud</groupId>
9089
<artifactId>google-cloud-core-bom</artifactId>
91-
<version>${google.core.version}</version>
90+
<version>2.9.5-SNAPSHOT</version><!-- {x-version-update:google-cloud-core:current} -->
9291
<type>pom</type>
9392
<scope>import</scope>
9493
</dependency>

0 commit comments

Comments
 (0)