Skip to content

Commit a3e61b9

Browse files
Doha2012Doha2012
committed
upgrade and cleanup
1 parent dffbc5c commit a3e61b9

9 files changed

Lines changed: 79 additions & 93 deletions

File tree

‎apache-fop/pom.xml‎

Lines changed: 12 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<dependency>
6868
<groupId>org.apache.xmlgraphics</groupId>
6969
<artifactId>fop</artifactId>
70-
<version>1.1</version>
70+
<version>${fop.version}</version>
7171
<exclusions>
7272
<exclusion>
7373
<groupId>org.apache.avalon.framework</groupId>
@@ -83,18 +83,18 @@
8383
<dependency>
8484
<groupId>avalon-framework</groupId>
8585
<artifactId>avalon-framework-api</artifactId>
86-
<version>4.2.0</version>
86+
<version>${avalon-framework.version}</version>
8787
</dependency>
8888
<dependency>
8989
<groupId>avalon-framework</groupId>
9090
<artifactId>avalon-framework-impl</artifactId>
91-
<version>4.2.0</version>
91+
<version>${avalon-framework.version}</version>
9292
</dependency>
9393

9494
<dependency>
9595
<groupId>org.dbdoclet</groupId>
9696
<artifactId>dbdoclet</artifactId>
97-
<version>8.0.2</version>
97+
<version>${dbdoclet.version}</version>
9898
</dependency>
9999

100100
<dependency>
@@ -108,7 +108,7 @@
108108
<dependency>
109109
<groupId>net.sf.jtidy</groupId>
110110
<artifactId>jtidy</artifactId>
111-
<version>r938</version>
111+
<version>${jtidy.version}</version>
112112
</dependency>
113113

114114
</dependencies>
@@ -187,40 +187,22 @@
187187
</profiles>
188188

189189
<properties>
190-
<!-- persistence -->
191-
<hibernate.version>4.3.11.Final</hibernate.version>
192-
<mysql-connector-java.version>5.1.38</mysql-connector-java.version>
193-
194-
<!-- marshalling -->
195-
<jackson.version>2.7.2</jackson.version>
196-
190+
<fop.version>1.1</fop.version>
191+
<avalon-framework.version>4.3</avalon-framework.version>
192+
<dbdoclet.version>8.0.2</dbdoclet.version>
193+
<jtidy.version>r938</jtidy.version>
197194
<!-- logging -->
198-
<org.slf4j.version>1.7.9</org.slf4j.version>
199-
<logback.version>1.1.2</logback.version>
200-
201-
<!-- various -->
202-
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
203-
204-
<!-- util -->
205-
<guava.version>19.0</guava.version>
206-
<commons-lang3.version>3.3.2</commons-lang3.version>
195+
<org.slf4j.version>1.7.21</org.slf4j.version>
196+
<logback.version>1.1.7</logback.version>
207197

208198
<!-- testing -->
209199
<org.hamcrest.version>1.3</org.hamcrest.version>
210200
<junit.version>4.12</junit.version>
211201
<mockito.version>1.10.19</mockito.version>
212202

213-
<httpcore.version>4.4</httpcore.version>
214-
<httpclient.version>4.4</httpclient.version>
215-
216-
<rest-assured.version>2.9.0</rest-assured.version>
217-
218203
<!-- maven plugins -->
219-
<maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
220-
<maven-war-plugin.version>2.6</maven-war-plugin.version>
204+
<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
221205
<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
222-
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
223-
<cargo-maven2-plugin.version>1.4.18</cargo-maven2-plugin.version>
224206

225207
</properties>
226208

‎aspectj/pom.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,12 +121,11 @@
121121

122122
<properties>
123123
<source.version>1.8</source.version>
124-
<aspectj.version>1.6.11</aspectj.version>
125124
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
126125
<aspectj.version>1.8.9</aspectj.version>
127126
<org.slf4j.version>1.7.21</org.slf4j.version>
128127
<logback.version>1.1.7</logback.version>
129-
<maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
128+
<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
130129
<junit.version>4.12</junit.version>
131130
</properties>
132131

‎assertj/pom.xml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
<dependency>
2424
<groupId>junit</groupId>
2525
<artifactId>junit</artifactId>
26-
<version>4.12</version>
26+
<version>${junit.version}</version>
2727
<scope>test</scope>
2828
</dependency>
2929
<dependency>
3030
<groupId>org.assertj</groupId>
3131
<artifactId>assertj-core</artifactId>
32-
<version>3.5.1</version>
32+
<version>${assertj-core.version}</version>
3333
<scope>test</scope>
3434
</dependency>
3535

