Skip to content

Commit c6474f9

Browse files
slandellenormanmaurer
authored andcommitted
Exclude native transport related test and dependency when not running under Linux, close netty#4409
Motivation: The build fails on OSX, due to it trying to pull in an epoll specific OSX dependency. See netty#4409. Modifications: * move netty-transport-native-epoll to linux profile * exclude Http2FrameWriterBenchmark from compiler * include Http2FrameWriterBenchmark back only in linux profile (please check) Result: Build succeeds on OSX.
1 parent 2100a83 commit c6474f9

File tree

1 file changed

+28
-7
lines changed

1 file changed

+28
-7
lines changed

microbench/pom.xml

Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,26 @@
4545
<properties>
4646
<epoll.arch>${os.detected.arch}</epoll.arch>
4747
</properties>
48+
<dependencies>
49+
<dependency>
50+
<groupId>${project.groupId}</groupId>
51+
<artifactId>netty-transport-native-epoll</artifactId>
52+
<version>${project.version}</version>
53+
<classifier>${epoll.classifier}</classifier>
54+
</dependency>
55+
</dependencies>
56+
<build>
57+
<plugins>
58+
<plugin>
59+
<artifactId>maven-compiler-plugin</artifactId>
60+
<configuration>
61+
<includes>
62+
<include>**/*.java</include>
63+
</includes>
64+
</configuration>
65+
</plugin>
66+
</plugins>
67+
</build>
4868
</profile>
4969
</profiles>
5070

@@ -64,12 +84,6 @@
6484
<artifactId>netty-codec-http2</artifactId>
6585
<version>${project.version}</version>
6686
</dependency>
67-
<dependency>
68-
<groupId>${project.groupId}</groupId>
69-
<artifactId>netty-transport-native-epoll</artifactId>
70-
<version>${project.version}</version>
71-
<classifier>${epoll.classifier}</classifier>
72-
</dependency>
7387
<dependency>
7488
<groupId>junit</groupId>
7589
<artifactId>junit</artifactId>
@@ -95,8 +109,15 @@
95109

96110
<build>
97111
<plugins>
112+
<plugin>
113+
<artifactId>maven-compiler-plugin</artifactId>
114+
<configuration>
115+
<excludes>
116+
<exclude>**/Http2FrameWriterBenchmark.java</exclude>
117+
</excludes>
118+
</configuration>
119+
</plugin>
98120
<plugin>
99-
<groupId>org.apache.maven.plugins</groupId>
100121
<artifactId>maven-surefire-plugin</artifactId>
101122
<configuration>
102123
<testSourceDirectory>${project.build.sourceDirectory}</testSourceDirectory>

0 commit comments

Comments
 (0)