Skip to content
This repository was archived by the owner on Sep 16, 2023. It is now read-only.

Commit 0262f21

Browse files
authored
fix: google-cloud-dns should release as a jar (#12)
* fix: google-cloud-dns should release as a jar * deps: fix declared dependencies
1 parent 730481b commit 0262f21

File tree

2 files changed

+99
-60
lines changed

2 files changed

+99
-60
lines changed

pom.xml

Lines changed: 98 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.google.cloud</groupId>
55
<artifactId>google-cloud-dns-parent</artifactId>
6-
<packaging>pom</packaging>
6+
<packaging>jar</packaging>
77
<version>0.117.1-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-dns:current} -->
88
<name>Google Cloud DNS Parent</name>
99
<url>https://github.com/googleapis/java-dns</url>
@@ -63,39 +63,21 @@
6363
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
6464
<github.global.server>github</github.global.server>
6565
<site.installationModule>google-cloud-dns-parent</site.installationModule>
66-
<google.core.version>1.91.1</google.core.version>
66+
<google.core.version>1.91.3</google.core.version>
6767
<google.api-common.version>1.8.1</google.api-common.version>
6868
<google.common-protos.version>1.17.0</google.common-protos.version>
69+
<google.auth.version>0.18.0</google.auth.version>
6970
<gax.version>1.50.1</gax.version>
70-
<grpc.version>1.25.0</grpc.version>
71-
<protobuf.version>3.10.0</protobuf.version>
7271
<junit.version>4.12</junit.version>
7372
<guava.version>28.1-android</guava.version>
7473
<threeten.version>1.4.0</threeten.version>
75-
<javax.annotations.version>1.3.2</javax.annotations.version>
7674
<animal-sniffer.version>1.18</animal-sniffer.version>
75+
<easymock.version>3.6</easymock.version>
76+
<errorprone.version>2.3.3</errorprone.version>
7777
</properties>
7878

7979
<dependencyManagement>
8080
<dependencies>
81-
<dependency>
82-
<groupId>com.google.cloud</groupId>
83-
<artifactId>google-cloud-dns</artifactId>
84-
<version>0.117.1-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-dns:current} -->
85-
</dependency>
86-
<dependency>
87-
<groupId>com.google.cloud</groupId>
88-
<artifactId>google-cloud-dns-bom</artifactId>
89-
<version>0.117.1-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-dns-bom:current} -->
90-
</dependency>
91-
92-
<dependency>
93-
<groupId>io.grpc</groupId>
94-
<artifactId>grpc-bom</artifactId>
95-
<version>${grpc.version}</version>
96-
<type>pom</type>
97-
<scope>import</scope>
98-
</dependency>
9981
<dependency>
10082
<groupId>com.google.api</groupId>
10183
<artifactId>gax-bom</artifactId>
@@ -110,54 +92,112 @@
11092
<type>pom</type>
11193
<scope>import</scope>
11294
</dependency>
113-
114-
<dependency>
115-
<groupId>com.google.protobuf</groupId>
116-
<artifactId>protobuf-java</artifactId>
117-
<version>${protobuf.version}</version>
118-
</dependency>
119-
<dependency>
120-
<groupId>com.google.api</groupId>
121-
<artifactId>api-common</artifactId>
122-
<version>${google.api-common.version}</version>
123-
</dependency>
12495
<dependency>
125-
<groupId>com.google.api.grpc</groupId>
126-
<artifactId>proto-google-common-protos</artifactId>
127-
<version>${google.common-protos.version}</version>
128-
</dependency>
129-
<dependency>
130-
<groupId>org.threeten</groupId>
131-
<artifactId>threetenbp</artifactId>
132-
<version>${threeten.version}</version>
96+
<groupId>com.google.http-client</groupId>
97+
<artifactId>google-http-client-bom</artifactId>
98+
<version>1.33.0</version>
99+
<type>pom</type>
100+
<scope>import</scope>
133101
</dependency>
134102
<dependency>
135-
<groupId>javax.annotation</groupId>
136-
<artifactId>javax.annotation-api</artifactId>
137-
<version>${javax.annotations.version}</version>
103+
<groupId>com.google.api-client</groupId>
104+
<artifactId>google-api-client-bom</artifactId>
105+
<version>1.30.5</version>
106+
<type>pom</type>
107+
<scope>import</scope>
138108
</dependency>
139109
<dependency>
140-
<groupId>org.codehaus.mojo</groupId>
141-
<artifactId>animal-sniffer-annotations</artifactId>
142-
<version>${animal-sniffer.version}</version>
110+
<groupId>com.google.cloud</groupId>
111+
<artifactId>google-cloud-core-bom</artifactId>
112+
<version>${google.core.version}</version>
113+
<type>pom</type>
114+
<scope>import</scope>
143115
</dependency>
144-
145116
<dependency>
146-
<groupId>junit</groupId>
147-
<artifactId>junit</artifactId>
148-
<version>${junit.version}</version>
149-
<scope>test</scope>
117+
<groupId>com.google.auth</groupId>
118+
<artifactId>google-auth-library-bom</artifactId>
119+
<version>${google.auth.version}</version>
120+
<type>pom</type>
121+
<scope>import</scope>
150122
</dependency>
151123
<dependency>
152-
<groupId>com.google.api</groupId>
153-
<artifactId>gax-grpc</artifactId>
154-
<version>${gax.version}</version>
155-
<classifier>testlib</classifier>
156-
<scope>test</scope>
124+
<groupId>com.google.errorprone</groupId>
125+
<artifactId>error_prone_annotations</artifactId>
126+
<version>${errorprone.version}</version>
157127
</dependency>
158128
</dependencies>
159129
</dependencyManagement>
160130