@@ -40,7 +40,7 @@
4040
<plugin>
4141
<groupId>org.apache.maven.plugins</groupId>
4242
<artifactId>maven-compiler-plugin</artifactId>
43-
<version>3.3</version>
43+
<version>${maven-compiler-plugin.version}</version>
4444
<configuration>
4545
<source>1.8</source>
4646
<target>1.8</target>
@@ -51,6 +51,11 @@
5151

5252
<properties>
5353
<guava.version>19.0</guava.version>
54+
<assertj-guava.version>3.1.0</assertj-guava.version>
55+
<junit.version>4.12</junit.version>
56+
<assertj-core.version>3.6.1</assertj-core.version>
57+
58+
<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
5459
</properties>
5560

5661
</project>

‎autovalue/pom.xml‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@
55
<artifactId>autovalue-tutorial</artifactId>
66
<version>1.0</version>
77
<name>AutoValue</name>
8+
89
<build>
910
<plugins>
1011
<plugin>
1112
<groupId>org.apache.maven.plugins</groupId>
1213
<artifactId>maven-compiler-plugin</artifactId>
13-
<version>3.3</version>
14+
<version>${maven-compiler-plugin.version}</version>
1415
<configuration>
1516
<source>7</source>
1617
<target>7</target>
@@ -19,19 +20,25 @@
1920
</plugin>
2021
</plugins>
2122
</build>
23+
2224
<dependencies>
2325
<dependency>
2426
<groupId>com.google.auto.value</groupId>
2527
<artifactId>auto-value</artifactId>
26-
<version>1.2</version>
28+
<version>${auto-value.version}</version>
2729
</dependency>
2830

2931
<dependency>
3032
<groupId>junit</groupId>
3133
<artifactId>junit</artifactId>
32-
<version>4.3</version>
34+
<version>${junit.version}</version>
3335
<scope>test</scope>
3436
</dependency>
35-
3637
</dependencies>
38+
39+
<properties>
40+
<auto-value.version>1.3</auto-value.version>
41+
<junit.version>4.12</junit.version>
42+
<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
43+
</properties>
3744
</project>

‎cdi/pom.xml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@
2222
<dependency>
2323
<groupId>org.aspectj</groupId>
2424
<artifactId>aspectjweaver</artifactId>
25-
<version>1.8.9</version>
25+
<version>${aspectjweaver.version}</version>
2626
</dependency>
2727
<dependency>
2828
<groupId>org.jboss.weld.se</groupId>
2929
<artifactId>weld-se-core</artifactId>
30-
<version>2.3.5.Final</version>
30+
<version>${weld-se-core.version}</version>
3131
</dependency>
3232

3333
<dependency>
3434
<groupId>junit</groupId>
3535
<artifactId>junit</artifactId>
36-
<version>4.12</version>
36+
<version>${junit.version}</version>
3737
<scope>test</scope>
3838
</dependency>
3939
<dependency>
@@ -97,7 +97,10 @@
9797
</profile>
9898
</profiles>
9999
<properties>
100-
<spring.version>4.3.1.RELEASE</spring.version>
100+
<spring.version>4.3.4.RELEASE</spring.version>
101+
<aspectjweaver.version>1.8.9</aspectjweaver.version>
102+
<weld-se-core.version>2.4.1.Final</weld-se-core.version>
103+
<junit.version>4.12</junit.version>
101104
<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
102105
</properties>
103106

‎core-java-9/pom.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,7 @@
7676

7777
<properties>
7878
<!-- logging -->
79-
<org.slf4j.version>1.7.13</org.slf4j.version>
80-
<logback.version>1.0.13</logback.version>
81-
79+
<org.slf4j.version>1.7.21</org.slf4j.version>
8280

8381
<!-- maven plugins -->
8482
<maven-compiler-plugin.version>3.6-jigsaw-SNAPSHOT</maven-compiler-plugin.version>

‎core-java/pom.xml‎

