Merge branch 'master' into next

diff --git a/pom.xml b/pom.xml
index cfe1ec0..88db65b 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
        <artifactId>jSite</artifactId>
        <version>${version}</version>
        <properties>
-               <version>0.11.1</version>
+               <version>0.12</version>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        </properties>
        <dependencies>

diff --git a/src/main/java/de/todesbaum/jsite/application/UpdateChecker.java b/src/main/java/de/todesbaum/jsite/application/UpdateChecker.java
index 5577095..24949a9 100644 (file)
--- a/src/main/java/de/todesbaum/jsite/application/UpdateChecker.java
+++ b/src/main/java/de/todesbaum/jsite/application/UpdateChecker.java
@@ -51,10 +51,10 @@ public class UpdateChecker implements Runnable {
        private static int counter = 0;
 
        /** The edition for the update check URL. */
-       private static final int UPDATE_EDITION = 18;
+       private static final int UPDATE_EDITION = 7;
 
        /** The URL for update checks. */
-       private static final String UPDATE_KEY = "USK@e3myoFyp5avg6WYN16ImHri6J7Nj8980Fm~aQe4EX1U,QvbWT0ImE0TwLODTl7EoJx2NBnwDxTbLTE6zkB-eGPs,AQACAAE";
+       private static final String UPDATE_KEY = "USK@1waTsw46L9-JEQ8yX1khjkfHcn--g0MlMsTlYHax9zQ,oYyxr5jyFnaTsVGDQWk9e3ddOWGKnqEASxAk08MHT2Y,AQACAAE";
 
        /** Object used for synchronization. */
        private final Object syncObject = new Object();

diff --git a/src/main/java/de/todesbaum/jsite/main/Main.java b/src/main/java/de/todesbaum/jsite/main/Main.java
index 0e2d546..59a3116 100644 (file)
--- a/src/main/java/de/todesbaum/jsite/main/Main.java
+++ b/src/main/java/de/todesbaum/jsite/main/Main.java
@@ -80,7 +80,7 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
        private static final Logger logger = Logger.getLogger(Main.class.getName());
 
        /** The version. */
-       private static final Version VERSION = new Version(0, 11, 1);
+       private static final Version VERSION = new Version(0, 12);
 
        /** The configuration. */
        private Configuration configuration;