Merge remote-tracking branch 'beak/next' into next

[Sone.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 4a1d495..d879cad 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -2,17 +2,23 @@
        <modelVersion>4.0.0</modelVersion>
        <groupId>net.pterodactylus</groupId>
        <artifactId>sone</artifactId>
-       <version>0.8.4</version>
+       <version>0.8.6</version>
        <dependencies>
                <dependency>
                        <groupId>net.pterodactylus</groupId>
                        <artifactId>utils</artifactId>
-                       <version>0.12.3-SNAPSHOT</version>
+                       <version>0.12.3</version>
                </dependency>
                <dependency>
                        <groupId>junit</groupId>
                        <artifactId>junit</artifactId>
-                       <version>3.8.2</version>
+                       <version>4.11</version>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.mockito</groupId>
+                       <artifactId>mockito-all</artifactId>
+                       <version>1.9.5</version>
                        <scope>test</scope>
                </dependency>
                <dependency>
@@ -28,11 +34,6 @@
                        <scope>provided</scope>
                </dependency>
                <dependency>
-                       <groupId>net.pterodactylus</groupId>
-                       <artifactId>utils.json</artifactId>
-                       <version>0.1</version>
-               </dependency>
-               <dependency>
                        <groupId>com.google.inject</groupId>
                        <artifactId>guice</artifactId>
                        <version>3.0</version>
@@ -42,6 +43,16 @@
                        <artifactId>guava</artifactId>
                        <version>14.0-rc1</version>
                </dependency>
+               <dependency>
+                       <groupId>commons-lang</groupId>
+                       <artifactId>commons-lang</artifactId>
+                       <version>2.6</version>
+               </dependency>
+               <dependency>
+                       <groupId>com.fasterxml.jackson.core</groupId>
+                       <artifactId>jackson-databind</artifactId>
+                       <version>2.1.2</version>
+               </dependency>
        </dependencies>
        <repositories>
                <repository>
@@ -109,6 +120,7 @@
                                <configuration>
                                        <detectLinks>true</detectLinks>
                                        <detectJavaApiLink>true</detectJavaApiLink>
+                                       <show>private</show>
                                        <footer>© 2010–2013 David ‘Bombe’ Roden</footer>
                                </configuration>
                        </plugin>