Skip to content

Commit c4b72e2

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #975 from yue9944882/chore/homogeneize-pom
Chore: Pom clean up and merges properties/versions definitions to parent pom
2 parents ef53376 + 837861e commit c4b72e2

File tree

6 files changed

+150
-77
lines changed

6 files changed

+150
-77
lines changed

‎examples/pom.xml

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<groupId>io.kubernetes</groupId>
1010
<artifactId>client-java-parent</artifactId>
1111
<version>9.0.0-SNAPSHOT</version>
12+
<relativePath>../pom.xml</relativePath>
1213
</parent>
1314
<dependencies>
1415
<dependency>
@@ -39,24 +40,20 @@
3940
<dependency>
4041
<groupId>com.google.guava</groupId>
4142
<artifactId>guava</artifactId>
42-
<version>25.1-jre</version>
4343
</dependency>
4444
<dependency>
4545
<groupId>commons-cli</groupId>
4646
<artifactId>commons-cli</artifactId>
47-
<version>1.4</version>
4847
</dependency>
4948
<!-- test dependencies -->
5049
<dependency>
5150
<groupId>junit</groupId>
5251
<artifactId>junit</artifactId>
53-
<version>${junit-version}</version>
5452
<scope>test</scope>
5553
</dependency>
5654
<dependency>
5755
<groupId>com.github.tomakehurst</groupId>
5856
<artifactId>wiremock</artifactId>
59-
<version>2.19.0</version>
6057
<scope>test</scope>
6158
</dependency>
6259
</dependencies>
@@ -112,16 +109,5 @@
112109
</plugin>
113110
</plugins>
114111
</build>
115-
<properties>
116-
<java.version>1.8</java.version>
117-
<maven.compiler.source>${java.version}</maven.compiler.source>
118-
<maven.compiler.target>${java.version}</maven.compiler.target>
119-
<swagger-core-version>1.5.12</swagger-core-version>
120-
<okhttp-version>2.7.5</okhttp-version>
121-
<gson-version>2.6.2</gson-version>
122-
<jodatime-version>2.9.3</jodatime-version>
123-
<maven-plugin-version>1.0.0</maven-plugin-version>
124-
<junit-version>4.12</junit-version>
125-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
126-
</properties>
112+
127113
</project>

‎extended/pom.xml

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<artifactId>client-java-parent</artifactId>
1111
<groupId>io.kubernetes</groupId>
1212
<version>9.0.0-SNAPSHOT</version>
13+
<relativePath>../pom.xml</relativePath>
1314
</parent>
1415

1516
<dependencies>
@@ -28,43 +29,38 @@
2829
<artifactId>client-java</artifactId>
2930
<version>${project.version}</version>
3031
</dependency>
32+
3133
<dependency>
3234
<groupId>org.apache.commons</groupId>
3335
<artifactId>commons-lang3</artifactId>
3436
</dependency>
3537
<dependency>
3638
<groupId>com.google.guava</groupId>
3739
<artifactId>guava</artifactId>
38-
<version>25.1-jre</version>
3940
</dependency>
4041
<dependency>
4142
<groupId>com.github.vladimir-bukhtoyarov</groupId>
4243
<artifactId>bucket4j-core</artifactId>
43-
<version>${bucket4jVersion}</version>
4444
</dependency>
4545
<!-- test dependencies -->
4646
<dependency>
4747
<groupId>junit</groupId>
4848
<artifactId>junit</artifactId>
49-
<version>4.12</version>
5049
<scope>test</scope>
5150
</dependency>
5251
<dependency>
5352
<groupId>org.mockito</groupId>
5453
<artifactId>mockito-core</artifactId>
55-
<version>3.0.0</version>
5654
<scope>test</scope>
5755
</dependency>
5856
<dependency>
5957
<groupId>com.github.stefanbirkner</groupId>
6058
<artifactId>system-rules</artifactId>
61-
<version>1.16.1</version>
6259
<scope>test</scope>
6360
</dependency>
6461
<dependency>
6562
<groupId>com.github.tomakehurst</groupId>
6663
<artifactId>wiremock</artifactId>
67-
<version>2.19.0</version>
6864
<scope>test</scope>
6965
</dependency>
7066
<dependency>
@@ -135,11 +131,5 @@
135131
</plugin>
136132
</plugins>
137133
</build>
138-
<properties>
139-
<java.version>1.7</java.version>
140-
<maven.compiler.source>${java.version}</maven.compiler.source>
141-
<maven.compiler.target>${java.version}</maven.compiler.target>
142-
<slf4jVersion>1.7.7</slf4jVersion>
143-
<bucket4jVersion>4.8.0</bucket4jVersion>
144-
</properties>
134+
145135
</project>

‎pom.xml

