From f78ad2c3710e713c1c8e23e4d28ea1b7915bc91d Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Wed, 10 Nov 2010 15:51:04 +0000
Subject: 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
---
 BKUApplet/pom.xml                                              |  4 ++--
 BKUAppletExt/pom.xml                                           |  4 ++--
 BKUCertificates/pom.xml                                        |  2 +-
 BKUCommonGUI/pom.xml                                           |  4 ++--
 BKUFonts/pom.xml                                               |  2 +-
 BKUGuiExt/pom.xml                                              |  4 ++--
 BKUHelp/pom.xml                                                |  4 ++--
 BKULocal/pom.xml                                               |  4 ++--
 BKUOnline/pom.xml                                              |  4 ++--
 BKUViewer/pom.xml                                              |  4 ++--
 BKUWebStart/pom.xml                                            |  4 ++--
 .../src/main/java/at/gv/egiz/bku/webstart/Configurator.java    |  2 +-
 .../test/java/at/gv/egiz/bku/webstart/ConfiguratorTest.java    |  6 ++++++
 STAL/pom.xml                                                   |  4 ++--
 STALExt/pom.xml                                                |  4 ++--
 STALService/pom.xml                                            |  4 ++--
 STALXService/pom.xml                                           |  4 ++--
 bkucommon/pom.xml                                              |  4 ++--
 nbactions.xml                                                  | 10 ++++++++++
 pom.xml                                                        |  8 ++++----
 smcc/pom.xml                                                   |  4 ++--
 smccSTAL/pom.xml                                               |  4 ++--
 smccSTALExt/pom.xml                                            |  4 ++--
 utils/pom.xml                                                  |  4 ++--
 24 files changed, 59 insertions(+), 43 deletions(-)

diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index 7fb34d56..e000f0cd 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -2,13 +2,13 @@
   <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>BKUApplet</artifactId>
   <name>BKU Applet</name>
-  <version>1.3.3</version>
+  <version>1.3.3-SNAPSHOT</version>
   <description>Java Applet used by MOCCA Online</description>
   <build>
     <plugins>
diff --git a/BKUAppletExt/pom.xml b/BKUAppletExt/pom.xml
index b691e054..2add0cff 100644
--- a/BKUAppletExt/pom.xml
+++ b/BKUAppletExt/pom.xml
@@ -2,13 +2,13 @@
     <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>BKUAppletExt</artifactId>
     <name>BKU Applet Ext</name>
-    <version>1.3.3</version>
+    <version>1.3.3-SNAPSHOT</version>
     <description>Card management extension for Java Applet used by MOCCA Online</description>
     <build>
       <plugins>
diff --git a/BKUCertificates/pom.xml b/BKUCertificates/pom.xml
index 07d65208..c5fc4acf 100644
--- a/BKUCertificates/pom.xml
+++ b/BKUCertificates/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>mocca</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.3.3</version>
+    <version>1.3.3-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUCertificates</artifactId>
diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml
index 3ea0c708..a1fa94ee 100644
--- a/BKUCommonGUI/pom.xml
+++ b/BKUCommonGUI/pom.xml
@@ -2,13 +2,13 @@
     <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>BKUCommonGUI</artifactId>
     <name>BKU Common GUI</name>
-    <version>1.3.3</version>
+    <version>1.3.3-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>at.gv.egiz</groupId>
diff --git a/BKUFonts/pom.xml b/BKUFonts/pom.xml
index eca54854..c7552e29 100644
--- a/BKUFonts/pom.xml
+++ b/BKUFonts/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>mocca</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.3.3</version>
+    <version>1.3.3-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUFonts</artifactId>
diff --git a/BKUGuiExt/pom.xml b/BKUGuiExt/pom.xml
index 11a5514d..4721c223 100644
--- a/BKUGuiExt/pom.xml
+++ b/BKUGuiExt/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>mocca</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.3.3</version>
+    <version>1.3.3-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUGuiExt</artifactId>
-  <version>1.3.3</version>
+  <version>1.3.3-SNAPSHOT</version>
   <name>BKU GUI Ext</name>
   <description>Common BKU GUI functionality extension for card managment</description>
   <dependencies>
diff --git a/BKUHelp/pom.xml b/BKUHelp/pom.xml
index 5f244e62..f1a605d5 100644
--- a/BKUHelp/pom.xml
+++ b/BKUHelp/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>mocca</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.3.3</version>
+    <version>1.3.3-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUHelp</artifactId>
-  <version>1.3.3</version>
+  <version>1.3.3-SNAPSHOT</version>
   <name>BKU Help</name>
   <build>
     <resources>
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index ea7c8e50..77c16753 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/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>BKULocal</artifactId>
 	<packaging>war</packaging>
 	<name>BKU Local</name>
-	<version>1.3.3</version>
+	<version>1.3.3-SNAPSHOT</version>
 
 	<description>MOCCA Local</description>
 	<build>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index 5e88ba28..5be37e50 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -3,14 +3,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>BKUOnline</artifactId>
   <packaging>war</packaging>
   <name>MOCCA Online</name>
-  <version>1.3.3</version>
+  <version>1.3.3-SNAPSHOT</version>
 
   <pluginRepositories>
     <pluginRepository>
diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml
index 3fa41cc0..834a35d7 100644
--- a/BKUViewer/pom.xml
+++ b/BKUViewer/pom.xml
@@ -2,13 +2,13 @@
 	<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>BKUViewer</artifactId>
 	<name>BKU Viewer</name>
