Accepting request 1295615 from Java:packages

4.1.123

OBS-URL: https://build.opensuse.org/request/show/1295615
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/netty?expand=0&rev=7

0001-Remove-optional-dep-Blockhound.patch

@@ -1,19 +1,19 @@
-From e4d00571feb88e27151b3cc2d4d62cbf7cb57577 Mon Sep 17 00:00:00 2001
+From 2caba3146e0ff279db66cd8362c06efdeac0d48e Mon Sep 17 00:00:00 2001
 From: Mat Booth <mat.booth@redhat.com>
 Date: Mon, 7 Sep 2020 12:17:31 +0100
-Subject: [PATCH 1/7] Remove optional dep Blockhound
+Subject: [PATCH 1/4] Remove optional dep Blockhound
 
 ---
  common/pom.xml                                |   5 -
  .../java/io/netty/util/internal/Hidden.java   | 200 ------
  ...ockhound.integration.BlockHoundIntegration |  14 -
  pom.xml                                       |   8 -
- transport-blockhound-tests/pom.xml            | 172 ------
- .../NettyBlockHoundIntegrationTest.java       | 569 ------------------
+ transport-blockhound-tests/pom.xml            | 219 -------
+ .../NettyBlockHoundIntegrationTest.java       | 568 ------------------
  .../netty/util/internal/localhost_server.key  |  28 -
  .../netty/util/internal/localhost_server.pem  |  17 -
  .../io/netty/util/internal/mutual_auth_ca.pem |  19 -
- 9 files changed, 1032 deletions(-)
+ 9 files changed, 1078 deletions(-)
  delete mode 100644 common/src/main/java/io/netty/util/internal/Hidden.java
  delete mode 100644 common/src/main/resources/META-INF/services/reactor.blockhound.integration.BlockHoundIntegration
  delete mode 100644 transport-blockhound-tests/pom.xml
@@ -23,7 +23,7 @@ Subject: [PATCH 1/7] Remove optional dep Blockhound
  delete mode 100644 transport-blockhound-tests/src/test/resources/io/netty/util/internal/mutual_auth_ca.pem
 
 diff --git a/common/pom.xml b/common/pom.xml
-index d7a5e0cc5f..1ebc9edf35 100644
+index 66e719e183..77452afbac 100644
 --- a/common/pom.xml
 +++ b/common/pom.xml
 @@ -82,11 +82,6 @@
@@ -266,10 +266,10 @@ index e33bea796c..0000000000
 -io.netty.util.internal.Hidden$NettyBlockHoundIntegration
 \ No newline at end of file
 diff --git a/pom.xml b/pom.xml
-index 855fedf5e2..76f3dc1728 100644
+index 4f572c5912..6b389326a4 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -816,7 +816,6 @@
+@@ -839,7 +839,6 @@
      <module>testsuite-native-image</module>
      <module>testsuite-native-image-client</module>
      <module>testsuite-native-image-client-runtime-init</module>
@@ -277,7 +277,7 @@ index 855fedf5e2..76f3dc1728 100644
      <module>microbench</module>
      <module>bom</module>
    </modules>
-@@ -1244,13 +1243,6 @@
+@@ -1254,13 +1253,6 @@
          <version>${log4j2.version}</version>
          <scope>test</scope>
        </dependency>
@@ -286,17 +286,17 @@ index 855fedf5e2..76f3dc1728 100644
 -      <dependency>
 -        <groupId>io.projectreactor.tools</groupId>
 -        <artifactId>blockhound</artifactId>
--        <version>1.0.10.RELEASE</version>
+-        <version>1.0.13.RELEASE</version>
 -      </dependency>
      </dependencies>
    </dependencyManagement>
  
 diff --git a/transport-blockhound-tests/pom.xml b/transport-blockhound-tests/pom.xml
 deleted file mode 100644
-index 89d0fc9ecc..0000000000
+index a48ee58b90..0000000000
 --- a/transport-blockhound-tests/pom.xml
 +++ /dev/null
