Skip to content

Commit f938c89

Browse files
Doha2012Doha2012
committed
cleanup and upgrade
1 parent 3b53e82 commit f938c89

5 files changed

Lines changed: 30 additions & 60 deletions

File tree

‎gson/pom.xml‎

Lines changed: 9 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<dependency>
1414
<groupId>joda-time</groupId>
1515
<artifactId>joda-time</artifactId>
16-
<version>2.4</version>
16+
<version>${joda-time.version}</version>
1717
</dependency>
1818

1919
<dependency>
@@ -24,13 +24,13 @@
2424
<dependency>
2525
<groupId>commons-io</groupId>
2626
<artifactId>commons-io</artifactId>
27-
<version>2.4</version>
27+
<version>${commons-io.version}</version>
2828
</dependency>
2929

3030
<dependency>
3131
<groupId>org.apache.commons</groupId>
3232
<artifactId>commons-collections4</artifactId>
33-
<version>4.0</version>
33+
<version>${commons-collections4.version}</version>
3434
</dependency>
3535

3636
<dependency>
@@ -39,8 +39,6 @@
3939
<version>${commons-lang3.version}</version>
4040
</dependency>
4141

42-
<!-- web -->
43-
4442
<!-- marshalling -->
4543

4644
<dependency>
@@ -112,40 +110,24 @@
112110
</build>
113111

114112
<properties>
115-
<!-- persistence -->
116-
<hibernate.version>4.3.11.Final</hibernate.version>
117-
<mysql-connector-java.version>5.1.38</mysql-connector-java.version>
118-
119113
<!-- marshalling -->
120-
<gson.version>2.3</gson.version>
121-
122-
<!-- logging -->
123-
<org.slf4j.version>1.7.13</org.slf4j.version>
124-
<logback.version>1.1.3</logback.version>
125-
126-
<!-- various -->
127-
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
114+
<gson.version>2.8.0</gson.version>
128115

129116
<!-- util -->
130117
<guava.version>19.0</guava.version>
131-
<commons-lang3.version>3.4</commons-lang3.version>
118+
<commons-lang3.version>3.5</commons-lang3.version>
119+
<commons-collections4.version>4.1</commons-collections4.version>
120+
<commons-io.version>2.5</commons-io.version>
121+
<joda-time.version>2.9.6</joda-time.version>
132122

133123
<!-- testing -->
134124
<org.hamcrest.version>1.3</org.hamcrest.version>
135125
<junit.version>4.12</junit.version>
136126
<mockito.version>1.10.19</mockito.version>
137127

138-
<httpcore.version>4.4.1</httpcore.version>
139-
<httpclient.version>4.5</httpclient.version>
140-
141-
<rest-assured.version>2.9.0</rest-assured.version>
142-
143128
<!-- maven plugins -->
144-
<maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
145-
<maven-war-plugin.version>2.6</maven-war-plugin.version>
129+
<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
146130
<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
147-
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
148-
<cargo-maven2-plugin.version>1.4.18</cargo-maven2-plugin.version>
149131

150132
</properties>
151133

‎guava/pom.xml‎

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<dependency>
2020
<groupId>org.apache.commons</groupId>
2121
<artifactId>commons-collections4</artifactId>
22-
<version>4.0</version>
22+
<version>${commons-collections4.version}</version>
2323
</dependency>
2424

2525
<dependency>
@@ -28,8 +28,6 @@
2828
<version>${commons-lang3.version}</version>
2929
</dependency>
3030

31-
<!-- web -->
32-
3331
<!-- test scoped -->
3432

3533
<dependency>
@@ -93,37 +91,19 @@
9391
</build>
9492

9593
<properties>
96-
<!-- persistence -->
97-
<hibernate.version>4.3.11.Final</hibernate.version>
98-
<mysql-connector-java.version>5.1.38</mysql-connector-java.version>
99-
100-
<!-- logging -->
101-
<org.slf4j.version>1.7.13</org.slf4j.version>
102-
<logback.version>1.1.3</logback.version>
103-
104-
<!-- various -->
105-
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
106-
10794
<!-- util -->
10895
<guava.version>19.0</guava.version>
109-
<commons-lang3.version>3.4</commons-lang3.version>
96+
<commons-lang3.version>3.5</commons-lang3.version>
97+
<commons-collections4.version>4.1</commons-collections4.version>
11098

11199
<!-- testing -->
112100
<org.hamcrest.version>1.3</org.hamcrest.version>
113101
<junit.version>4.12</junit.version>
114102
<mockito.version>1.10.19</mockito.version>
115103

