=== modified file 'dhis-2/dhis-services/dhis-service-analytics/pom.xml'
--- dhis-2/dhis-services/dhis-service-analytics/pom.xml	2015-02-19 09:18:17 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/pom.xml	2015-03-05 18:41:52 +0000
@@ -37,7 +37,7 @@
     <!-- Other -->
     
     <dependency>
-      <groupId>org.nfunk</groupId>
+      <groupId>org.scijava</groupId>
       <artifactId>jep</artifactId>
     </dependency>
     <dependency>

=== modified file 'dhis-2/dhis-services/dhis-service-core/pom.xml'
--- dhis-2/dhis-services/dhis-service-core/pom.xml	2015-01-23 14:07:46 +0000
+++ dhis-2/dhis-services/dhis-service-core/pom.xml	2015-03-05 18:41:52 +0000
@@ -54,7 +54,7 @@
     <!-- Other -->
 
     <dependency>
-      <groupId>org.nfunk</groupId>
+      <groupId>org.scijava</groupId>
       <artifactId>jep</artifactId>
     </dependency>
     <dependency>

=== modified file 'dhis-2/dhis-services/dhis-service-datamart-default/pom.xml'
--- dhis-2/dhis-services/dhis-service-datamart-default/pom.xml	2015-02-19 09:18:17 +0000
+++ dhis-2/dhis-services/dhis-service-datamart-default/pom.xml	2015-03-05 18:41:52 +0000
@@ -29,7 +29,7 @@
     <!-- Other -->
     
     <dependency>
-      <groupId>org.nfunk</groupId>
+      <groupId>org.scijava</groupId>
       <artifactId>jep</artifactId>
     </dependency>
     <dependency>

=== modified file 'dhis-2/dhis-services/dhis-service-reporting/pom.xml'
--- dhis-2/dhis-services/dhis-service-reporting/pom.xml	2015-01-23 14:07:46 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/pom.xml	2015-03-05 18:41:52 +0000
@@ -87,7 +87,7 @@
     <!-- Other -->
     
     <dependency>
-      <groupId>org.nfunk</groupId>
+      <groupId>org.scijava</groupId>
       <artifactId>jep</artifactId>
     </dependency>
     <dependency>

=== modified file 'dhis-2/dhis-support/dhis-support-system/pom.xml'
--- dhis-2/dhis-support/dhis-support-system/pom.xml	2015-02-19 09:18:17 +0000
+++ dhis-2/dhis-support/dhis-support-system/pom.xml	2015-03-05 18:41:52 +0000
@@ -119,7 +119,7 @@
       <artifactId>commons-io</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.nfunk</groupId>
+      <groupId>org.scijava</groupId>
       <artifactId>jep</artifactId>
     </dependency>
     <dependency>

=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml	2015-03-04 21:41:38 +0000
+++ dhis-2/pom.xml	2015-03-05 18:41:52 +0000
@@ -64,16 +64,13 @@
       <name>UK Central</name>
       <url>http://uk.maven.org/maven2</url>
     </repository>
+    <!-- GeoTools -->
     <repository>
       <id>osgeo</id>
       <name>Open Source Geospatial Foundation Repository</name>
       <url>http://download.osgeo.org/webdav/geotools/</url>
     </repository>
-    <repository>
-      <id>freehep</id>
-      <name>FreeHEP</name>
-      <url>http://java.freehep.org/maven2</url>
-    </repository>
+    <!-- SMSLib -->
     <repository>
       <id>smslib</id>
       <name>SMSLib</name>
@@ -584,9 +581,9 @@
         <version>2.1.7</version>
       </dependency>
       <dependency>
-        <groupId>org.nfunk</groupId>
+        <groupId>org.scijava</groupId>
         <artifactId>jep</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.2</version>
       </dependency>
       <dependency>
         <groupId>junit</groupId>
@@ -602,6 +599,12 @@
         <groupId>org.amplecode</groupId>
         <artifactId>cave-process</artifactId>
         <version>1.0.3</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>joda-time</groupId>