Skip to content

Commit

Permalink
Provide action upon Thoth inception.
Browse files Browse the repository at this point in the history 
clean up parameters/etc
dep clean up for kq/ep madness, yet again
  • Loading branch information
@Hellblazer
Hellblazer committed Dec 4, 2023
1 parent 986e829 commit f03d054
Show file tree
Hide file tree
Showing 7 changed files with 369 additions and 246 deletions.
68 changes: 61 additions & 7 deletions memberships/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,16 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>com.salesforce.apollo</groupId>
<artifactId>domain-kqueue</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.salesforce.apollo</groupId>
<artifactId>domain-epoll</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.salesforce.apollo</groupId>
<artifactId>protocols</artifactId>
Expand All @@ -40,13 +50,10 @@
<artifactId>native-lib-loader</artifactId>
</dependency>
<dependency>
<groupId>com.salesforce.apollo</groupId>
<artifactId>domain-epoll</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.salesforce.apollo</groupId>
<artifactId>domain-kqueue</artifactId>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-unix-common</artifactId>
<version>${netty.version}</version>
<classifier>${os.detected.classifier}</classifier>
<scope>provided</scope>
</dependency>

Expand Down Expand Up @@ -77,4 +84,51 @@
<scope>test</scope>
</dependency>
</dependencies>

<build>
<extensions>
<extension>
<groupId>kr.motd.maven</groupId>
<artifactId>os-maven-plugin</artifactId>
<version>1.7.1</version>
</extension>
</extensions>
</build>

<profiles>
<profile>
<id>mac-domain</id>
<activation>
<os>
<family>mac</family>
</os>
</activation>
<dependencies>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-kqueue</artifactId>
<version>${netty.version}</version>
<classifier>${os.detected.classifier}</classifier>
<scope>provided</scope>
</dependency>
</dependencies>
</profile>
<profile>
<id>linux-domain</id>
<activation>
<os>
<name>linux</name>
</os>
</activation>
<dependencies>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<version>${netty.version}</version>
<classifier>${os.detected.classifier}</classifier>
<scope>provided</scope>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
40 changes: 40 additions & 0 deletions model/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@
<groupId>org.scijava</groupId>
<artifactId>native-lib-loader</artifactId>
</dependency>

<!-- Test only deps below this line -->

<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
Expand Down Expand Up @@ -279,4 +281,42 @@
</plugins>
</pluginManagement>
</build>


<profiles>
<profile>
<id>mac-domain</id>
<activation>
<os>
<family>mac</family>
</os>
</activation>
<dependencies>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-kqueue</artifactId>
<version>${netty.version}</version>
<classifier>${os.detected.classifier}</classifier>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
<profile>
<id>linux-domain</id>
<activation>
<os>
<name>linux</name>
</os>
</activation>
<dependencies>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<version>${netty.version}</version>
<classifier>${os.detected.classifier}</classifier>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
22 changes: 7 additions & 15 deletions protocols/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-unix-common</artifactId>
<classifier>${os.detected.classifier}</classifier>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.perfmark</groupId>
<artifactId>perfmark-api</artifactId>
Expand Down Expand Up @@ -114,13 +120,6 @@
</os>
</activation>
<dependencies>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-unix-common</artifactId>
<version>${netty.version}</version>
<classifier>${os.detected.classifier}</classifier>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-kqueue</artifactId>
Expand All @@ -138,19 +137,12 @@
</os>
</activation>
<dependencies>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-unix-common</artifactId>
<version>${netty.version}</version>
<classifier>${os.detected.classifier}</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<version>${netty.version}</version>
<classifier>${os.detected.classifier}</classifier>
<scope>optional</scope>
<scope>provided</scope>
</dependency>
</dependencies>
</profile>
Expand Down
Loading

0 comments on commit f03d054

Please sign in to comment.