116-
<httpcore.version>4.4.1</httpcore.version>
117-
<httpclient.version>4.5</httpclient.version>
118-
119-
<rest-assured.version>2.9.0</rest-assured.version>
120-
121104
<!-- maven plugins -->
122-
<maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
123-
<maven-war-plugin.version>2.6</maven-war-plugin.version>
105+
<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
124106
<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
125-
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
126-
<cargo-maven2-plugin.version>1.4.18</cargo-maven2-plugin.version>
127107

128108
</properties>
129109

‎guava18/pom.xml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
<dependency>
1212
<groupId>com.google.guava</groupId>
1313
<artifactId>guava</artifactId>
14-
<version>18.0</version>
14+
<version>${guava.version}</version>
1515
</dependency>
1616

1717
<dependency>
1818
<groupId>junit</groupId>
1919
<artifactId>junit</artifactId>
20-
<version>4.12</version>
20+
<version>${junit.version}</version>
2121
<scope>test</scope>
2222
</dependency>
2323
</dependencies>
@@ -26,7 +26,7 @@
2626
<plugins>
2727
<plugin>
2828
<artifactId>maven-compiler-plugin</artifactId>
29-
<version>3.3</version>
29+
<version>${maven-compiler-plugin.version}</version>
3030
<configuration>
3131
<debug>true</debug>
3232
<optimize>true</optimize>
@@ -39,5 +39,10 @@
3939
</plugin>
4040
</plugins>
4141
</build>
42-
42+
43+
<properties>
44+
<guava.version>18.0</guava.version>
45+
<junit.version>4.12</junit.version>
46+
<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
47+
</properties>
4348
</project>

‎guava19/pom.xml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
<dependency>
1818
<groupId>junit</groupId>
1919
<artifactId>junit</artifactId>
20-
<version>4.12</version>
20+
<version>${junit.version}</version>
2121
<scope>test</scope>
2222
</dependency>
2323
<dependency>
2424
<groupId>org.hamcrest</groupId>
2525
<artifactId>hamcrest-all</artifactId>
26-
<version>1.3</version>
26+
<version>${hamcrest.version}</version>
2727
<scope>test</scope>
2828
</dependency>
2929
</dependencies>
@@ -32,7 +32,7 @@
3232
<plugins>
3333
<plugin>
3434
<artifactId>maven-compiler-plugin</artifactId>
35-
<version>3.3</version>
35+
<version>${maven-compiler-plugin.version}</version>
3636
<configuration>
3737
<debug>true</debug>
3838
<optimize>true</optimize>
@@ -48,6 +48,9 @@
4848

4949
<properties>
5050
<guava.version>19.0</guava.version>
51+
<junit.version>4.12</junit.version>
52+
<hamcrest.version>1.3</hamcrest.version>
53+
<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
5154
</properties>
5255

5356
</project>

‎httpclient/src/test/java/org/baeldung/httpclient/HttpAsyncClientLiveTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class HttpAsyncClientLiveTest {
3737

3838
private static final String HOST = "http://www.google.com";
3939
private static final String HOST_WITH_SSL = "https://mms.nw.ru/";
40-
private static final String HOST_WITH_PROXY = "https://issues.apache.org/";
40+
private static final String HOST_WITH_PROXY = "http://httpbin.org/";
4141
private static final String URL_SECURED_BY_BASIC_AUTHENTICATION = "http://browserspy.dk/password-ok.php";// "http://localhost:8080/spring-security-rest-basic-auth/api/foos/1";
4242
private static final String DEFAULT_USER = "test";// "user1";
4343
private static final String DEFAULT_PASS = "test";// "user1Pass";
@@ -89,7 +89,7 @@ public void whenUseMultipleHttpAsyncClient_thenCorrect() throws Exception {
8989
public void whenUseProxyWithHttpClient_thenCorrect() throws Exception {
9090
final CloseableHttpAsyncClient client = HttpAsyncClients.createDefault();
9191
client.start();
92-
final HttpHost proxy = new HttpHost("74.50.126.248", 3127);
92+
final HttpHost proxy = new HttpHost("127.0.0.1", 8080);
9393
final RequestConfig config = RequestConfig.custom().setProxy(proxy).build();
9494
final HttpGet request = new HttpGet(HOST_WITH_PROXY);
9595
request.setConfig(config);

0 commit comments

Comments
 (0)