Skip to content

Commit c6be40c

Browse files
yue9944882yue9944882
committed
merges dependency declaration
1 parent 47bcdf0 commit c6be40c

File tree

2 files changed

+75
-33
lines changed

2 files changed

+75
-33
lines changed

‎kubernetes/pom.xml

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<groupId>io.kubernetes</groupId>
1515
<artifactId>client-java-parent</artifactId>
1616
<version>10.0.1-SNAPSHOT</version>
17+
<relativePath>../pom.xml</relativePath>
1718
</parent>
1819

1920
<build>
@@ -140,54 +141,38 @@
140141
<dependency>
141142
<groupId>io.sundr</groupId>
142143
<artifactId>builder-annotations</artifactId>
143-
<version>${sundrio.version}</version>
144-
<scope>compile</scope>
145-
<exclusions>
146-
<exclusion>
147-
<artifactId>tools</artifactId>
148-
<groupId>com.sun</groupId>
149-
</exclusion>
150-
</exclusions>
151144
</dependency>
152145
<dependency>
153146
<groupId>javax.annotation</groupId>
154147
<artifactId>javax.annotation-api</artifactId>
155-
<version>1.3.2</version>
156148
</dependency>
157149
<dependency>
158150
<groupId>io.swagger</groupId>
159151
<artifactId>swagger-annotations</artifactId>
160-
<version>${swagger-core-version}</version>
161152
</dependency>
162153
<dependency>
163154
<groupId>com.squareup.okhttp3</groupId>
164155
<artifactId>okhttp</artifactId>
165-
<version>${okhttp3-version}</version>
166156
</dependency>
167157
<dependency>
168158
<groupId>com.squareup.okhttp3</groupId>
169159
<artifactId>logging-interceptor</artifactId>
170-
<version>${okhttp3-version}</version>
171160
</dependency>
172161
<dependency>
173162
<groupId>com.google.code.gson</groupId>
174163
<artifactId>gson</artifactId>
175-
<version>${gson-version}</version>
176164
</dependency>
177165
<dependency>
178166
<groupId>io.gsonfire</groupId>
179167
<artifactId>gson-fire</artifactId>
180-
<version>${gsonfire-version}</version>
181168
</dependency>
182169
<dependency>
183170
<groupId>joda-time</groupId>
184171
<artifactId>joda-time</artifactId>
185-
<version>${jodatime-version}</version>
186172
</dependency>
187173
<dependency>
188174
<groupId>org.joda</groupId>
189175
<artifactId>joda-convert</artifactId>
190-
<version>2.2.1</version>
191176
</dependency>
192177
<dependency>
193178
<groupId>org.apache.commons</groupId>
@@ -196,39 +181,23 @@
196181
<dependency>
197182
<groupId>com.google.code.findbugs</groupId>
198183
<artifactId>jsr305</artifactId>
199-
<version>3.0.2</version>
200184
</dependency>
185+
201186
<!-- test dependencies -->
202187
<dependency>
203188
<groupId>org.hamcrest</groupId>
204189
<artifactId>hamcrest-junit</artifactId>
205-
<version>2.0.0.0</version>
206190
<scope>test</scope>
207191
</dependency>
208192
<dependency>
209193
<groupId>ch.qos.logback</groupId>
210194
<artifactId>logback-classic</artifactId>
211-
<version>1.2.3</version>
212195
<scope>test</scope>
213196
</dependency>
214197
<dependency>
215198
<groupId>junit</groupId>
216199
<artifactId>junit</artifactId>
217-
<version>${junit.version}</version>
218200
<scope>test</scope>
219201
</dependency>
220202
</dependencies>
221-
<properties>
222-
<java.version>1.7</java.version>
223-
<maven.compiler.source>${java.version}</maven.compiler.source>
224-
<maven.compiler.target>${java.version}</maven.compiler.target>
225-
<swagger-core-version>1.6.2</swagger-core-version>
226-
<sundrio.version>0.22.0</sundrio.version>
227-
<okhttp3-version>3.14.9</okhttp3-version>
228-
<gson-version>2.8.6</gson-version>
229-
<gsonfire-version>1.8.4</gsonfire-version>
230-
<jodatime-version>2.10.6</jodatime-version>
231-
<maven-plugin-version>1.0.0</maven-plugin-version>
232-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
233-
</properties>
234203
</project>

