From 88886e7011161b00ea29f64968a31dc36c8dc64b Mon Sep 17 00:00:00 2001 From: mozzy11 Date: Tue, 19 Nov 2024 18:18:04 +0300 Subject: [PATCH 1/2] maven should pull data export jar from UW digi remote repo --- .gitpod.yml | 2 +- README.md | 12 ++---------- pom.xml | 5 +++++ 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.gitpod.yml b/.gitpod.yml index 214c572a33..0f9a0a65b1 100644 --- a/.gitpod.yml +++ b/.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 diff --git a/README.md b/README.md index d1e0bdc035..9ac27058fe 100644 --- a/README.md +++ b/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 diff --git a/pom.xml b/pom.xml index 6af06f581c..9d9b1a2040 100644 --- a/pom.xml +++ b/pom.xml @@ -570,6 +570,11 @@ shibboleth https://build.shibboleth.net/maven/releases/ + + uwdigi-repo-central + DIGI Public Repository + https://packages.uwdigi.org/artifactory/public + OpenELIS-Global From 6692b73acc49233b2f00b8f08b6632035f31c9bd Mon Sep 17 00:00:00 2001 From: mozzy11 Date: Tue, 19 Nov 2024 18:23:34 +0300 Subject: [PATCH 2/2] format --- pom.xml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 9d9b1a2040..1e161c9daa 100644 --- a/pom.xml +++ b/pom.xml @@ -563,19 +563,20 @@ - jaspersoft-third-party - https://jaspersoft.jfrog.io/jaspersoft/third-party-ce-artifacts/ + jaspersoft-third-party + https://jaspersoft.jfrog.io/jaspersoft/third-party-ce-artifacts/ - shibboleth - https://build.shibboleth.net/maven/releases/ + shibboleth + + https://build.shibboleth.net/maven/releases/ - uwdigi-repo-central - DIGI Public Repository - https://packages.uwdigi.org/artifactory/public - - + uwdigi-repo-central + DIGI Public Repository + https://packages.uwdigi.org/artifactory/public + + OpenELIS-Global