131+
<dependencies>
132+
<dependency>
133+
<groupId>com.google.apis</groupId>
134+
<artifactId>google-api-services-dns</artifactId>
135+
<version>v1-rev20190923-1.30.3</version>
136+
</dependency>
137+
<dependency>
138+
<groupId>com.google.api-client</groupId>
139+
<artifactId>google-api-client</artifactId>
140+
</dependency>
141+
<dependency>
142+
<groupId>com.google.http-client</groupId>
143+
<artifactId>google-http-client</artifactId>
144+
</dependency>
145+
<dependency>
146+
<groupId>com.google.http-client</groupId>
147+
<artifactId>google-http-client-jackson2</artifactId>
148+
</dependency>
149+
<dependency>
150+
<groupId>com.google.cloud</groupId>
151+
<artifactId>google-cloud-core</artifactId>
152+
</dependency>
153+
<dependency>
154+
<groupId>com.google.cloud</groupId>
155+
<artifactId>google-cloud-core-http</artifactId>
156+
</dependency>
157+
<dependency>
158+
<groupId>com.google.auth</groupId>
159+
<artifactId>google-auth-library-oauth2-http</artifactId>
160+
</dependency>
161+
<dependency>
162+
<groupId>com.google.api</groupId>
163+
<artifactId>gax</artifactId>
164+
</dependency>
165+
<dependency>
166+
<groupId>com.google.guava</groupId>
167+
<artifactId>guava</artifactId>
168+
</dependency>
169+
<dependency>
170+
<groupId>com.google.api</groupId>
171+
<artifactId>api-common</artifactId>
172+
<version>${google.api-common.version}</version>
173+
</dependency>
174+
<dependency>
175+
<groupId>org.threeten</groupId>
176+
<artifactId>threetenbp</artifactId>
177+
<version>${threeten.version}</version>
178+
</dependency>
179+
180+
<dependency>
181+
<groupId>com.google.cloud</groupId>
182+
<artifactId>google-cloud-core</artifactId>
183+
<version>${google.core.version}</version>
184+
<type>test-jar</type>
185+
<scope>test</scope>
186+
</dependency>
187+
<dependency>
188+
<groupId>junit</groupId>
189+
<artifactId>junit</artifactId>
190+
<version>${junit.version}</version>
191+
<scope>test</scope>
192+
</dependency>
193+
<dependency>
194+
<groupId>org.easymock</groupId>
195+
<artifactId>easymock</artifactId>
196+
<version>${easymock.version}</version>
197+
<scope>test</scope>
198+
</dependency>
199+
</dependencies>
200+
161201
<build>
162202
<pluginManagement>
163203
<plugins>

versions.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# Format:
22
# module:released-version:current-version
33

4-
google-cloud-dns:0.117.0-alpha:0.117.1-alpha-SNAPSHOT
5-
google-cloud-dns-bom:0.117.0-alpha:0.117.1-alpha-SNAPSHOT
4+
google-cloud-dns:0.117.0-alpha:0.117.1-alpha-SNAPSHOT

0 commit comments

Comments
 (0)