-@@ -1,172 +0,0 @@
+@@ -1,219 +0,0 @@
 -<?xml version="1.0" encoding="UTF-8"?>
 -<!--
 -  ~ Copyright 2019 The Netty Project
@@ -319,7 +319,7 @@ index 89d0fc9ecc..0000000000
 -  <parent>
 -    <groupId>io.netty</groupId>
 -    <artifactId>netty-parent</artifactId>
--    <version>4.1.118.Final</version>
+-    <version>4.1.123.Final</version>
 -  </parent>
 -
 -  <artifactId>netty-transport-blockhound-tests</artifactId>
@@ -421,6 +421,33 @@ index 89d0fc9ecc..0000000000
 -        <argLine.common>-XX:+AllowRedefinitionToAddDeleteMethods</argLine.common>
 -      </properties>
 -    </profile>
+-    <profile>
+-      <id>java23</id>
+-      <activation>
+-        <jdk>23</jdk>
+-      </activation>
+-      <properties>
+-        <argLine.common>-XX:+AllowRedefinitionToAddDeleteMethods</argLine.common>
+-      </properties>
+-    </profile>
+-    <profile>
+-      <id>java24</id>
+-      <activation>
+-        <jdk>24</jdk>
+-      </activation>
+-      <properties>
+-        <argLine.common>-XX:+AllowRedefinitionToAddDeleteMethods</argLine.common>
+-      </properties>
+-    </profile>
+-    <profile>
+-      <id>java25</id>
+-      <activation>
+-        <jdk>25</jdk>
+-      </activation>
+-      <properties>
+-        <argLine.common>-XX:+AllowRedefinitionToAddDeleteMethods -XX:+EnableDynamicAgentLoading</argLine.common>
+-      </properties>
+-    </profile>
 -  </profiles>
 -
 -  <properties>
@@ -467,14 +494,34 @@ index 89d0fc9ecc..0000000000
 -      <artifactId>blockhound</artifactId>
 -      <scope>test</scope>
 -    </dependency>
+-    <dependency>
+-      <groupId>org.junit.jupiter</groupId>
+-      <artifactId>junit-jupiter-api</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.junit.jupiter</groupId>
+-      <artifactId>junit-jupiter-engine</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.junit.jupiter</groupId>
+-      <artifactId>junit-jupiter-params</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.assertj</groupId>
+-      <artifactId>assertj-core</artifactId>
+-      <scope>test</scope>
+-    </dependency>
 -  </dependencies>
 -</project>
 diff --git a/transport-blockhound-tests/src/test/java/io/netty/util/internal/NettyBlockHoundIntegrationTest.java b/transport-blockhound-tests/src/test/java/io/netty/util/internal/NettyBlockHoundIntegrationTest.java
 deleted file mode 100644
-index 907fd864f3..0000000000
+index 403b97a418..0000000000
 --- a/transport-blockhound-tests/src/test/java/io/netty/util/internal/NettyBlockHoundIntegrationTest.java
 +++ /dev/null
