Skip to content

Commit 7288ecf

Browse files
authored
Merge pull request lightbody#507 from jekh/netty-4.1-in-dist
Making netty 4.1 the default in standalone mode
2 parents 5dc62a7 + 4f2cba1 commit 7288ecf

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

browsermob-dist/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
<properties>
1616
<zip.name>${project.parent.artifactId}-${project.version}</zip.name>
17+
<netty.version>${netty-4.1.version}</netty.version>
1718
</properties>
1819

1920
<dependencies>

pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@
6969
<groovy-eclipse-batch.version>2.4.3-01</groovy-eclipse-batch.version>
7070

7171
<netty.version>4.0.39.Final</netty.version>
72+
<!-- netty 4.1 version to use for browsermob-dist and when using the netty-4.1 profile -->
73+
<netty-4.1.version>4.1.3.Final</netty-4.1.version>
7274

7375
<bouncycastle.version>1.54</bouncycastle.version>
7476
</properties>
@@ -468,7 +470,7 @@
468470
<profile>
469471
<id>netty-4.1</id>
470472
<properties>
471-
<netty.version>4.1.3.Final</netty.version>
473+
<netty.version>${netty-4.1.version}</netty.version>
472474
</properties>
473475
</profile>
474476
</profiles>

0 commit comments

Comments
 (0)