=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/DataApprovalException.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/DataApprovalException.java	2014-10-13 02:43:41 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/DataApprovalException.java	2014-10-25 10:30:49 +0000
@@ -30,13 +30,10 @@
 
 /**
  * @author Jim Grace
- * @version $Id$
  */
 public abstract class DataApprovalException
-        extends RuntimeException
+    extends RuntimeException
 {
-    private static final long serialVersionUID = -5506344977983711195L;
-
     public DataApprovalException()
     {
         super();

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/DataMayNotBeAcceptedException.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/DataMayNotBeAcceptedException.java	2014-10-13 02:43:41 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/DataMayNotBeAcceptedException.java	2014-10-25 10:30:49 +0000
@@ -30,13 +30,10 @@
 
 /**
  * @author Jim Grace
- * @version $Id$
  */
 public class DataMayNotBeAcceptedException
-        extends DataApprovalException
+    extends DataApprovalException
 {
-    private static final long serialVersionUID = 2765006990627122000L;
-
     public DataMayNotBeAcceptedException()
     {
         super();

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/DataMayNotBeApprovedException.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/DataMayNotBeApprovedException.java	2014-10-13 02:43:41 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/DataMayNotBeApprovedException.java	2014-10-25 10:30:49 +0000
@@ -30,13 +30,10 @@
 
 /**
  * @author Jim Grace
- * @version $Id$
  */
 public class DataMayNotBeApprovedException
         extends DataApprovalException
 {
-    private static final long serialVersionUID = 2765006990627122000L;
-
     public DataMayNotBeApprovedException()
     {
         super();

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/DataMayNotBeUnacceptedException.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/DataMayNotBeUnacceptedException.java	2014-10-13 02:43:41 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/DataMayNotBeUnacceptedException.java	2014-10-25 10:30:49 +0000
@@ -30,13 +30,10 @@
 
 /**
  * @author Jim Grace
- * @version $Id$
  */
 public class DataMayNotBeUnacceptedException
-        extends DataApprovalException
+    extends DataApprovalException
 {
-    private static final long serialVersionUID = 2765006990627122000L;
-
     public DataMayNotBeUnacceptedException()
     {
         super();

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/DataMayNotBeUnapprovedException.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/DataMayNotBeUnapprovedException.java	2014-10-13 02:43:41 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/DataMayNotBeUnapprovedException.java	2014-10-25 10:30:49 +0000
@@ -30,13 +30,10 @@
 
 /**
  * @author Jim Grace
- * @version $Id$
  */
 public class DataMayNotBeUnapprovedException
-        extends DataApprovalException
+    extends DataApprovalException
 {
-    private static final long serialVersionUID = 2765006990627122000L;
-
     public DataMayNotBeUnapprovedException()
     {
         super();

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/DataSetNotMarkedForApprovalException.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/DataSetNotMarkedForApprovalException.java	2014-10-13 02:43:41 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/DataSetNotMarkedForApprovalException.java	2014-10-25 10:30:49 +0000
@@ -32,13 +32,10 @@
 
 /**
  * @author Jim Grace
- * @version $Id$
  */
 public class DataSetNotMarkedForApprovalException
-        extends DataApprovalException
+    extends DataApprovalException
 {
-    private static final long serialVersionUID = 6661288395024958390L;
-
     public DataSetNotMarkedForApprovalException()
     {
         super();

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/NoAttributeOptionsFoundInGroupsException.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/NoAttributeOptionsFoundInGroupsException.java	2014-10-13 02:43:41 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/NoAttributeOptionsFoundInGroupsException.java	2014-10-25 10:30:49 +0000
@@ -32,13 +32,10 @@
 
 /**
  * @author Jim Grace
- * @version $Id$
  */
 public class NoAttributeOptionsFoundInGroupsException
-        extends DataApprovalException
+    extends DataApprovalException
 {
-    private static final long serialVersionUID = -781185389702703948L;
-
     public NoAttributeOptionsFoundInGroupsException()
     {
         super();

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/PeriodShorterThanDataSetPeriodException.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/PeriodShorterThanDataSetPeriodException.java	2014-10-13 02:43:41 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/PeriodShorterThanDataSetPeriodException.java	2014-10-25 10:30:49 +0000
@@ -32,13 +32,10 @@
 
 /**
  * @author Jim Grace
- * @version $Id$
  */
 public class PeriodShorterThanDataSetPeriodException
-        extends DataApprovalException
+    extends DataApprovalException
 {
-    private static final long serialVersionUID = -6211422929151909772L;
-
     public PeriodShorterThanDataSetPeriodException()
     {
         super();

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/UserCannotAccessApprovalLevelException.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/UserCannotAccessApprovalLevelException.java	2014-10-13 02:43:41 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/UserCannotAccessApprovalLevelException.java	2014-10-25 10:30:49 +0000
@@ -32,13 +32,10 @@
 
 /**
  * @author Jim Grace
- * @version $Id$
  */
 public class UserCannotAccessApprovalLevelException
-        extends DataApprovalException
+    extends DataApprovalException
 {
-    private static final long serialVersionUID = -571500237431167490L;
-
     public UserCannotAccessApprovalLevelException()
     {
         super();

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/UserCannotApproveAttributeComboException.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/UserCannotApproveAttributeComboException.java	2014-10-13 02:43:41 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/UserCannotApproveAttributeComboException.java	2014-10-25 10:30:49 +0000
@@ -32,13 +32,10 @@
 
 /**
  * @author Jim Grace
- * @version $Id$
  */
 public class UserCannotApproveAttributeComboException
-        extends DataApprovalException
+    extends DataApprovalException
 {
-    private static final long serialVersionUID = 4733220902600832778L;
-
     public UserCannotApproveAttributeComboException()
     {
         super();

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/UserMayNotAcceptDataException.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/UserMayNotAcceptDataException.java	2014-10-13 02:43:41 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/UserMayNotAcceptDataException.java	2014-10-25 10:30:49 +0000
@@ -30,13 +30,10 @@
 
 /**
  * @author Jim Grace
- * @version $Id$
  */
 public class UserMayNotAcceptDataException
-        extends DataApprovalException
+    extends DataApprovalException
 {
-    private static final long serialVersionUID = 2765006990627122000L;
-
     public UserMayNotAcceptDataException()
     {
         super();

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/UserMayNotApproveDataException.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/UserMayNotApproveDataException.java	2014-10-13 02:43:41 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/UserMayNotApproveDataException.java	2014-10-25 10:30:49 +0000
@@ -32,13 +32,10 @@
 
 /**
  * @author Jim Grace
- * @version $Id$
  */
 public class UserMayNotApproveDataException
-        extends DataApprovalException
+    extends DataApprovalException
 {
-    private static final long serialVersionUID = 2765006990627122000L;
-
     public UserMayNotApproveDataException()
     {
         super();

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/UserMayNotUnacceptDataException.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/UserMayNotUnacceptDataException.java	2014-10-13 02:43:41 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/UserMayNotUnacceptDataException.java	2014-10-25 10:30:49 +0000
@@ -30,13 +30,10 @@
 
 /**
  * @author Jim Grace
- * @version $Id$
  */
 public class UserMayNotUnacceptDataException
-        extends DataApprovalException
+    extends DataApprovalException
 {
-    private static final long serialVersionUID = 2765006990627122000L;
-
     public UserMayNotUnacceptDataException()
     {
         super();

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/UserMayNotUnapproveDataException.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/UserMayNotUnapproveDataException.java	2014-10-13 02:43:41 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/UserMayNotUnapproveDataException.java	2014-10-25 10:30:49 +0000
@@ -30,13 +30,10 @@
 
 /**
  * @author Jim Grace
- * @version $Id$
  */
 public class UserMayNotUnapproveDataException
-        extends DataApprovalException
+    extends DataApprovalException
 {
-    private static final long serialVersionUID = 2765006990627122000L;
-
     public UserMayNotUnapproveDataException()
     {
         super();