Lines changed: 15 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<dependency>
1515
<groupId>net.sourceforge.collections</groupId>
1616
<artifactId>collections-generic</artifactId>
17-
<version>4.01</version>
17+
<version>${collections-generic.version}</version>
1818
</dependency>
1919
<dependency>
2020
<groupId>com.google.guava</groupId>
@@ -25,13 +25,13 @@
2525
<dependency>
2626
<groupId>org.apache.commons</groupId>
2727
<artifactId>commons-collections4</artifactId>
28-
<version>4.0</version>
28+
<version>${commons-collections4.version}</version>
2929
</dependency>
3030

3131
<dependency>
3232
<groupId>commons-io</groupId>
3333
<artifactId>commons-io</artifactId>
34-
<version>2.4</version>
34+
<version>${commons-io.version}</version>
3535
</dependency>
3636

3737
<dependency>
@@ -43,7 +43,7 @@
4343
<dependency>
4444
<groupId>org.apache.commons</groupId>
4545
<artifactId>commons-math3</artifactId>
46-
<version>3.3</version>
46+
<version>${commons-math3.version}</version>
4747
</dependency>
4848

4949
<dependency>
@@ -122,8 +122,6 @@
122122
<scope>test</scope>
123123
</dependency>
124124

125-
126-
127125
<dependency>
128126
<groupId>org.mockito</groupId>
129127
<artifactId>mockito-core</artifactId>
@@ -321,44 +319,33 @@
321319
</profiles>
322320

323321
<properties>
324-
<!-- persistence -->
325-
<hibernate.version>4.3.11.Final</hibernate.version>
326-
<mysql-connector-java.version>5.1.38</mysql-connector-java.version>
327-
328322
<!-- marshalling -->
329-
<jackson.version>2.7.8</jackson.version>
323+
<jackson.version>2.8.5</jackson.version>
330324

331325
<!-- logging -->
332-
<org.slf4j.version>1.7.13</org.slf4j.version>
333-
<logback.version>1.1.3</logback.version>
334-
335-
<!-- various -->
336-
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
326+
<org.slf4j.version>1.7.21</org.slf4j.version>
327+
<logback.version>1.1.7</logback.version>
337328

338329
<!-- util -->
339330
<guava.version>19.0</guava.version>
340-
<commons-lang3.version>3.4</commons-lang3.version>
331+
<commons-lang3.version>3.5</commons-lang3.version>
341332
<bouncycastle.version>1.55</bouncycastle.version>
342333
<commons-codec.version>1.10</commons-codec.version>
334+
<commons-math3.version>3.6.1</commons-math3.version>
335+
<commons-io.version>2.5</commons-io.version>
336+
<commons-collections4.version>4.1</commons-collections4.version>
337+
<collections-generic.version>4.01</collections-generic.version>
343338

344339
<!-- testing -->
345340
<org.hamcrest.version>1.3</org.hamcrest.version>
346341
<junit.version>4.12</junit.version>
347342
<mockito.version>1.10.19</mockito.version>
348-
<testng.version>6.8</testng.version>
349-
<assertj.version>3.5.1</assertj.version>
350-
351-
<httpcore.version>4.4.1</httpcore.version>
352-
<httpclient.version>4.5</httpclient.version>
353-
354-
<rest-assured.version>2.9.0</rest-assured.version>
343+
<testng.version>6.10</testng.version>
344+
<assertj.version>3.6.1</assertj.version>
355345

356346
<!-- maven plugins -->
357-
<maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
358-
<maven-war-plugin.version>2.6</maven-war-plugin.version>
347+
<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
359348
<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
360-
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
361-
<cargo-maven2-plugin.version>1.4.18</cargo-maven2-plugin.version>
362349

363350
</properties>
364351

‎core-java/src/main/java/com/baeldung/threadpool/ExitingExecutorServiceExample.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ public class ExitingExecutorServiceExample {
1616

1717
public static void main(String... args) {
1818

19-
ThreadPoolExecutor executor = (ThreadPoolExecutor) Executors.newFixedThreadPool(5);
20-
ExecutorService executorService = MoreExecutors.getExitingExecutorService(executor, 100, TimeUnit.MILLISECONDS);
19+
final ThreadPoolExecutor executor = (ThreadPoolExecutor) Executors.newFixedThreadPool(5);
20+
final ExecutorService executorService = MoreExecutors.getExitingExecutorService(executor, 100, TimeUnit.MILLISECONDS);
2121

22-
executorService.submit(() -> {
22+
executorService.submit((Runnable) () -> {
2323
while (true) {
2424
}
2525
});

0 commit comments

Comments
 (0)