Fix broken native build caused by Cloud SQL socket factory

As per Mandrel 23.1, the native image build fails when modules depend on `com.google.cloud.sql:postgres-socket-factory`: https://github.com/DependencyTrack/hyades/actions/runs/7686438316/job/20945288653. Apparently it uses a special way to call native libraries, which is not supported. This change only includes the dependency when explicitly *not* building in native mode. Also added an IntelliJ run profile to build native executables using containers, removing the requirement of having Graal / Mandrel installed. Signed-off-by: nscuro <[email protected]>
DependencyTrack · Jan 28, 2024 · fdae576 · fdae576
1 parent 3170d4f
commit fdae576
Show file tree

Hide file tree

Showing 10 changed files with 127 additions and 37 deletions.
diff --git a/.github/workflows/_build-native-meta.yml b/.github/workflows/_build-native-meta.yml
@@ -58,7 +58,7 @@ jobs:
         fi
         echo "Including resources: ${RESOURCES_INCLUDES:-None}"
         echo "Excluding resources: ${RESOURCES_EXCLUDES:-None}"
-        mvn clean package -Pnative -pl commons,commons-kstreams,commons-persistence,proto,${{ inputs.module }} -DskipTests \
+        mvn clean package -Dnative -pl commons,commons-kstreams,commons-persistence,proto,${{ inputs.module }} -DskipTests \
           -Dquarkus.native.builder-image=quay.io/quarkus/ubi-quarkus-mandrel-builder-image:23.1-java21 \
           -Dquarkus.native.container-build=true \
           -Dquarkus.native.container-runtime-options='--platform=linux/${{ matrix.arch.name }}' \
@@ -67,7 +67,7 @@ jobs:
     - name: Test Native Image
       if: ${{ matrix.arch.name == 'amd64' }}
       run: |-
-        mvn -pl commons,commons-kstreams,commons-persistence,proto,${{ inputs.module }} test-compile failsafe:integration-test -Pnative
+        mvn -pl commons,commons-kstreams,commons-persistence,proto,${{ inputs.module }} test-compile failsafe:integration-test -Dnative
     - name: Upload Build Artifact
       uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # tag=v4.3.0
       with:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -71,8 +71,8 @@ jobs:
         github-token: ${{ secrets.GITHUB_TOKEN }}
     - name: Build Native Image
       run: |-
-        mvn -pl commons,commons-kstreams,commons-persistence,proto,${{ matrix.module }} clean install -Pnative -DskipTests
+        mvn -pl commons,commons-kstreams,commons-persistence,proto,${{ matrix.module }} clean install -Dnative -DskipTests
     - name: Test Native Image
       run: |-
         mvn -pl commons,commons-kstreams,commons-persistence,proto,${{ matrix.module }} \
-        test-compile failsafe:integration-test failsafe:verify -Pnative
+        test-compile failsafe:integration-test failsafe:verify -Dnative
diff --git a/.idea/runConfigurations/Build_Native.xml b/.idea/runConfigurations/Build_Native.xml
diff --git a/.idea/runConfigurations/Run_Native_Integration_Tests.xml b/.idea/runConfigurations/Run_Native_Integration_Tests.xml
diff --git a/commons-persistence/pom.xml b/commons-persistence/pom.xml
@@ -42,11 +42,6 @@
             <artifactId>packageurl-java</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.google.cloud.sql</groupId>
-            <artifactId>postgres-socket-factory</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>

diff --git a/mirror-service/pom.xml b/mirror-service/pom.xml
@@ -136,6 +136,11 @@
     <profiles>
         <profile>
             <id>native</id>
+            <activation>
+                <property>
+                    <name>native</name>
+                </property>
+            </activation>
             <dependencies>
                 <!--
                     Required for Apache httpclient5.
@@ -151,6 +156,10 @@
                     <version>${lib.conscrypt.version}</version>
                 </dependency>
             </dependencies>
+            <properties>
+                <skipITs>false</skipITs>
+                <quarkus.package.type>native</quarkus.package.type>
+            </properties>
         </profile>
     </profiles>
 

diff --git a/notification-publisher/pom.xml b/notification-publisher/pom.xml
@@ -99,6 +99,36 @@
     </dependency>
   </dependencies>
 
+  <profiles>
+    <profile>
+      <id>native</id>
+      <activation>
+        <property>
+          <name>native</name>
+        </property>
+      </activation>
+      <properties>
+        <skipITs>false</skipITs>
+        <quarkus.package.type>native</quarkus.package.type>
+      </properties>
+    </profile>
+
+    <profile>
+      <id>non-native</id>
+      <activation>
+        <property>
+          <name>!native</name>
+        </property>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>com.google.cloud.sql</groupId>
+          <artifactId>postgres-socket-factory</artifactId>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
+
   <build>
     <plugins>
       <plugin>

diff --git a/pom.xml b/pom.xml
@@ -488,19 +488,6 @@
   </build>
 
   <profiles>
-    <profile>
-      <id>native</id>
-      <activation>
-        <property>
-          <name>native</name>
-        </property>
-      </activation>
-      <properties>
-        <skipITs>false</skipITs>
-        <quarkus.package.type>native</quarkus.package.type>
-      </properties>
-    </profile>
-
     <profile>
       <!--
         When running in GitHub Actions, the SCM connection must be via HTTPS

diff --git a/repository-meta-analyzer/pom.xml b/repository-meta-analyzer/pom.xml
@@ -130,6 +130,36 @@
     </dependency>
   </dependencies>
 
+  <profiles>
+    <profile>
+      <id>native</id>
+      <activation>
+        <property>
+          <name>native</name>
+        </property>
+      </activation>
+      <properties>
+        <skipITs>false</skipITs>
+        <quarkus.package.type>native</quarkus.package.type>
+      </properties>
+    </profile>
+
+    <profile>
+      <id>non-native</id>
+      <activation>
+        <property>
+          <name>!native</name>
+        </property>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>com.google.cloud.sql</groupId>
+          <artifactId>postgres-socket-factory</artifactId>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
+
   <build>
     <plugins>
       <plugin>

diff --git a/vulnerability-analyzer/pom.xml b/vulnerability-analyzer/pom.xml
@@ -119,6 +119,37 @@
           <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <profiles>
+        <profile>
+            <id>native</id>
+            <activation>
+                <property>
+                    <name>native</name>
+                </property>
+            </activation>
+            <properties>
+                <skipITs>false</skipITs>
+                <quarkus.package.type>native</quarkus.package.type>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>non-native</id>
+            <activation>
+                <property>
+                    <name>!native</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>com.google.cloud.sql</groupId>
+                    <artifactId>postgres-socket-factory</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+
     <build>
         <plugins>
             <plugin>
@@ -131,12 +162,4 @@
             </plugin>
         </plugins>
     </build>
-    <profiles>
-        <profile>
-            <id>native</id>
-            <properties>
-                <quarkus.package.type>native</quarkus.package.type>
-            </properties>
-        </profile>
-    </profiles>
 </project>