domain socket support foldin

salesforce · Dec 2, 2023 · 13822b4 · 13822b4
1 parent 7702f93
commit 13822b4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 50 deletions.
diff --git a/domain-epoll/pom.xml b/domain-epoll/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.salesforce.apollo</groupId>
@@ -8,13 +9,12 @@
     <artifactId>domain-epoll</artifactId>
     <name>Domain EPoll</name>
     <description>Linux Unix Domain Socket Support</description>
-    
+
     <dependencies>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-transport-native-epoll</artifactId>
             <version>${netty.version}</version>
-            <classifier>${os.detected.classifier}</classifier>
         </dependency>
     </dependencies>
-</project>
+</project>
diff --git a/domain-kqueue/pom.xml b/domain-kqueue/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.salesforce.apollo</groupId>
@@ -14,7 +15,6 @@
             <groupId>io.netty</groupId>
             <artifactId>netty-transport-native-kqueue</artifactId>
             <version>${netty.version}</version>
-            <classifier>${os.detected.classifier}</classifier>
         </dependency>
     </dependencies>
-</project>
+</project>
diff --git a/pom.xml b/pom.xml
@@ -28,6 +28,8 @@
         <module>gorgoneion</module>
         <module>gorgoneion-client</module>
         <module>cryptography</module>
+        <module>domain-epoll</module>
+        <module>domain-kqueue</module>
     </modules>
 
     <properties>
@@ -596,49 +598,6 @@
             </snapshots>
         </pluginRepository>
     </pluginRepositories>
-    <profiles>
-        <profile>
-            <id>pre</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <modules>
-                <module>h2-deterministic</module>
-            </modules>
-        </profile>
-        <profile>
-            <id>isolates</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <modules>
-                <module>isolates</module>
-                <module>isolate-ftesting</module>
-            </modules>
-        </profile>
-        <profile>
-            <id>mac-domain</id>
-            <activation>
-                <os>
-                    <family>mac</family>
-                </os>
-            </activation>
-            <modules>
-                <module>domain-kqueue</module>
-            </modules>
-        </profile>
-        <profile>
-            <id>linux-domain</id>
-            <activation>
-                <os>
-                    <name>linux</name>
-                </os>
-            </activation>
-            <modules>
-                <module>domain-epoll</module>
-            </modules>
-        </profile>
-    </profiles>
     <build>
         <extensions>
             <extension>