Merge branch 'develop' into DictionaryTest

.gitpod.yml

@@ -6,7 +6,7 @@
 
 tasks:
   - name: Build the Dependencies and Start the docker containers
-    init:  cd dataexport && mvn clean install -DskipTests && cd .. && mvn clean install && cd frontend && npm install && cd ..
+    init:  mvn clean install && cd frontend && npm install && cd ..
     command:  docker-compose -f dev.docker-compose.yml up -d    
 
 

README.md

@@ -50,19 +50,11 @@ see [OpenELIS-Docker setup](https://github.com/I-TECH-UW/openelis-docker)
 
          git clone https://github.com/username/OpenELIS-Global-2.git
 
-2.  innitialize and build sub modules
+1.  Build the War file
 
-        cd OpenELIS-Global-2
-        git submodule update --init --recursive
-        cd dataexport
-        mvn clean install -DskipTests
-
-3.  Build the War file
-
-          cd ..
           mvn clean install -DskipTests
 
-4.  Start the containers to mount the locally compiled artifacts
+1.  Start the containers to mount the locally compiled artifacts
 
         docker-compose -f dev.docker-compose.yml up -d
 

pom.xml

@@ -569,14 +569,20 @@
   </dependencies>
   <repositories>
     <repository>
-      <id>jaspersoft-third-party</id>
-      <url>https://jaspersoft.jfrog.io/jaspersoft/third-party-ce-artifacts/</url>
+        <id>jaspersoft-third-party</id>
+        <url>https://jaspersoft.jfrog.io/jaspersoft/third-party-ce-artifacts/</url>
     </repository>
     <repository>
-      <id>shibboleth</id> <!-- openSaml-->
-      <url>https://build.shibboleth.net/maven/releases/</url>
+        <id>shibboleth</id>
+        <!-- openSaml-->
+        <url>https://build.shibboleth.net/maven/releases/</url>
     </repository>
-  </repositories>
+    <repository>
+        <id>uwdigi-repo-central</id>
+        <name>DIGI Public Repository</name>
+        <url>https://packages.uwdigi.org/artifactory/public</url>
+    </repository>
+</repositories>
   <build>
     <finalName>OpenELIS-Global</finalName>
     <resources>