Skip to content

Commit 703a83f

Browse files
author
Karl Rieb
committed
Update pom dependencies.
1 parent 8cbb99a commit 703a83f

4 files changed

Lines changed: 29 additions & 21 deletions

File tree

‎examples/longpoll/src/com/dropbox/core/examples/longpoll/Main.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ public static void longpoll(DbxAuthInfo auth, String path) throws IOException {
4242
//
4343
StandardHttpRequestor.Config config = StandardHttpRequestor.Config.DEFAULT_INSTANCE;
4444
StandardHttpRequestor.Config longpollConfig = config.copy()
45-
.withReadTimeout(longpollTimeoutSecs + 1, TimeUnit.SECONDS)
45+
// read timeout should be well above longpoll timeout to allow for flucuations in response times.
46+
.withReadTimeout(5, TimeUnit.MINUTES)
4647
.build();
4748

4849
DbxClientV2 dbxClient = createClient(auth, config);
@@ -67,7 +68,6 @@ public static void longpoll(DbxAuthInfo auth, String path) throws IOException {
6768
// before issuing another longpoll request.
6869
Long backoff = result.getBackoff();
6970
if (backoff != null) {
70-
System.out.printf("\n\nBacking off for %d seconds\n\n", backoff);
7171
try {
7272
Thread.sleep(TimeUnit.SECONDS.toMillis(backoff));
7373
} catch (InterruptedException ex) {

‎examples/web-file-browser/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,27 +19,27 @@
1919
<dependency>
2020
<groupId>org.eclipse.jetty.aggregate</groupId>
2121
<artifactId>jetty-server</artifactId>
22-
<version>[8.1,9)</version>
22+
<version>9.3.7.v20160115</version>
2323
</dependency>
2424
<dependency>
2525
<groupId>javax.servlet</groupId>
2626
<artifactId>javax.servlet-api</artifactId>
27-
<version>3.0.1</version>
27+
<version>3.1.0</version>
2828
</dependency>
2929
<dependency>
3030
<groupId>org.apache.commons</groupId>
3131
<artifactId>commons-lang3</artifactId>
32-
<version>[3,4)</version>
32+
<version>3.4</version>
3333
</dependency>
3434
<dependency>
3535
<groupId>com.fasterxml.jackson.core</groupId>
3636
<artifactId>jackson-core</artifactId>
37-
<version>[2.2,2.3)</version>
37+
<version>2.7.1</version>
3838
</dependency>
3939
<dependency>
4040
<groupId>com.fasterxml.jackson.core</groupId>
4141
<artifactId>jackson-databind</artifactId>
42-
<version>[2.2,2.3)</version>
42+
<version>2.7.1-1</version>
4343
</dependency>
4444
</dependencies>
4545

‎pom.xml‎

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@
3737
</developer>
3838
</developers>
3939

40+
<prerequisites>
41+
<maven>3.0.5</maven>
42+
</prerequisites>
43+
4044
<properties>
4145
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4246
<skipTests>true</skipTests>
@@ -50,22 +54,22 @@
5054
<dependency>
5155
<groupId>com.fasterxml.jackson.core</groupId>
5256
<artifactId>jackson-core</artifactId>
53-
<version>[2.2,2.7)</version>
57+
<version>2.7.1</version>
5458
</dependency>
5559

5660
<!-- A "soft" dependency on the Servlet API. -->
5761
<dependency>
5862
<groupId>javax.servlet</groupId>
5963
<artifactId>servlet-api</artifactId>
60-
<version>2.2</version>
64+
<version>2.5</version>
6165
<scope>provided</scope>
6266
</dependency>
6367

6468
<!-- A "soft" dependency on OkHttp. -->
6569
<dependency>
6670
<groupId>com.squareup.okhttp</groupId>
6771
<artifactId>okhttp</artifactId>
68-
<version>2.5.0</version>
72+
<version>2.7.4</version>
6973
<scope>provided</scope>
7074
</dependency>
7175

@@ -80,13 +84,13 @@
8084
<dependency>
8185
<groupId>org.testng</groupId>
8286
<artifactId>testng</artifactId>
83-
<version>[6,7)</version>
87+
<version>6.9.10</version>
8488
<scope>test</scope>
8589
</dependency>
8690
<dependency>
8791
<groupId>com.google.caliper</groupId>
8892
<artifactId>caliper</artifactId>
89-
<version>1.0-beta-1</version>
93+
<version>1.0-beta-2</version>
9094
<scope>test</scope>
9195
</dependency>
9296
</dependencies>
@@ -109,7 +113,7 @@
109113
<plugin>
110114
<groupId>org.apache.maven.plugins</groupId>
111115
<artifactId>maven-compiler-plugin</artifactId>
112-
<version>3.1</version>
116+
<version>3.5.1</version>
113117
<configuration>
114118
<source>6</source>
115119
<target>6</target>
@@ -118,7 +122,7 @@
118122
<plugin>
119123
<groupId>org.codehaus.mojo</groupId>
120124
<artifactId>animal-sniffer-maven-plugin</artifactId>
121-
<version>1.11</version>
125+
<version>1.14</version>
122126
<configuration>
123127
<signature>
124128
<groupId>org.codehaus.mojo.signature</groupId>
@@ -139,7 +143,7 @@
139143
<plugin>
140144
<groupId>org.apache.maven.plugins</groupId>
141145
<artifactId>maven-source-plugin</artifactId>
142-
<version>2.2.1</version>
146+
<version>3.0.0</version>
143147
<executions>
144148
<execution>
145149
<id>attach-sources</id>
@@ -168,7 +172,7 @@
168172
<plugin>
169173
<groupId>org.apache.maven.plugins</groupId>
170174
<artifactId>maven-antrun-plugin</artifactId>
171-
<version>1.7</version>
175+
<version>1.8</version>
172176
<executions>
173177
<execution>
174178
<id>copy</id>
@@ -187,7 +191,7 @@
187191
<plugin>
188192
<groupId>org.apache.maven.plugins</groupId>
189193
<artifactId>maven-surefire-plugin</artifactId>
190-
<version>2.15</version>
194+
<version>2.19.1</version>
191195
<configuration>
192196
<skipTests>${skipTests}</skipTests>
193197
</configuration>
@@ -237,7 +241,7 @@
237241
<!-- Add OSGi metadata to JAR manifest. -->
238242
<plugin>
239243
<artifactId>maven-jar-plugin</artifactId>
240-
<version>2.5</version>
244+
<version>2.6</version>
241245
<configuration>
242246
<archive>
243247
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
@@ -247,7 +251,7 @@
247251
<plugin>
248252
<groupId>org.apache.felix</groupId>
249253
<artifactId>maven-bundle-plugin</artifactId>
250-
<version>2.5.0</version>
254+
<version>3.0.1</version>
251255
<extensions>true</extensions>
252256
<configuration>
253257
<instructions>
@@ -290,7 +294,7 @@
290294
<plugin>
291295
<groupId>org.codehaus.mojo</groupId>
292296
<artifactId>findbugs-maven-plugin</artifactId>
293-
<version>2.5.3</version>
297+
<version>3.0.3</version>
294298
<configuration>
295299
<effort>max</effort>
296300
<threshold>low</threshold>
@@ -335,6 +339,7 @@
335339
<plugin>
336340
<groupId>org.apache.maven.plugins</groupId>
337341
<artifactId>maven-javadoc-plugin</artifactId>
342+
<version>2.10.3</version>
338343
<configuration>
339344
<!--
340345
TODO: We want to pass a single arg: "-Xdoclint:all,-missing", but

‎src/test/java/com/dropbox/core/json/JsonDateReaderBench.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public class JsonDateReaderBench
1010
* Compare our specialized date parser to Java's more generic
1111
* SimpleDateFormat parser.
1212
*/
13-
public static final class ParseDropboxDate extends Benchmark
13+
public static final class ParseDropboxDate
1414
{
1515
private static final String[] dates = {
1616
"Sun, 01 Jan 1971 00:02:03 +0000",
@@ -35,6 +35,7 @@ public static final class ParseDropboxDate extends Benchmark
3535
}
3636
}
3737

38+
@Benchmark
3839
public void timeSpecialized(int reps)
3940
{
4041
for (int i = 0; i < reps; i++) {
@@ -49,6 +50,7 @@ public void timeSpecialized(int reps)
4950
}
5051
}
5152

53+
@Benchmark
5254
public void timeStandard(int reps)
5355
{
5456
SimpleDateFormat f = dateFormatHolder.get();
@@ -64,6 +66,7 @@ public void timeStandard(int reps)
6466
}
6567
}
6668

69+
@Benchmark
6770
public void timeStandardThreadLocal(int reps)
6871
{
6972
for (int i = 0; i < reps; i++) {

0 commit comments

Comments
 (0)