-@@ -1,569 +0,0 @@
+@@ -1,568 +0,0 @@
 -/*
 - * Copyright 2019 The Netty Project
 -
@@ -528,7 +575,6 @@ index 907fd864f3..0000000000
 -import io.netty.util.concurrent.ScheduledFuture;
 -import io.netty.util.concurrent.SingleThreadEventExecutor;
 -import io.netty.util.internal.Hidden.NettyBlockHoundIntegration;
--import org.hamcrest.Matchers;
 -import org.junit.jupiter.api.BeforeAll;
 -import org.junit.jupiter.api.Test;
 -import org.junit.jupiter.api.Timeout;
@@ -556,8 +602,8 @@ index 907fd864f3..0000000000
 -import java.util.concurrent.locks.ReentrantLock;
 -
 -import static io.netty.buffer.Unpooled.wrappedBuffer;
--import static org.hamcrest.MatcherAssert.assertThat;
 -import static org.junit.jupiter.api.Assertions.assertEquals;
+-import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 -import static org.junit.jupiter.api.Assertions.assertNull;
 -import static org.junit.jupiter.api.Assertions.assertTrue;
 -import static org.junit.jupiter.api.Assertions.fail;
@@ -593,7 +639,7 @@ index 907fd864f3..0000000000
 -            future.get(5, TimeUnit.SECONDS);
 -            fail("Expected an exception due to a blocking call but none was thrown");
 -        } catch (ExecutionException e) {
--            assertThat(e.getCause(), Matchers.instanceOf(BlockingOperationError.class));
+-            assertInstanceOf(BlockingOperationError.class, e.getCause());
 -        }
 -    }
 -
@@ -1127,5 +1173,5 @@ index 9c9241bc65..0000000000
 -hH82y9bBeflqroOeztqMpONpWoZjlz0sWbJNvXztXINL7LaNmVYOcoUrCcxPS54T
 ------END CERTIFICATE-----
 -- 
-2.48.1
+2.50.1
 

0002-Remove-optional-dep-conscrypt.patch

@@ -1,7 +1,7 @@
-From 55c1dd2fea13516c9fee6b5365bd6fe7e701a7ec Mon Sep 17 00:00:00 2001
+From 8f4108d30a1a883b60bc944165ab1ecd91792d2e Mon Sep 17 00:00:00 2001
 From: Mat Booth <mat.booth@redhat.com>
 Date: Mon, 7 Sep 2020 13:24:30 +0100
-Subject: [PATCH 2/7] Remove optional dep conscrypt
+Subject: [PATCH 2/4] Remove optional dep conscrypt
 
 ---
  handler/pom.xml                               |   6 -
@@ -15,7 +15,7 @@ Subject: [PATCH 2/7] Remove optional dep conscrypt
  delete mode 100644 handler/src/main/java/io/netty/handler/ssl/ConscryptAlpnSslEngine.java
 
 diff --git a/handler/pom.xml b/handler/pom.xml
-index 36ebf83f49..f5f179584b 100644
+index d13a8b48ed..e8375d6273 100644
 --- a/handler/pom.xml
 +++ b/handler/pom.xml
 @@ -96,12 +96,6 @@
@@ -367,10 +367,10 @@ index 9eb8f15d14..b5715e87ff 100644
              // https://bugs.java.com/bugdatabase/view_bug.do?bug_id=8230977.
              // Because of this lets not do a Java version runtime check but just depend on if the required methods are
 diff --git a/handler/src/main/java/io/netty/handler/ssl/SslHandler.java b/handler/src/main/java/io/netty/handler/ssl/SslHandler.java
-index 2e8e15fd84..1a6a84b1c6 100644
+index f80b3004a8..6159b87ca2 100644
 --- a/handler/src/main/java/io/netty/handler/ssl/SslHandler.java
 +++ b/handler/src/main/java/io/netty/handler/ssl/SslHandler.java
-@@ -251,55 +251,6 @@ public class SslHandler extends ByteToMessageDecoder implements ChannelOutboundH
+@@ -250,55 +250,6 @@ public class SslHandler extends ByteToMessageDecoder implements ChannelOutboundH
                  return ((ReferenceCountedOpenSslEngine) engine).jdkCompatibilityMode;
              }
          },
@@ -426,7 +426,7 @@ index 2e8e15fd84..1a6a84b1c6 100644
          JDK(false, MERGE_CUMULATOR) {
              @Override
              SSLEngineResult unwrap(SslHandler handler, ByteBuf in, int len, ByteBuf out) throws SSLException {
-@@ -358,8 +309,7 @@ public class SslHandler extends ByteToMessageDecoder implements ChannelOutboundH
+@@ -357,8 +308,7 @@ public class SslHandler extends ByteToMessageDecoder implements ChannelOutboundH
          };
  
          static SslEngineType forEngine(SSLEngine engine) {
@@ -437,10 +437,10 @@ index 2e8e15fd84..1a6a84b1c6 100644
  
          SslEngineType(boolean wantsDirectBuffer, Cumulator cumulator) {
 diff --git a/pom.xml b/pom.xml
-index 76f3dc1728..b3188b816f 100644
+index 6b389326a4..e3d8295642 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -895,16 +895,6 @@
+@@ -918,16 +918,6 @@
          <optional>true</optional>
        </dependency>
  
@@ -458,5 +458,5 @@ index 76f3dc1728..b3188b816f 100644
        <dependency>
          <groupId>software.amazon.cryptools</groupId>
 -- 
-2.48.1
+2.50.1
 

0003-Remove-optional-deps-jetty-alpn-and-npn.patch

@@ -1,7 +1,7 @@
-From daed233559d36cfb8f5136403eb2224da0d89b82 Mon Sep 17 00:00:00 2001
+From 80592dee40e6b80b630c5931e4e76d0bbe7e9cfd Mon Sep 17 00:00:00 2001
 From: Mat Booth <mat.booth@redhat.com>
 Date: Mon, 7 Sep 2020 13:26:20 +0100
-Subject: [PATCH 3/7] Remove optional deps jetty alpn and npn
+Subject: [PATCH 3/4] Remove optional deps jetty alpn and npn
 
 ---
  handler/pom.xml                               |  10 --
@@ -15,7 +15,7 @@ Subject: [PATCH 3/7] Remove optional deps jetty alpn and npn
  delete mode 100644 handler/src/main/java/io/netty/handler/ssl/JettyNpnSslEngine.java
 
 diff --git a/handler/pom.xml b/handler/pom.xml
-index 46c20028eb..35bdbf9272 100644
+index e8375d6273..6b9a3dd5f7 100644
 --- a/handler/pom.xml
 +++ b/handler/pom.xml
 @@ -86,16 +86,6 @@
@@ -374,10 +374,10 @@ index aad00b5f6d..0000000000
 -    }
 -}
 diff --git a/pom.xml b/pom.xml
-index ae68f4ebe8..176b8e9a96 100644
+index e3d8295642..e6759f0794 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -815,20 +815,6 @@
+@@ -875,20 +875,6 @@
          <optional>true</optional>
        </dependency>
  
@@ -399,5 +399,5 @@ index ae68f4ebe8..176b8e9a96 100644
        <dependency>
          <groupId>com.google.protobuf</groupId>
 -- 
-2.46.1
+2.50.1
 

0004-Disable-Brotli-and-ZStd-compression.patch

@@ -1,7 +1,7 @@
-From 54262615f71f8e201500f31c5fb96d4103228711 Mon Sep 17 00:00:00 2001
+From e93d8f3b39a67d1726304d8fe29f5ca8584d60e0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
 Date: Thu, 30 Mar 2023 13:19:04 +0200
-Subject: [PATCH 4/7] Disable Brotli and ZStd compression
+Subject: [PATCH 4/4] Disable Brotli and ZStd compression
 
 ---
  .../codec/http/HttpContentCompressor.java     | 107 +-----------------
@@ -217,10 +217,10 @@ index 17f55d3ed5..27da52dd9a 100644
 -    }
  }
 diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentDecompressor.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentDecompressor.java
-index 3b1134b038..c2f3150bfd 100644
+index 44e6195332..ea461844af 100644
 --- a/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentDecompressor.java
 +++ b/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentDecompressor.java
-@@ -15,22 +15,14 @@
+@@ -15,23 +15,15 @@
   */
  package io.netty.handler.codec.http;
  
