1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63
|
Description: Moves the netty-transport-native-epoll out of the profiles
since it doesn't work with Gradle (required for the projectreactor package)
Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: not-needed
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -108,43 +108,6 @@
</dependencies>
</profile>
- <!-- The linux profile will only include the native jar for epol to the all jar.
- If you want to also include the native jar for kqueue use -Puber.
- -->
- <profile>
- <id>linux</id>
- <activation>
- <os>
- <family>linux</family>
- </os>
- </activation>
- <dependencies>
- <!-- All release modules -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>netty-transport-native-epoll</artifactId>
- <version>${project.version}</version>
- <classifier>${jni.classifier}</classifier>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
- <!-- Just include the classes for the other platform so these are at least present in the netty-all artifact -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>netty-transport-native-kqueue</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>netty-resolver-dns-native-macos</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
- </dependencies>
- </profile>
<!-- The mac, openbsd and freebsd profile will only include the native jar for epol to the all jar.
If you want to also include the native jar for kqueue use -Puber.
-->
@@ -361,6 +324,12 @@
<!-- All release modules -->
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>netty-transport-native-epoll</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>netty-buffer</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
|