Skip to content

Commit

Permalink
Upgrade to new netty-build and com.puppycrawl.tools 8.18 (#8980)
Browse files Browse the repository at this point in the history
Motivation:

com.puppycrawl.tools checkstyle < 8.18 was reported to contain a possible security flaw. We should upgrade.

Modifications:

- Upgrade netty-build and checkstyle.
- Fix checkstyle errors

Result:

Fixes #8968.
  • Loading branch information
normanmaurer committed Mar 26, 2019
1 parent 86ecad5 commit 8206604
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
Expand Up @@ -593,7 +593,7 @@ private ChannelFuture writeContinuationFrames(ChannelHandlerContext ctx, int str
if (paddingBytes(padding) > 0) {
ctx.write(ZERO_BUFFER.slice(0, paddingBytes(padding)), promiseAggregator.newPromise());
}
} while(headerBlock.isReadable());
} while (headerBlock.isReadable());
}
return promiseAggregator;
}
Expand Down
7 changes: 6 additions & 1 deletion pom.xml
Expand Up @@ -262,7 +262,7 @@
<netty.dev.tools.directory>${project.build.directory}/dev-tools</netty.dev.tools.directory>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<netty.build.version>24</netty.build.version>
<netty.build.version>25</netty.build.version>
<jboss.marshalling.version>1.4.11.Final</jboss.marshalling.version>
<jetty.alpnAgent.version>2.0.8</jetty.alpnAgent.version>
<jetty.alpnAgent.path>"${settings.localRepository}"/org/mortbay/jetty/alpn/jetty-alpn-agent/${jetty.alpnAgent.version}/jetty-alpn-agent-${jetty.alpnAgent.version}.jar</jetty.alpnAgent.path>
Expand Down Expand Up @@ -891,6 +891,11 @@
</execution>
</executions>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>8.18</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>netty-build</artifactId>
Expand Down
Expand Up @@ -141,23 +141,23 @@ public static void epollCtlAdd(int efd, final int fd, final int flags) throws IO
throw newIOException("epoll_ctl", res);
}
}
private static native int epollCtlAdd0(int efd, final int fd, final int flags);
private static native int epollCtlAdd0(int efd, int fd, int flags);

public static void epollCtlMod(int efd, final int fd, final int flags) throws IOException {
int res = epollCtlMod0(efd, fd, flags);
if (res < 0) {
throw newIOException("epoll_ctl", res);
}
}
private static native int epollCtlMod0(int efd, final int fd, final int flags);
private static native int epollCtlMod0(int efd, int fd, int flags);

public static void epollCtlDel(int efd, final int fd) throws IOException {
int res = epollCtlDel0(efd, fd);
if (res < 0) {
throw newIOException("epoll_ctl", res);
}
}
private static native int epollCtlDel0(int efd, final int fd);
private static native int epollCtlDel0(int efd, int fd);

// File-descriptor operations
public static int splice(int fd, long offIn, int fdOut, long offOut, long len) throws IOException {
Expand Down

0 comments on commit 8206604

Please sign in to comment.