@@ -231,6 +231,7 @@ index 3b1134b038..c2f3150bfd 100644
  import static io.netty.handler.codec.http.HttpHeaderValues.X_GZIP;
 -import static io.netty.handler.codec.http.HttpHeaderValues.SNAPPY;
 -import static io.netty.handler.codec.http.HttpHeaderValues.ZSTD;
+ import static io.netty.util.internal.ObjectUtil.checkPositiveOrZero;
  
  import io.netty.channel.embedded.EmbeddedChannel;
 -import io.netty.handler.codec.compression.Brotli;
@@ -243,9 +244,9 @@ index 3b1134b038..c2f3150bfd 100644
  
  /**
   * Decompresses an {@link HttpMessage} and an {@link HttpContent} compressed in
-@@ -72,20 +64,6 @@ public class HttpContentDecompressor extends HttpContentDecoder {
+@@ -102,20 +94,6 @@ public class HttpContentDecompressor extends HttpContentDecoder {
              return new EmbeddedChannel(ctx.channel().id(), ctx.channel().metadata().hasDisconnect(),
-                     ctx.channel().config(), ZlibCodecFactory.newZlibDecoder(wrapper));
+                     ctx.channel().config(), ZlibCodecFactory.newZlibDecoder(wrapper, maxAllocation));
          }
 -        if (Brotli.isAvailable() && BR.contentEqualsIgnoreCase(contentEncoding)) {
 -            return new EmbeddedChannel(ctx.channel().id(), ctx.channel().metadata().hasDisconnect(),
@@ -369,7 +370,7 @@ index b12213dff6..fdeadaebbe 100644
          return null;
      }
 diff --git a/codec-http2/src/main/java/io/netty/handler/codec/http2/DelegatingDecompressorFrameListener.java b/codec-http2/src/main/java/io/netty/handler/codec/http2/DelegatingDecompressorFrameListener.java
-index 88245d1116..de44d6013b 100644
+index 4c25f0adb7..3e3cdddeb4 100644
 --- a/codec-http2/src/main/java/io/netty/handler/codec/http2/DelegatingDecompressorFrameListener.java
 +++ b/codec-http2/src/main/java/io/netty/handler/codec/http2/DelegatingDecompressorFrameListener.java
 @@ -19,24 +19,16 @@ import io.netty.buffer.Unpooled;
@@ -397,9 +398,9 @@ index 88245d1116..de44d6013b 100644
  import static io.netty.handler.codec.http2.Http2Error.INTERNAL_ERROR;
  import static io.netty.handler.codec.http2.Http2Exception.streamError;
  import static io.netty.util.internal.ObjectUtil.checkNotNull;
-@@ -181,18 +173,6 @@ public class DelegatingDecompressorFrameListener extends Http2FrameListenerDecor
+@@ -233,18 +225,6 @@ public class DelegatingDecompressorFrameListener extends Http2FrameListenerDecor
              return new EmbeddedChannel(ctx.channel().id(), ctx.channel().metadata().hasDisconnect(),
-                     ctx.channel().config(), ZlibCodecFactory.newZlibDecoder(wrapper));
+                     ctx.channel().config(), ZlibCodecFactory.newZlibDecoder(wrapper, maxAllocation));
          }
 -        if (Brotli.isAvailable() && BR.contentEqualsIgnoreCase(contentEncoding)) {
 -            return new EmbeddedChannel(ctx.channel().id(), ctx.channel().metadata().hasDisconnect(),
@@ -508,5 +509,5 @@ index 38793a97e6..c1f1c8c17c 100644
       * Default implementation of {@link GzipOptions} with
       * {@code compressionLevel()} set to 6, {@code windowBits()} set to 15 and {@code memLevel()} set to 8.
 -- 
-2.48.1
+2.50.1
 

netty-4.1.118.Final.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:641391ffdfce591392603eec9f396ded2d9eaf22c63eac5d8a28799fa17300a2
-size 3193348

netty.changes

@@ -1,3 +1,102 @@
+-------------------------------------------------------------------
+Thu Jul 24 18:11:55 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to upsteam version 4.1.123
+  * Fixes
+    + Fix chunk reuse bug in adaptive allocator
+    + More accurate adaptive memory usage accounting
+    + Introduce size-classes for the adaptive allocator
+    + Reduce magazine proliferation eagerness
+    + Fix concurrent ByteBuffer access issue in
+      AdaptiveByteBuf.getBytes
+    + Fix possible buffer corruption caused by incorrect
+      setCharSequence(...) implementation
+    + AdaptiveByteBuf: Fix AdaptiveByteBuf.maxFastWritableBytes()
+      to take writerIndex() into account
+    + Optimize capacity bumping for adaptive ByteBufs
+    + AbstractDnsRecord: equals() and hashCode() to ignore name
+      field's case
+    + Backport Unsafe guards
+    + Guard recomputed offset access with hasUnsafe
+    + HTTP2: Always produce a RST frame on stream exception
+    + Correct what artifacts included in netty-bom
+- Modified patches:
+  * 0001-Remove-optional-dep-Blockhound.patch
+  * 0002-Remove-optional-dep-conscrypt.patch
+  * 0003-Remove-optional-deps-jetty-alpn-and-npn.patch
+  * 0004-Disable-Brotli-and-ZStd-compression.patch
+    + rediff
+
+-------------------------------------------------------------------
+Mon Jun  9 10:45:10 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to upstream version 4.1.122
+  * Fixes of 4.1.122
+    + DirContextUtils.addNameServer(...) should just catch Exception
+      internally
+    + Make public API specify explicit maxAllocation to prevent OOM
+    + Fix concurrent ByteBuf write access bug in adaptive allocator
+    + Fix transport-native-kqueue Bundle-SymbolicNames
+    + Fix resolver-dns-native-macos Bundle-SymbolicNames
+    + Always correctly calculate the memory address of the ByteBuf
+      even if sun.misc.Unsafe is not usable
+    + Upgrade lz4 dependencies as the old version did not correctly
+      handle ByteBuffer that have an arrayOffset > 0
+    + Optimize ByteBuf.setCharSequence for adaptive allocator
+    + Kqueue: Fix registration failure when fd is reused
+    + Make JdkZlibEncoder accept Deflater.DEFAULT_COMPRESSION as
+      level
+    + Ensure OpenSsl.availableJavaCipherSuites does not contain null
+      values
+    + Always prefer direct buffers for pooled allocators if not
+      explicit disabled
+    + Update to netty-tcnative 2.0.72.Final
+    + Re-enable sun.misc.Unsafe by default on Java 24+
+    + Kqueue: Delay removal from registration map to fix noisy
+      warnings
+  * Fixes of 4.1.121
+    + Epoll.isAvailable() returns false on Ubuntu 20.04/22.04 arch
+      amd64
+    + Fix transport-native-epoll Bundle-SymbolicNames
+  * Fixes of 4.1.120
+    + Fix flawed termination condition check in
+      HttpPostRequestEncoder#encodeNextChunkUrlEncoded(int) for
+      current InterfaceHttpData
+    + Exposed decoderEnforceMaxConsecutiveEmptyDataFrames and
+      decoderEnforceMaxRstFramesPerWindow
+    + ThreadExecutorMap must restore old EventExecutor
+    + Make Recycler virtual thread friendly
+    + Disable sun.misc.Unsafe by default on Java 24+
+    + Adaptive: Correctly enforce leak detection when using
+      AdaptiveByteBufAllocator
+    + Add suppressed exception to original cause when calling
+      Future.sync*
+    + Add SETTINGS_ENABLE_CONNECT_PROTOCOL to the default HTTP/2
+      settings
+    + Correct computation for suboptimal chunk retirement
+      probability
+    + Fix bug in method
+      AdaptivePoolingAllocator.allocateWithoutLock(...)
+    + Fix a Bytebuf leak in TcpDnsQueryDecoder
+    + SSL: Clear native error if named group is not supported
+    + WebSocketClientCompressionHandler shouldn't claim window bits
+      support when jzlib is not available
+    + Fix the assignment error of maxQoS parameter in ConnAck
+      Properties
+  * Fixes of 4.1.119
+    + Replace SSL assertion with explicit record length check
+    + Fix NPE when upgrade message fails to aggregate
+    + SslHandler: Fix possible NPE when executor is used for
+      delegating
+    + Consistently add channel info in HTTP/2 logs
+    + Add QueryStringDecoder option to leave '+' alone
+    + Use initialized BouncyCastle providers when available
+- Modified patches:
+  * 0001-Remove-optional-dep-Blockhound.patch
+  * 0002-Remove-optional-dep-conscrypt.patch
+  * 0004-Disable-Brotli-and-ZStd-compression.patch
+    + rediff
+
 -------------------------------------------------------------------
 Thu Mar 27 22:03:11 UTC 2025 - Fridrich Strba <fstrba@suse.com>
 

netty.spec

@@ -19,7 +19,7 @@
 %global namedreltag .Final
 %global namedversion %{version}%{?namedreltag}
 Name:           netty
-Version:        4.1.118
+Version:        4.1.123
 Release:        0
 Summary:        An asynchronous event-driven network application framework and tools for Java
 License:        Apache-2.0
@@ -120,21 +120,12 @@ BuildArch:      noarch
 %{java_remove_annotations} common -p "org.jetbrains.annotations"
 
 # remove unnecessary dependency on parent POM
-%pom_remove_parent . bom dev-tools
+%pom_remove_parent . bom
 
 # Not needed for RPM builds
 %pom_disable_module "example"
 %pom_disable_module "microbench"
 
-%pom_xpath_inject 'pom:pluginManagement/pom:plugins/pom:plugin[pom:artifactId="maven-remote-resources-plugin"]' '
-<dependencies>
-<dependency>
-<groupId>io.netty</groupId>
-<artifactId>netty-dev-tools</artifactId>
-<version>${project.version}</version>
-</dependency>
-</dependencies>'
-
 %pom_remove_plugin :maven-antrun-plugin
 %pom_remove_plugin :maven-dependency-plugin
 %pom_remove_plugin :xml-maven-plugin
@@ -152,6 +143,8 @@ BuildArch:      noarch
 %pom_remove_plugin -r :forbiddenapis
 %pom_remove_plugin -r :revapi-maven-plugin
 %pom_remove_plugin -r :bom-helper-maven-plugin
+%pom_remove_plugin -r :central-publishing-maven-plugin
+%pom_remove_plugin -r :nexus-staging-maven-plugin
 %pom_remove_plugin :duplicate-finder-maven-plugin all
 
 cp %{SOURCE1} common/codegen.bash
@@ -191,7 +184,7 @@ rm codec/src/main/java/io/netty/handler/codec/marshalling/*
 rm codec/src/*/java/io/netty/handler/codec/compression/Lzma*.java
 %pom_remove_dep -r com.ning:compress-lzf
 rm codec/src/*/java/io/netty/handler/codec/compression/Lzf*.java
-%pom_remove_dep -r net.jpountz.lz4:lz4
+%pom_remove_dep -r org.lz4:lz4-java
 rm codec/src/*/java/io/netty/handler/codec/compression/Lz4*.java
 %pom_remove_dep -r com.aayushatharva.brotli4j:
 rm codec/src/*/java/io/netty/handler/codec/compression/Brotli*.java
@@ -204,6 +197,9 @@ rm codec/src/*/java/io/netty/handler/codec/compression/Zstd*.java
 %pom_disable_module transport-udt
 %pom_remove_dep -r :netty-transport-udt
 
+%pom_remove_dep -r :netty-build-common
+%pom_remove_dep :netty-dev-tools
+
 # Disable macos native bit
 %pom_disable_module resolver-dns-native-macos
 %pom_remove_dep -r :netty-resolver-dns-native-macos
@@ -228,6 +224,10 @@ unzip %{SOURCE2} -d transport-native-unix-common/target/netty-jni-util
 # Upstream has jctools bundled.
 %pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId = 'maven-bundle-plugin']/pom:executions/pom:execution[pom:id = 'generate-manifest']/pom:configuration/pom:instructions/pom:Import-Package" common/pom.xml
 
+%pom_xpath_inject "pom:project" '
+<properties><javaModuleName>io.netty.dev.tools</javaModuleName></properties>
+' dev-tools
+
 %pom_remove_dep -r :annotations-java5
 
 %pom_xpath_remove "pom:profiles/pom:profile[pom:id = 'staging']" all