Lines changed: 141 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,28 @@
2828
<maven>2.2.0</maven>
2929
</prerequisites>
3030

31+
<properties>
32+
<java.version>1.8</java.version>
33+
<maven.compiler.source>${java.version}</maven.compiler.source>
34+
<maven.compiler.target>${java.version}</maven.compiler.target>
35+
<maven-plugin-version>1.0.0</maven-plugin-version>
36+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
37+
38+
<snakeyaml.version>1.25</snakeyaml.version>
39+
<slf4j.version>1.7.25</slf4j.version>
40+
<guava.version>25.1-jre</guava.version>
41+
<protobuf.version>3.4.0</protobuf.version>
42+
<junit.version>4.12</junit.version>
43+
<bucket4j.version>4.8.0</bucket4j.version>
44+
<bouncycastle.version>1.64</bouncycastle.version>
45+
<apache.commons.lang3.version>3.7</apache.commons.lang3.version>
46+
<apache.commons.collections4.version>4.1</apache.commons.collections4.version>
47+
<apache.commons.compress>1.19</apache.commons.compress>
48+
<common.codec.version>1.11</common.codec.version>
49+
<spring.boot.version>2.1.0.RELEASE</spring.boot.version>
50+
<spring.version>5.1.2.RELEASE</spring.version>
51+
</properties>
52+
3153
<licenses>
3254
<license>
3355
<name>The Apache Software License, Version 2.0</name>
@@ -50,13 +72,130 @@
5072
<dependency>
5173
<groupId>org.apache.commons</groupId>
5274
<artifactId>commons-lang3</artifactId>
53-
<version>3.7</version>
75+
<version>${apache.commons.lang3.version}</version>
5476
</dependency>
5577
<dependency>
5678
<groupId>org.apache.commons</groupId>
5779
<artifactId>commons-collections4</artifactId>
58-
<version>4.1</version>
80+
<version>${apache.commons.collections4.version}</version>
81+
</dependency>
82+
<dependency>
83+
<groupId>org.yaml</groupId>
84+
<artifactId>snakeyaml</artifactId>
85+
<version>${snakeyaml.version}</version>
86+
</dependency>
87+
<dependency>
88+
<groupId>commons-codec</groupId>
89+
<artifactId>commons-codec</artifactId>
90+
<version>${common.codec.version}</version>
91+
</dependency>
92+
<dependency>
93+
<groupId>org.apache.commons</groupId>
94+
<artifactId>commons-compress</artifactId>
95+
<version>${apache.commons.compress}</version>
96+
</dependency>
97+
<dependency>
98+
<groupId>com.google.guava</groupId>
99+
<artifactId>guava</artifactId>
100+
<version>${guava.version}</version>
101+
</dependency>
102+
<dependency>
103+
<groupId>org.slf4j</groupId>
104+
<artifactId>slf4j-api</artifactId>
105+
<version>${slf4j.version}</version>
106+
</dependency>
107+
<dependency>
108+
<groupId>org.bouncycastle</groupId>
109+
<artifactId>bcprov-ext-jdk15on</artifactId>
110+
<version>${bouncycastle.version}</version>
111+
</dependency>
112+
<dependency>
113+
<groupId>org.bouncycastle</groupId>
114+
<artifactId>bcpkix-jdk15on</artifactId>
115+
<version>${bouncycastle.version}</version>
116+
</dependency>
117+
<dependency>
118+
<groupId>com.microsoft.azure</groupId>
119+
<artifactId>adal4j</artifactId>
120+
<version>1.6.0</version>
121+
<optional>true</optional>
122+
</dependency>
123+
<dependency>
124+
<groupId>com.google.protobuf</groupId>
125+
<artifactId>protobuf-java</artifactId>
126+
<version>${protobuf.version}</version>
127+
</dependency>
128+
<dependency>
129+
<groupId>org.bitbucket.b_c</groupId>
130+
<artifactId>jose4j</artifactId>
131+
<version>0.7.0</version>
132+
</dependency>
133+
<dependency>
134+
<groupId>com.github.vladimir-bukhtoyarov</groupId>
135+
<artifactId>bucket4j-core</artifactId>
136+
<version>${bucket4j.version}</version>
137+
</dependency>
138+
<dependency>
139+
<groupId>commons-cli</groupId>
140+
<artifactId>commons-cli</artifactId>
141+
<version>1.4</version>
142+
</dependency>
143+
<dependency>
144+
<groupId>org.springframework.boot</groupId>
145+
<artifactId>spring-boot</artifactId>
146+
<version>${spring.boot.version}</version>
147+
</dependency>
148+
<dependency>
149+
<groupId>org.springframework.boot</groupId>
150+
<artifactId>spring-boot-autoconfigure</artifactId>
151+
<version>${spring.boot.version}</version>
152+
</dependency>
153+
154+
155+
<!-- tests -->
156+
<dependency>
157+
<groupId>ch.qos.logback</groupId>
158+
<artifactId>logback-classic</artifactId>
159+
<version>1.2.3</version>
160+
<scope>test</scope>
161+
</dependency>
162+
<dependency>
163+
<groupId>junit</groupId>
164+
<artifactId>junit</artifactId>
165+
<version>4.12</version>
166+
<scope>test</scope>
167+
</dependency>
168+
<dependency>
169+
<groupId>org.mockito</groupId>
170+
<artifactId>mockito-core</artifactId>
171+
<version>3.0.0</version>
172+
<scope>test</scope>
173+
</dependency>
174+
<dependency>
175+
<groupId>com.github.stefanbirkner</groupId>
176+
<artifactId>system-rules</artifactId>
177+
<version>1.16.1</version>
178+
<scope>test</scope>
179+
</dependency>
180+
<dependency>
181+
<groupId>com.github.tomakehurst</groupId>
182+
<artifactId>wiremock</artifactId>
183+
<version>2.19.0</version>
184+
<scope>test</scope>
185+
</dependency>
186+
<dependency>
187+
<groupId>org.springframework.boot</groupId>
188+
<artifactId>spring-boot-test</artifactId>
189+
<version>${spring.boot.version}</version>
190+
<scope>test</scope>
59191
</dependency>
192+
<dependency>
193+
<groupId>org.springframework</groupId>
194+
<artifactId>spring-test</artifactId>
195+
<version>${spring.version}</version>
196+
<scope>test</scope>
197+
</dependency>
198+
60199
</dependencies>
61200
</dependencyManagement>
62201

