Browse files

Merge pull request #85 from jplock/deps

Upgraded dependencies (except for Jackson) to latest versions
  • Loading branch information...
2 parents 651ab4e + ddbb757 commit 7ca12973c682a806e868fab0a3a865dda50ee0f4 @froh42 froh42 committed Mar 7, 2013
Showing with 16 additions and 14 deletions.
  1. +12 −12 pom.xml
  2. +4 −2 src/test/java/com/notnoop/apns/PayloadBuilderTest.java
View
24 pom.xml
@@ -30,7 +30,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
+ <version>3.0</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
@@ -60,12 +60,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.1</version>
+ <version>2.4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.4</version>
<configuration>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
@@ -81,7 +81,7 @@
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
+ <version>2.9</version>
<executions>
<execution>
<goals>
@@ -94,7 +94,7 @@
<plugin>
<artifactId>maven-source-plugin</artifactId>
- <version>2.1.2</version>
+ <version>2.2.1</version>
<executions>
<execution>
<id>bind-sources</id>
@@ -162,28 +162,28 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>0.9.24</version>
+ <version>1.0.9</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.6.1</version>
+ <version>1.7.2</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.7</version>
+ <version>4.11</version>
<type>jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
- <version>1.8.1</version>
+ <version>1.9.5</version>
<type>jar</type>
<scope>test</scope>
</dependency>
@@ -221,15 +221,15 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
+ <version>2.9</version>
<configuration>
<excludePackageNames>com.notnoop.apns.internal</excludePackageNames>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
- <version>2.2</version>
+ <version>2.3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -246,7 +246,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>2.0.1</version>
+ <version>2.5.2</version>
</plugin>
-->
</plugins>
View
6 src/test/java/com/notnoop/apns/PayloadBuilderTest.java
@@ -1,13 +1,15 @@
package com.notnoop.apns;
-import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
-import static org.junit.matchers.JUnitMatchers.*;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.IsNot.not;
+import static org.hamcrest.core.StringContains.containsString;
import java.util.Arrays;
import java.util.Map;
import java.util.Random;
import org.codehaus.jackson.map.ObjectMapper;
import org.junit.Test;
+import com.notnoop.apns.PayloadBuilder;
import com.notnoop.apns.internal.Utilities;
public class PayloadBuilderTest {

0 comments on commit 7ca1297

Please sign in to comment.