Skip to content

Commit 00560b6

Browse files
authored
Merge pull request #1198 from quickfix-j/copilot/check-os-specific-dependency
Remove OS-specific `netty-tcnative` by excluding it in POM
2 parents 4969564 + 5f74bb5 commit 00560b6

2 files changed

Lines changed: 11 additions & 12 deletions

File tree

pom.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,10 @@
9898
<orchestra.file>OrchestraFIXLatest.xml</orchestra.file>
9999
<org.quickfixj.orchestra.tools.version>1.0.3</org.quickfixj.orchestra.tools.version>
100100
<jaxen.version>2.0.1</jaxen.version>
101-
<jmh.version>1.37</jmh.version>
102-
<jcstress.version>0.16</jcstress.version>
103-
<hsqldb.version>1.8.0.10</hsqldb.version>
101+
<jmh.version>1.37</jmh.version>
102+
<jcstress.version>0.16</jcstress.version>
103+
<hsqldb.version>1.8.0.10</hsqldb.version>
104+
<netty.version>4.2.13.Final</netty.version>
104105
<class-pruner-plugin.version>3.0.1</class-pruner-plugin.version>
105106
</properties>
106107

quickfixj-core/pom.xml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,14 @@
120120
<dependency>
121121
<groupId>io.netty</groupId>
122122
<artifactId>netty-example</artifactId>
123-
<version>4.2.12.Final</version>
123+
<version>${netty.version}</version>
124124
<scope>test</scope>
125+
<exclusions>
126+
<exclusion>
127+
<groupId>io.netty</groupId>
128+
<artifactId>netty-tcnative</artifactId>
129+
</exclusion>
130+
</exclusions>
125131
</dependency>
126132
<dependency>
127133
<groupId>org.burningwave</groupId>
@@ -231,14 +237,6 @@
231237
</plugin>
232238
</plugins>
233239

234-
<extensions>
235-
<!-- required by Netty cross-platform build -->
236-
<extension>
237-
<groupId>kr.motd.maven</groupId>
238-
<artifactId>os-maven-plugin</artifactId>
239-
<version>1.7.1</version>
240-
</extension>
241-
</extensions>
242240
</build>
243241

244242
<reporting>

0 commit comments

Comments
 (0)