Skip to content

Commit 7b0c01c

Browse files
Matt Whisenhnuntmattwhisenhunt
authored andcommitted
Bump version of Guava and Jackson Core.
1 parent 273ac80 commit 7b0c01c

File tree

9 files changed

+13
-13
lines changed

9 files changed

+13
-13
lines changed

google-http-client-appengine/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
</dependency>
8181
<dependency>
8282
<groupId>com.google.guava</groupId>
83-
<artifactId>guava-jdk5</artifactId>
83+
<artifactId>guava</artifactId>
8484
<scope>test</scope>
8585
</dependency>
8686
</dependencies>

google-http-client-gson/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
</dependency>
7878
<dependency>
7979
<groupId>com.google.guava</groupId>
80-
<artifactId>guava-jdk5</artifactId>
80+
<artifactId>guava</artifactId>
8181
<scope>test</scope>
8282
</dependency>
8383
</dependencies>

google-http-client-jackson/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
</dependency>
7878
<dependency>
7979
<groupId>com.google.guava</groupId>
80-
<artifactId>guava-jdk5</artifactId>
80+
<artifactId>guava</artifactId>
8181
<scope>test</scope>
8282
</dependency>
8383
</dependencies>

google-http-client-jackson2/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
</dependency>
7878
<dependency>
7979
<groupId>com.google.guava</groupId>
80-
<artifactId>guava-jdk5</artifactId>
80+
<artifactId>guava</artifactId>
8181
<scope>test</scope>
8282
</dependency>
8383
</dependencies>

google-http-client-jdo/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
</dependency>
111111
<dependency>
112112
<groupId>com.google.guava</groupId>
113-
<artifactId>guava-jdk5</artifactId>
113+
<artifactId>guava</artifactId>
114114
<scope>test</scope>
115115
</dependency>
116116
</dependencies>

google-http-client-test/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
</dependency>
6767
<dependency>
6868
<groupId>com.google.guava</groupId>
69-
<artifactId>guava-jdk5</artifactId>
69+
<artifactId>guava</artifactId>
7070
<scope>provided</scope>
7171
</dependency>
7272
</dependencies>

google-http-client-xml/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
</dependency>
7272
<dependency>
7373
<groupId>com.google.guava</groupId>
74-
<artifactId>guava-jdk5</artifactId>
74+
<artifactId>guava</artifactId>
7575
<scope>test</scope>
7676
</dependency>
7777
</dependencies>

google-http-client/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,12 @@
115115
</dependency>
116116
<dependency>
117117
<groupId>com.google.guava</groupId>
118-
<artifactId>guava-jdk5</artifactId>
118+
<artifactId>guava</artifactId>
119119
<scope>provided</scope>
120120
</dependency>
121121
<dependency>
122122
<groupId>com.google.guava</groupId>
123-
<artifactId>guava-testlib-jdk5</artifactId>
123+
<artifactId>guava-testlib</artifactId>
124124
<scope>test</scope>
125125
</dependency>
126126
<dependency>

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,12 +165,12 @@
165165
</dependency>
166166
<dependency>
167167
<groupId>com.google.guava</groupId>
168-
<artifactId>guava-jdk5</artifactId>
168+
<artifactId>guava</artifactId>
169169
<version>${project.guava.version}</version>
170170
</dependency>
171171
<dependency>
172172
<groupId>com.google.guava</groupId>
173-
<artifactId>guava-testlib-jdk5</artifactId>
173+
<artifactId>guava-testlib</artifactId>
174174
<version>${project.guava.version}</version>
175175
</dependency>
176176
<dependency>
@@ -612,9 +612,9 @@
612612
<project.jsr305.version>3.0.2</project.jsr305.version>
613613
<project.gson.version>2.1</project.gson.version>
614614
<project.jackson-core-asl.version>1.9.11</project.jackson-core-asl.version>
615-
<project.jackson-core2.version>2.1.3</project.jackson-core2.version>
615+
<project.jackson-core2.version>2.9.2</project.jackson-core2.version>
616616
<project.protobuf-java.version>2.6.1</project.protobuf-java.version>
617-
<project.guava.version>17.0</project.guava.version>
617+
<project.guava.version>19.0</project.guava.version>
618618
<project.xpp3.version>1.1.4c</project.xpp3.version>
619619
<project.commons-logging.version>1.1.1</project.commons-logging.version>
620620
<project.httpclient.version>4.5.3</project.httpclient.version>

0 commit comments

Comments
 (0)