‎proto/pom.xml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
<groupId>io.kubernetes</groupId>
1111
<artifactId>client-java-parent</artifactId>
1212
<version>9.0.0-SNAPSHOT</version>
13+
<relativePath>../pom.xml</relativePath>
1314
</parent>
1415

1516
<dependencies>
1617
<dependency>
1718
<groupId>com.google.protobuf</groupId>
1819
<artifactId>protobuf-java</artifactId>
19-
<version>3.4.0</version>
2020
</dependency>
2121
</dependencies>
2222
<build>
@@ -35,10 +35,4 @@
3535
</plugin>
3636
</plugins>
3737
</build>
38-
<properties>
39-
<java.version>1.7</java.version>
40-
<maven.compiler.source>${java.version}</maven.compiler.source>
41-
<maven.compiler.target>${java.version}</maven.compiler.target>
42-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
43-
</properties>
4438
</project>

‎spring/pom.xml

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<artifactId>client-java-parent</artifactId>
1212
<groupId>io.kubernetes</groupId>
1313
<version>9.0.0-SNAPSHOT</version>
14+
<relativePath>../pom.xml</relativePath>
1415
</parent>
1516

1617

@@ -29,52 +30,35 @@
2930
<dependency>
3031
<groupId>org.springframework.boot</groupId>
3132
<artifactId>spring-boot</artifactId>
32-
<version>${spring.boot.version}</version>
3333
</dependency>
3434
<dependency>
3535
<groupId>org.springframework.boot</groupId>
3636
<artifactId>spring-boot-autoconfigure</artifactId>
37-
<version>${spring.boot.version}</version>
3837
</dependency>
3938

4039
<dependency>
4140
<groupId>junit</groupId>
4241
<artifactId>junit</artifactId>
43-
<version>${junit-version}</version>
4442
<scope>test</scope>
4543
</dependency>
4644
<dependency>
4745
<groupId>org.springframework.boot</groupId>
4846
<artifactId>spring-boot-test</artifactId>
49-
<version>${spring.boot.version}</version>
5047
<scope>test</scope>
5148
</dependency>
5249
<dependency>
5350
<groupId>org.springframework</groupId>
5451
<artifactId>spring-test</artifactId>
55-
<version>${spring.version}</version>
5652
<scope>test</scope>
5753
</dependency>
5854
<dependency>
5955
<groupId>com.github.tomakehurst</groupId>
6056
<artifactId>wiremock</artifactId>
61-
<version>2.19.0</version>
6257
<scope>test</scope>
6358
</dependency>
6459

6560
</dependencies>
6661

67-
68-
<properties>
69-
<java.version>1.8</java.version>
70-
<maven.compiler.source>${java.version}</maven.compiler.source>
71-
<maven.compiler.target>${java.version}</maven.compiler.target>
72-
<spring.boot.version>2.1.0.RELEASE</spring.boot.version>
73-
<spring.version>5.1.2.RELEASE</spring.version>
74-
<junit-version>4.12</junit-version>
75-
</properties>
76-
77-
7862
<build>
7963
<plugins>
8064
<plugin>

0 commit comments

Comments
 (0)