Merge pull request #1480 from mozzy11/develop

uncomment dataexport mvn build as https://packages.uwdigi.org/ artifactory is down
I-TECH-UW · Jan 31, 2025 · 7e528c4 · 7e528c4
2 parents f6c4d7c + fb0486e
commit 7e528c4
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 29 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -31,11 +31,11 @@ jobs:
       - name: check formatting
         run: mvn spotless:check
 
-      # - name: Initialize and build submodules
-      #   run: |
-      #     cd dataexport
-      #     mvn clean install  
-      #     cd ..
+      - name: Initialize and build submodules
+        run: |
+          cd dataexport
+          mvn clean install  
+          cd ..
 
       - name: Build OpenELIS-Global2
         run: mvn clean install -Dspotless.check.skip=true

diff --git a/Dockerfile b/Dockerfile
@@ -20,17 +20,17 @@ RUN ./install/createDefaultPassword.sh -c -p ${DEFAULT_PW}
 ##
 # Build DataExport
 #
-# COPY ./dataexport /build/dataexport
-# WORKDIR /build/dataexport/dataexport-core
-# RUN --mount=type=cache,target=/root/.m2,sharing=locked \
-#     mvn dependency:go-offline 
-# RUN --mount=type=cache,target=/root/.m2,sharing=locked \
-#     mvn clean install -DskipTests
-# WORKDIR /build/dataexport/
-# RUN --mount=type=cache,target=/root/.m2,sharing=locked \
-#     mvn dependency:go-offline 
-# RUN --mount=type=cache,target=/root/.m2,sharing=locked \
-#     mvn clean install -DskipTests
+COPY ./dataexport /build/dataexport
+WORKDIR /build/dataexport/dataexport-core
+RUN --mount=type=cache,target=/root/.m2,sharing=locked \
+    mvn dependency:go-offline 
+RUN --mount=type=cache,target=/root/.m2,sharing=locked \
+    mvn clean install -DskipTests
+WORKDIR /build/dataexport/
+RUN --mount=type=cache,target=/root/.m2,sharing=locked \
+    mvn dependency:go-offline 
+RUN --mount=type=cache,target=/root/.m2,sharing=locked \
+    mvn clean install -DskipTests
 
 ##
 # Build the Project

diff --git a/Dockerfile.dev b/Dockerfile.dev
@@ -16,7 +16,7 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
 ADD ./pom.xml /build/pom.xml
 ADD ./tools /build/tools
 ADD ./src /build/src
-# ADD ./dataexport /build/dataexport
+ADD ./dataexport /build/dataexport
 
 WORKDIR /build
 
@@ -28,16 +28,16 @@ RUN ./install/createDefaultPassword.sh -c -p ${DEFAULT_PW}
 ##
 # Build DataExport
 #
-# WORKDIR /build/dataexport/dataexport-core
-# RUN --mount=type=cache,target=/root/.m2,sharing=locked \
-#     mvn dependency:go-offline 
-# RUN --mount=type=cache,target=/root/.m2,sharing=locked \
-#     mvn clean install -DskipTests
-# WORKDIR /build/dataexport/
-# RUN --mount=type=cache,target=/root/.m2,sharing=locked \
-#     mvn dependency:go-offline 
-# RUN --mount=type=cache,target=/root/.m2,sharing=locked \
-#     mvn clean install -DskipTests
+WORKDIR /build/dataexport/dataexport-core
+RUN --mount=type=cache,target=/root/.m2,sharing=locked \
+    mvn dependency:go-offline 
+RUN --mount=type=cache,target=/root/.m2,sharing=locked \
+    mvn clean install -DskipTests
+WORKDIR /build/dataexport/
+RUN --mount=type=cache,target=/root/.m2,sharing=locked \
+    mvn dependency:go-offline 
+RUN --mount=type=cache,target=/root/.m2,sharing=locked \
+    mvn clean install -DskipTests
 
 ##
 # Build the Project

diff --git a/README.md b/README.md
@@ -50,6 +50,13 @@ see [OpenELIS-Docker setup](https://github.com/I-TECH-UW/openelis-docker)
 
          git clone https://github.com/username/OpenELIS-Global-2.git
 
+1.  innitialize and build sub modules
+
+        cd OpenELIS-Global-2
+        git submodule update --init --recursive
+        cd dataexport
+        mvn clean install -DskipTests
+
 1.  Build the War file
 
           mvn clean install -DskipTests

diff --git a/pom.xml b/pom.xml
@@ -582,11 +582,11 @@
         <!-- openSaml-->
         <url>https://build.shibboleth.net/maven/releases/</url>
     </repository>
-    <repository>
+    <!-- <repository>
         <id>uwdigi-repo-central</id>
         <name>DIGI Public Repository</name>
         <url>https://packages.uwdigi.org/artifactory/public</url>
-    </repository>
+    </repository> -->
 </repositories>
   <build>
     <finalName>OpenELIS-Global</finalName>