HDDS-10496. Fetch dependencies using actual build

adoroszlai · Mar 9, 2024 · bd8bd36 · bd8bd36
1 parent bf91862
commit bd8bd36
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 1 deletion.
diff --git a/.github/workflows/populate-cache.yml b/.github/workflows/populate-cache.yml
@@ -54,7 +54,7 @@ jobs:
 
       - name: Fetch dependencies
         if: steps.restore-cache.outputs.cache-hit != 'true'
-        run: mvn --batch-mode --fail-never --no-transfer-progress --show-version dependency:go-offline
+        run: mvn --batch-mode --fail-never --no-transfer-progress --show-version -Pgo-offline -Pdist clean verify
 
       - name: Delete Ozone jars from repo
         if: steps.restore-cache.outputs.cache-hit != 'true'

diff --git a/hadoop-ozone/ozonefs-hadoop2/pom.xml b/hadoop-ozone/ozonefs-hadoop2/pom.xml
@@ -123,6 +123,7 @@
               <goal>unpack</goal>
             </goals>
             <configuration>
+              <skip>${maven.shade.skip}</skip>
               <excludes>META-INF/versions/**/*.*</excludes>
               <artifactItems>
                 <artifactItem>

diff --git a/hadoop-ozone/ozonefs-hadoop3-client/pom.xml b/hadoop-ozone/ozonefs-hadoop3-client/pom.xml
@@ -54,6 +54,7 @@
               <goal>unpack</goal>
             </goals>
             <configuration>
+              <skip>${maven.shade.skip}</skip>
               <excludes>META-INF/versions/**/*.*</excludes>
               <artifactItems>
                 <artifactItem>
@@ -77,6 +78,7 @@
               <goal>shade</goal>
             </goals>
             <configuration>
+              <skip>${maven.shade.skip}</skip>
               <transformers>
                 <transformer
                         implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">

diff --git a/hadoop-ozone/ozonefs-hadoop3/pom.xml b/hadoop-ozone/ozonefs-hadoop3/pom.xml
@@ -74,6 +74,7 @@
               <goal>unpack</goal>
             </goals>
             <configuration>
+              <skip>${maven.shade.skip}</skip>
               <excludes>META-INF/versions/**/*.*</excludes>
               <artifactItems>
                 <artifactItem>

diff --git a/hadoop-ozone/ozonefs-shaded/pom.xml b/hadoop-ozone/ozonefs-shaded/pom.xml
@@ -91,6 +91,7 @@
               <goal>shade</goal>
             </goals>
             <configuration>
+              <skip>${maven.shade.skip}</skip>
               <transformers>
                 <transformer
                         implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">

diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml
@@ -406,6 +406,13 @@
         <module>ozonefs-hadoop3-client</module>
       </modules>
     </profile>
+    <profile>
+      <id>go-offline</id>
+      <modules>
+        <module>ozonefs-shaded</module>
+        <module>ozonefs-hadoop2</module>
+      </modules>
+    </profile>
     <profile>
       <id>build-with-recon</id>
       <activation>

diff --git a/pom.xml b/pom.xml
@@ -2245,6 +2245,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>go-offline</id>
+      <properties>
+        <test>void</test>
+        <skip.npx>true</skip.npx>
+        <skip.installnpx>true</skip.installnpx>
+        <skipDocs>true</skipDocs>
+        <maven.javadoc.skip>true</maven.javadoc.skip>
+        <maven.shade.skip>true</maven.shade.skip>
+      </properties>
+    </profile>
     <profile>
       <id>client</id>
       <build>