Merge branch 'master' into next

diff --git a/pom.xml b/pom.xml
index 585ac40..4a5a06e 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -2,12 +2,12 @@
        <modelVersion>4.0.0</modelVersion>
        <groupId>net.pterodactylus</groupId>
        <artifactId>sone</artifactId>
-       <version>0.4.1</version>
+       <version>0.4.2</version>
        <dependencies>
                <dependency>
                        <groupId>net.pterodactylus</groupId>
                        <artifactId>utils</artifactId>
-                       <version>0.7.9-SNAPSHOT</version>
+                       <version>0.8</version>
                </dependency>
                <dependency>
                        <groupId>junit</groupId>
@@ -18,7 +18,7 @@
                <dependency>
                        <groupId>org.freenetproject</groupId>
                        <artifactId>fred</artifactId>
-                       <version>0.7.5.1311</version>
+                       <version>0.7.5.1336</version>
                        <scope>provided</scope>
                </dependency>
                <dependency>

diff --git a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
index 2d53e8b..4be076d 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@ -78,7 +78,7 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
        }
 
        /** The version. */
-       public static final Version VERSION = new Version(0, 4, 1);
+       public static final Version VERSION = new Version(0, 4, 2);
 
        /** The logger. */
        private static final Logger logger = Logging.getLogger(SonePlugin.class);