Merge pull request #5699 from dennishendriksen/feature/rowlevelsecurity

Fix #4926 Building MOLGENIS with empty local Maven repository fails
molgenis · Dec 5, 2016 · faf998b · faf998b
2 parents 1fd059c + 64c568a
commit faf998b
Showing 4 changed files with 25 additions and 15 deletions.
diff --git a/molgenis-core-ui/package.json b/molgenis-core-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "MOLGENIS",
-  "version": "1.22.2-ROW-LEVEL-SECURITY",
+  "version": "1.22.3-ROW-LEVEL-SECURITY",
   "description": "Dependencies for the MOLGENIS UI",
   "scripts": {
     "watch": "webpack -d --watch",
@@ -80,4 +80,4 @@
       "stage-0"
     ]
   }
-}
+}
diff --git a/molgenis-das/pom.xml b/molgenis-das/pom.xml
@@ -9,15 +9,6 @@
 	<artifactId>molgenis-das</artifactId>
 	<packaging>jar</packaging>
 
-	<repositories>
-        <repository>
-            <id>google-code-mydas</id>
-            <name>google-code-mydas</name>
-            <layout>default</layout>
-            <url>http://mydas.googlecode.com/svn/repository/</url>
-        </repository>
-    </repositories>
-
 	<dependencies>
         <dependency>
         	<groupId>org.molgenis</groupId>
@@ -34,10 +25,24 @@
            	<artifactId>molgenis-data-elasticsearch</artifactId>
             <version>${project.version}</version>
         </dependency>
-		<dependency>
-		    <groupId>uk.ac.ebi.mydas</groupId>
-		    <artifactId>mydas</artifactId>
-		    <version>1.6.7</version>
+        <dependency>
+            <groupId>xmlpull</groupId>
+            <artifactId>xmlpull</artifactId>
+            <version>1.1.3.1</version>
+        </dependency>
+        <dependency>
+            <groupId>uk.ac.ebi.das</groupId>
+            <artifactId>jdas</artifactId>
+            <version>1.0.4</version>
+            <scope>system</scope>
+            <systemPath>${basedir}/src/main/resources/jdas-1.0.4.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>uk.ac.ebi.mydas</groupId>
+            <artifactId>mydas</artifactId>
+            <version>1.6.7</version>
+            <scope>system</scope>
+            <systemPath>${basedir}/src/main/resources/mydas-1.6.7.jar</systemPath>
 		    <exclusions>
 		        <exclusion>
             <groupId>junit</groupId>
@@ -73,5 +78,10 @@
 		</exclusion>
 	       	</exclusions>
 		</dependency>
+        <dependency>
+            <groupId>xpp3</groupId>
+            <artifactId>xpp3</artifactId>
+            <version>1.1.3.4.O</version>
+        </dependency>
     </dependencies>
 </project>
diff --git a/molgenis-das/src/main/resources/jdas-1.0.4.jar b/molgenis-das/src/main/resources/jdas-1.0.4.jar
diff --git a/molgenis-das/src/main/resources/mydas-1.6.7.jar b/molgenis-das/src/main/resources/mydas-1.6.7.jar