summaryrefslogtreecommitdiff
path: root/BKUWebStart
diff options
context:
space:
mode:
authorclemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2010-11-10 15:51:04 +0000
committerclemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2010-11-10 15:51:04 +0000
commitf78ad2c3710e713c1c8e23e4d28ea1b7915bc91d (patch)
treebd38c493adb438c1aa315db074da145a546433df /BKUWebStart
parent25244de6efda22932da865a28930f7cad161e2c0 (diff)
downloadmocca-f78ad2c3710e713c1c8e23e4d28ea1b7915bc91d.tar.gz
mocca-f78ad2c3710e713c1c8e23e4d28ea1b7915bc91d.tar.bz2
mocca-f78ad2c3710e713c1c8e23e4d28ea1b7915bc91d.zip
manually rollback release (failed to tag, due to
- username not passed to svn tunnel command (-Dusername) - mismatching src and dst repository (adding ssh -l clemenso to .subversion/config) ensure MOCCA Webstart config update: add missing min config version git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@832 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
Diffstat (limited to 'BKUWebStart')
-rw-r--r--BKUWebStart/pom.xml4
-rw-r--r--BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Configurator.java2
-rw-r--r--BKUWebStart/src/test/java/at/gv/egiz/bku/webstart/ConfiguratorTest.java6
3 files changed, 9 insertions, 3 deletions
diff --git a/BKUWebStart/pom.xml b/BKUWebStart/pom.xml
index 40fb9f13..72189c99 100644
--- a/BKUWebStart/pom.xml
+++ b/BKUWebStart/pom.xml
@@ -2,14 +2,14 @@
<parent>
<artifactId>mocca</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.3.3</version>
+ <version>1.3.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>at.gv.egiz</groupId>
<artifactId>BKUWebStart</artifactId>
<packaging>jar</packaging>
<name>MOCCA Webstart</name>
- <version>1.3.3</version>
+ <version>1.3.3-SNAPSHOT</version>
<url>http://mocca.egovlabs.gv.at/</url>
<description>Bürgerkartenumgebung</description>
diff --git a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Configurator.java b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Configurator.java
index 30662ee0..25df7ec2 100644
--- a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Configurator.java
+++ b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Configurator.java
@@ -59,7 +59,7 @@ public class Configurator {
* configurations with less than this (major) version will be backuped and updated
* allowed: MAJOR[.MINOR[.X[-SNAPSHOT]]]
*/
- public static final String MIN_CONFIG_VERSION = "1.2.11-SNAPSHOT";
+ public static final String MIN_CONFIG_VERSION = "1.3.3";
public static final String CONFIG_DIR = ".mocca/conf/";
public static final String CERTS_DIR = ".mocca/certs/";
public static final String VERSION_FILE = ".version";
diff --git a/BKUWebStart/src/test/java/at/gv/egiz/bku/webstart/ConfiguratorTest.java b/BKUWebStart/src/test/java/at/gv/egiz/bku/webstart/ConfiguratorTest.java
index 3700212d..12b17a44 100644
--- a/BKUWebStart/src/test/java/at/gv/egiz/bku/webstart/ConfiguratorTest.java
+++ b/BKUWebStart/src/test/java/at/gv/egiz/bku/webstart/ConfiguratorTest.java
@@ -170,6 +170,12 @@ public class ConfiguratorTest {
result = Configurator.updateRequired(oldVersion, minVersion);
assertEquals(expResult, result);
+ oldVersion = "1.2.13-r637";
+ minVersion = "1.3.0";
+ expResult = true;
+ result = Configurator.updateRequired(oldVersion, minVersion);
+ assertEquals(expResult, result);
+
oldVersion = "1";
minVersion = "2";
expResult = true;