Skip to content

Commit

Permalink
Use Netty5 Alpha6-SNAPSHOT in order to avoid slf4j conflicts. (#21)
Browse files Browse the repository at this point in the history
Motivation:

This project is currently depending on Netty 5.0.0-Alpha5.
Let's depend on Netty Alpha6-SNAPSHOT, this seems to avoid dependency conflicts while adapting ReactorNetty to latest Netty Alpha6-SNAPSHOT.

Modification:

Modified the pom.xml in order to depend on 5.0.0.Alpha6-SNAPSHOT instead of 5.0.0.Alpha5
Use SLF4J API instead of InternalLogger.

Result:

This allows to avoid some dependency conflicts while adapting ReactorNetty to the latest Netty Alpha6-SNAPSHOT
  • Loading branch information
pderop authored Mar 28, 2023
1 parent 4ad4bfe commit 555fbe6
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
import io.netty5.util.internal.EmptyArrays;
import io.netty5.util.internal.ObjectUtil;
import io.netty5.util.internal.PlatformDependent;
import io.netty5.util.internal.logging.InternalLogger;
import io.netty5.util.internal.logging.InternalLoggerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.netty.contrib.handler.codec.http.multipart.Helpers.ThrowingConsumer;

import java.io.File;
Expand All @@ -40,7 +40,7 @@
*/
public abstract class AbstractDiskHttpData extends AbstractHttpData {

private static final InternalLogger logger = InternalLoggerFactory.getInstance(AbstractDiskHttpData.class);
private static final Logger logger = LoggerFactory.getLogger(AbstractDiskHttpData.class);

private File file;
private boolean isRenamed;
Expand Down
7 changes: 6 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
</developers>

<properties>
<netty.version>5.0.0.Alpha5</netty.version>
<netty.version>5.0.0.Alpha6-SNAPSHOT</netty.version>
<netty.build.version>31</netty.build.version>
<project.scm.id>github</project.scm.id>
<release.gpg.keyname />
Expand Down Expand Up @@ -136,6 +136,11 @@
<!-- Ensure the whole stacktrace is preserved when an exception is thrown. See https://issues.apache.org/jira/browse/SUREFIRE-1457 -->
<trimStackTrace>false</trimStackTrace>
<argLine>${test.argLine}</argLine>
<systemPropertyVariables>
<!-- Used by ChannelHandlerMetadataUtil to create the recommended directory layout for native-image metadata -->
<nativeImage.handlerMetadataGroupId>${project.groupId}</nativeImage.handlerMetadataGroupId>
<nativeimage.handlerMetadataArtifactId>${project.artifactId}</nativeimage.handlerMetadataArtifactId>
</systemPropertyVariables>
</configuration>
</plugin>

Expand Down

0 comments on commit 555fbe6

Please sign in to comment.