Skip to content

Commit 9d1c280

Browse files
authored
Merge pull request #1317 from mozzy11/develop
Maven Build should pull Data export library jar from remote UW digi repo
2 parents 45b91e6 + e9c51e8 commit 9d1c280

File tree

3 files changed

+14
-16
lines changed

3 files changed

+14
-16
lines changed

.gitpod.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
tasks:
88
- name: Build the Dependencies and Start the docker containers
9-
init: cd dataexport && mvn clean install -DskipTests && cd .. && mvn clean install && cd frontend && npm install && cd ..
9+
init: mvn clean install && cd frontend && npm install && cd ..
1010
command: docker-compose -f dev.docker-compose.yml up -d
1111

1212

README.md

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,19 +50,11 @@ see [OpenELIS-Docker setup](https://github.com/I-TECH-UW/openelis-docker)
5050

5151
git clone https://github.com/username/OpenELIS-Global-2.git
5252

53-
2. innitialize and build sub modules
53+
1. Build the War file
5454

55-
cd OpenELIS-Global-2
56-
git submodule update --init --recursive
57-
cd dataexport
58-
mvn clean install -DskipTests
59-
60-
3. Build the War file
61-
62-
cd ..
6355
mvn clean install -DskipTests
6456

65-
4. Start the containers to mount the locally compiled artifacts
57+
1. Start the containers to mount the locally compiled artifacts
6658

6759
docker-compose -f dev.docker-compose.yml up -d
6860

pom.xml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -563,14 +563,20 @@
563563
</dependencies>
564564
<repositories>
565565
<repository>
566-
<id>jaspersoft-third-party</id>
567-
<url>https://jaspersoft.jfrog.io/jaspersoft/third-party-ce-artifacts/</url>
566+
<id>jaspersoft-third-party</id>
567+
<url>https://jaspersoft.jfrog.io/jaspersoft/third-party-ce-artifacts/</url>
568568
</repository>
569569
<repository>
570-
<id>shibboleth</id> <!-- openSaml-->
571-
<url>https://build.shibboleth.net/maven/releases/</url>
570+
<id>shibboleth</id>
571+
<!-- openSaml-->
572+
<url>https://build.shibboleth.net/maven/releases/</url>
572573
</repository>
573-
</repositories>
574+
<repository>
575+
<id>uwdigi-repo-central</id>
576+
<name>DIGI Public Repository</name>
577+
<url>https://packages.uwdigi.org/artifactory/public</url>
578+
</repository>
579+
</repositories>
574580
<build>
575581
<finalName>OpenELIS-Global</finalName>
576582
<resources>

0 commit comments

Comments
 (0)