-	<version>1.3.3</version>
+	<version>1.3.3-SNAPSHOT</version>
 	<description>Validator for plain text and XHTML to-be signed content</description>
 	<dependencies>
 		<dependency>
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;
diff --git a/STAL/pom.xml b/STAL/pom.xml
index 3d2c6e02..b231b772 100644
--- a/STAL/pom.xml
+++ b/STAL/pom.xml
@@ -3,13 +3,13 @@
     <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>STAL</artifactId>
     <name>STAL</name>
-    <version>1.3.3</version>
+    <version>1.3.3-SNAPSHOT</version>
     <dependencies>
     </dependencies>
     <description>Security Token Access Layer</description>
diff --git a/STALExt/pom.xml b/STALExt/pom.xml
index a5a7c5f2..7a479605 100644
--- a/STALExt/pom.xml
+++ b/STALExt/pom.xml
@@ -2,13 +2,13 @@
   <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>STALExt</artifactId>
   <name>STAL Ext</name>
-  <version>1.3.3</version>
+  <version>1.3.3-SNAPSHOT</version>
   <description>STAL extensions for card management</description>
   <dependencies>
     <dependency>
diff --git a/STALService/pom.xml b/STALService/pom.xml
index 0d7263df..859f754c 100644
--- a/STALService/pom.xml
+++ b/STALService/pom.xml
@@ -3,13 +3,13 @@
     <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>STALService</artifactId>
     <name>STAL Service</name>
-    <version>1.3.3</version>
+    <version>1.3.3-SNAPSHOT</version>
     <description>STAL webservice interface</description>
     <dependencies>
         <dependency>
diff --git a/STALXService/pom.xml b/STALXService/pom.xml
index d7f2f101..50dc8de6 100644
--- a/STALXService/pom.xml
+++ b/STALXService/pom.xml
@@ -2,13 +2,13 @@
   <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>STALXService</artifactId>
   <name>STAL Ext Service</name>
-  <version>1.3.3</version>
+  <version>1.3.3-SNAPSHOT</version>
   <description>STAL extension webservice interface</description>
   <dependencies>
     <dependency>
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index cd68de4d..801d56cc 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,13 +3,13 @@
 	<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>bkucommon</artifactId>
 	<name>BKU Common</name>
-	<version>1.3.3</version>
+	<version>1.3.3-SNAPSHOT</version>
 
 	<build>
 		<plugins>
diff --git a/nbactions.xml b/nbactions.xml
index 8e96c5d7..e004a555 100644
--- a/nbactions.xml
+++ b/nbactions.xml
@@ -24,4 +24,14 @@
                 <goal>release:rollback</goal>
             </goals>
         </action>
+        <action>
+            <actionName>CUSTOM-release (clemenso)</actionName>
+            <displayName>release (clemenso)</displayName>
+            <goals>
+                <goal>release:prepare</goal>
+            </goals>
+            <properties>
+                <username>clemenso</username>
+            </properties>
+        </action>
     </actions>
diff --git a/pom.xml b/pom.xml
index 22112747..4d01fe75 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>at.gv.egiz</groupId>
   <artifactId>mocca</artifactId>
   <packaging>pom</packaging>
-  <version>1.3.3</version>
+  <version>1.3.3-SNAPSHOT</version>
   <name>MOCCA</name>
   <description>MOCCA (Modular Open Citizen Card Architecture) project</description>
   <url>http://mocca.egovlabs.gv.at</url>
@@ -47,9 +47,9 @@
     </developer>
   </developers>
   <scm>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.3.3</connection>
-    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.3.3</developerConnection>
-    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.3.3</url>
+    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
+    <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
+    <url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
   </scm>
   <organization>
     <name>E-Government Innovation Center (EGIZ)</name>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index 451c0c75..6f0b1ae1 100644
--- a/smcc/pom.xml
+++ b/smcc/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>smcc</artifactId>
   <name>smcc</name>
   <packaging>jar</packaging>
-  <version>1.3.3</version>
+  <version>1.3.3-SNAPSHOT</version>
   <description>Smart card communication</description>
   <build>
 		<plugins>
diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml
index 3a25caaf..e4123518 100644
--- a/smccSTAL/pom.xml
+++ b/smccSTAL/pom.xml
@@ -2,13 +2,13 @@
     <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>smccSTAL</artifactId>
     <name>smcc STAL</name>
-    <version>1.3.3</version>
+    <version>1.3.3-SNAPSHOT</version>
     <description>STAL implementation for smart cards using smcc</description>
     <build>
 	    <plugins>
diff --git a/smccSTALExt/pom.xml b/smccSTALExt/pom.xml
index c7dc7f3c..4b851844 100644
--- a/smccSTALExt/pom.xml
+++ b/smccSTALExt/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>mocca</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.3.3</version>
+    <version>1.3.3-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>smccSTALExt</artifactId>
-  <version>1.3.3</version>
+  <version>1.3.3-SNAPSHOT</version>
   <name>smcc STAL Ext</name>
   <description>STAL Ext implementation for smart cards using smcc</description>
   <dependencies>
diff --git a/utils/pom.xml b/utils/pom.xml
index de1c327d..25620caf 100644
--- a/utils/pom.xml
+++ b/utils/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>utils</artifactId>
 	<name>Utils</name>
 	<packaging>jar</packaging>
-	<version>1.3.3</version>
+	<version>1.3.3-SNAPSHOT</version>
 	<description>Utilities</description>
 	<dependencies>
 		<dependency>
-- 
cgit v1.2.3