‎pom.xml

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,22 @@
3838
<maven-plugin-version>1.0.0</maven-plugin-version>
3939
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4040

41+
<javax.annotation.version>1.3.2</javax.annotation.version>
4142
<snakeyaml.version>1.27</snakeyaml.version>
4243
<slf4j.version>1.7.30</slf4j.version>
4344
<guava.version>29.0-jre</guava.version>
4445
<protobuf.version>3.13.0</protobuf.version>
4546
<junit.version>4.13</junit.version>
4647
<bucket4j.version>4.10.0</bucket4j.version>
4748
<bouncycastle.version>1.66</bouncycastle.version>
49+
<jodatime.version>2.10.6</jodatime.version>
50+
<joda-convert.version>2.2.1</joda-convert.version>
51+
<gson.version>2.8.6</gson.version>
52+
<jsr305.version>3.0.2</jsr305.version>
53+
<okhttp3.version>3.14.9</okhttp3.version>
54+
<swagger-core.version>1.6.2</swagger-core.version>
55+
<sundrio.version>0.22.0</sundrio.version>
56+
<gsonfire.version>1.8.4</gsonfire.version>
4857
<apache.commons.lang3.version>3.11</apache.commons.lang3.version>
4958
<apache.commons.collections4.version>4.4</apache.commons.collections4.version>
5059
<apache.commons.compress>1.20</apache.commons.compress>
@@ -171,6 +180,64 @@
171180
<version>${prometheus.client.version}</version>
172181
<optional>true</optional>
173182
</dependency>
183+
<dependency>
184+
<groupId>joda-time</groupId>
185+
<artifactId>joda-time</artifactId>
186+
<version>${jodatime.version}</version>
187+
</dependency>
188+
<dependency>
189+
<groupId>org.joda</groupId>
190+
<artifactId>joda-convert</artifactId>
191+
<version>${joda-convert.version}</version>
192+
</dependency>
193+
<dependency>
194+
<groupId>com.google.code.gson</groupId>
195+
<artifactId>gson</artifactId>
196+
<version>${gson.version}</version>
197+
</dependency>
198+
<dependency>
199+
<groupId>io.gsonfire</groupId>
200+
<artifactId>gson-fire</artifactId>
201+
<version>${gsonfire.version}</version>
202+
</dependency>
203+
<dependency>
204+
<groupId>com.squareup.okhttp3</groupId>
205+
<artifactId>okhttp</artifactId>
206+
<version>${okhttp3.version}</version>
207+
</dependency>
208+
<dependency>
209+
<groupId>com.squareup.okhttp3</groupId>
210+
<artifactId>logging-interceptor</artifactId>
211+
<version>${okhttp3.version}</version>
212+
</dependency>
213+
<dependency>
214+
<groupId>io.swagger</groupId>
215+
<artifactId>swagger-annotations</artifactId>
216+
<version>${swagger-core.version}</version>
217+
</dependency>
218+
<dependency>
219+
<groupId>javax.annotation</groupId>
220+
<artifactId>javax.annotation-api</artifactId>
221+
<version>${javax.annotation.version}</version>
222+
</dependency>
223+
<dependency>
224+
<groupId>com.google.code.findbugs</groupId>
225+
<artifactId>jsr305</artifactId>
226+
<version>${jsr305.version}</version>
227+
</dependency>
228+
<dependency>
229+
<groupId>io.sundr</groupId>
230+
<artifactId>builder-annotations</artifactId>
231+
<version>${sundrio.version}</version>
232+
<scope>compile</scope>
233+
<exclusions>
234+
<exclusion>
235+
<artifactId>tools</artifactId>
236+
<groupId>com.sun</groupId>
237+
</exclusion>
238+
</exclusions>
239+
</dependency>
240+
174241

175242

176243
<!-- tests -->
@@ -221,6 +288,12 @@
221288
<artifactId>zjsonpatch</artifactId>
222289
<version>0.4.11</version>
223290
</dependency>
291+
<dependency>
292+
<groupId>org.hamcrest</groupId>
293+
<artifactId>hamcrest-junit</artifactId>
294+
<version>2.0.0.0</version>
295+
<scope>test</scope>
296+
</dependency>
224297

225298
</dependencies>
226299
</dependencyManagement>

0 commit comments

Comments
 (0)