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

0005-Do-not-use-the-Graal-annotations.patch

@@ -1,153 +0,0 @@
-From 6cc11ea389160c067b103bd4d0c356bb13442c77 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:45 +0200
-Subject: [PATCH 5/7] Do not use the Graal annotations
-
----
- .../java/io/netty/util/NetUtilSubstitutions.java    | 13 -------------
- .../util/internal/svm/CleanerJava6Substitution.java | 10 ----------
- .../svm/PlatformDependent0Substitution.java         | 10 ----------
- .../internal/svm/PlatformDependentSubstitution.java |  9 ---------
- .../svm/UnsafeRefArrayAccessSubstitution.java       |  9 ---------
- 5 files changed, 51 deletions(-)
-
-diff --git a/common/src/main/java/io/netty/util/NetUtilSubstitutions.java b/common/src/main/java/io/netty/util/NetUtilSubstitutions.java
-index 65c7bb94a5..18bfc1664f 100644
---- a/common/src/main/java/io/netty/util/NetUtilSubstitutions.java
-+++ b/common/src/main/java/io/netty/util/NetUtilSubstitutions.java
-@@ -15,35 +15,22 @@
-  */
- package io.netty.util;
- 
--import com.oracle.svm.core.annotate.Alias;
--import com.oracle.svm.core.annotate.InjectAccessors;
--import com.oracle.svm.core.annotate.TargetClass;
--
- import java.net.Inet4Address;
- import java.net.Inet6Address;
- import java.net.InetAddress;
- import java.net.NetworkInterface;
- import java.util.Collection;
- 
--@TargetClass(NetUtil.class)
- final class NetUtilSubstitutions {
-     private NetUtilSubstitutions() {
-     }
- 
--    @Alias
--    @InjectAccessors(NetUtilLocalhost4Accessor.class)
-     public static Inet4Address LOCALHOST4;
- 
--    @Alias
--    @InjectAccessors(NetUtilLocalhost6Accessor.class)
-     public static Inet6Address LOCALHOST6;
- 
--    @Alias
--    @InjectAccessors(NetUtilLocalhostAccessor.class)
-     public static InetAddress LOCALHOST;
- 
--    @Alias
--    @InjectAccessors(NetUtilNetworkInterfacesAccessor.class)
-     public static Collection<NetworkInterface> NETWORK_INTERFACES;
- 
-     private static final class NetUtilLocalhost4Accessor {
-diff --git a/common/src/main/java/io/netty/util/internal/svm/CleanerJava6Substitution.java b/common/src/main/java/io/netty/util/internal/svm/CleanerJava6Substitution.java
-index aed4777a0d..0fa5a858ab 100644
---- a/common/src/main/java/io/netty/util/internal/svm/CleanerJava6Substitution.java
-+++ b/common/src/main/java/io/netty/util/internal/svm/CleanerJava6Substitution.java
-@@ -15,19 +15,9 @@
-  */
- package io.netty.util.internal.svm;
- 
--import com.oracle.svm.core.annotate.Alias;
--import com.oracle.svm.core.annotate.RecomputeFieldValue;
--import com.oracle.svm.core.annotate.TargetClass;
--
--@TargetClass(className = "io.netty.util.internal.CleanerJava6")
- final class CleanerJava6Substitution {
-     private CleanerJava6Substitution() {
-     }
- 
--    @Alias
--    @RecomputeFieldValue(
--        kind = RecomputeFieldValue.Kind.FieldOffset,
--        declClassName = "java.nio.DirectByteBuffer",
--        name = "cleaner")
-     private static long CLEANER_FIELD_OFFSET;
- }
-diff --git a/common/src/main/java/io/netty/util/internal/svm/PlatformDependent0Substitution.java b/common/src/main/java/io/netty/util/internal/svm/PlatformDependent0Substitution.java
-index 1a06a5518d..3bd61f467a 100644
---- a/common/src/main/java/io/netty/util/internal/svm/PlatformDependent0Substitution.java
-+++ b/common/src/main/java/io/netty/util/internal/svm/PlatformDependent0Substitution.java
-@@ -15,19 +15,9 @@
-  */
- package io.netty.util.internal.svm;
- 
--import com.oracle.svm.core.annotate.Alias;
--import com.oracle.svm.core.annotate.RecomputeFieldValue;
--import com.oracle.svm.core.annotate.TargetClass;
--
--@TargetClass(className = "io.netty.util.internal.PlatformDependent0")
- final class PlatformDependent0Substitution {
-     private PlatformDependent0Substitution() {
-     }
- 
--    @Alias
--    @RecomputeFieldValue(
--        kind = RecomputeFieldValue.Kind.FieldOffset,
--        declClassName = "java.nio.Buffer",
--        name = "address")
-     private static long ADDRESS_FIELD_OFFSET;
- }
-diff --git a/common/src/main/java/io/netty/util/internal/svm/PlatformDependentSubstitution.java b/common/src/main/java/io/netty/util/internal/svm/PlatformDependentSubstitution.java
-index 08932da772..8df7f18218 100644
---- a/common/src/main/java/io/netty/util/internal/svm/PlatformDependentSubstitution.java
-+++ b/common/src/main/java/io/netty/util/internal/svm/PlatformDependentSubstitution.java
-@@ -15,11 +15,6 @@
-  */
- package io.netty.util.internal.svm;
- 
--import com.oracle.svm.core.annotate.Alias;
--import com.oracle.svm.core.annotate.RecomputeFieldValue;
--import com.oracle.svm.core.annotate.TargetClass;
--
--@TargetClass(className = "io.netty.util.internal.PlatformDependent")
- final class PlatformDependentSubstitution {
-     private PlatformDependentSubstitution() {
-     }
-@@ -31,9 +26,5 @@ final class PlatformDependentSubstitution {
-      * in PlatformDependent happens during image building, the non-recomputed value
-      * is cached.
-      */
--    @Alias
--    @RecomputeFieldValue(
--        kind = RecomputeFieldValue.Kind.ArrayBaseOffset,
--        declClass = byte[].class)
-     private static long BYTE_ARRAY_BASE_OFFSET;
- }
-diff --git a/common/src/main/java/io/netty/util/internal/svm/UnsafeRefArrayAccessSubstitution.java b/common/src/main/java/io/netty/util/internal/svm/UnsafeRefArrayAccessSubstitution.java
-index 08f492f132..f0b10d7cde 100644
---- a/common/src/main/java/io/netty/util/internal/svm/UnsafeRefArrayAccessSubstitution.java
-+++ b/common/src/main/java/io/netty/util/internal/svm/UnsafeRefArrayAccessSubstitution.java
-@@ -15,18 +15,9 @@
-  */
- package io.netty.util.internal.svm;
- 
--import com.oracle.svm.core.annotate.Alias;
--import com.oracle.svm.core.annotate.RecomputeFieldValue;
--import com.oracle.svm.core.annotate.TargetClass;
--
--@TargetClass(className = "io.netty.util.internal.shaded.org.jctools.util.UnsafeRefArrayAccess")
- final class UnsafeRefArrayAccessSubstitution {
-     private UnsafeRefArrayAccessSubstitution() {
-     }
- 
--    @Alias
--    @RecomputeFieldValue(
--        kind = RecomputeFieldValue.Kind.ArrayIndexShift,
--        declClass = Object[].class)
-     public static int REF_ELEMENT_SHIFT;
- }
--- 
-2.46.1
-

0006-Do-not-use-the-Jetbrains-annotations.patch

@@ -1,157 +0,0 @@
-From 3d2d165de5adfaf0ab6cf79d48bc27d0546238bc 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:20:35 +0200
-Subject: [PATCH 6/7] Do not use the Jetbrains annotations
-
----
- common/src/main/java/io/netty/util/Recycler.java             | 2 --
- .../java/io/netty/util/concurrent/AbstractEventExecutor.java | 4 +---
- .../java/io/netty/util/concurrent/GlobalEventExecutor.java   | 4 +---
- .../io/netty/util/concurrent/SingleThreadEventExecutor.java  | 5 ++---
- .../test/java/io/netty/util/RecyclerFastThreadLocalTest.java | 2 --
- common/src/test/java/io/netty/util/RecyclerTest.java         | 4 +---
- 6 files changed, 5 insertions(+), 16 deletions(-)
-
-diff --git a/common/src/main/java/io/netty/util/Recycler.java b/common/src/main/java/io/netty/util/Recycler.java
-index c434874bff..3df4f1d772 100644
---- a/common/src/main/java/io/netty/util/Recycler.java
-+++ b/common/src/main/java/io/netty/util/Recycler.java
-@@ -24,7 +24,6 @@ import io.netty.util.internal.UnstableApi;
- import io.netty.util.internal.logging.InternalLogger;
- import io.netty.util.internal.logging.InternalLoggerFactory;
- import org.jctools.queues.MessagePassingQueue;
--import org.jetbrains.annotations.VisibleForTesting;
- 
- import java.util.ArrayDeque;
- import java.util.Queue;
-@@ -208,7 +207,6 @@ public abstract class Recycler<T> {
-         return true;
-     }
- 
--    @VisibleForTesting
-     final int threadLocalSize() {
-         LocalPool<T> localPool = threadLocal.getIfExists();
-         return localPool == null ? 0 : localPool.pooledHandles.size() + localPool.batch.size();
-diff --git a/common/src/main/java/io/netty/util/concurrent/AbstractEventExecutor.java b/common/src/main/java/io/netty/util/concurrent/AbstractEventExecutor.java
-index 6409578637..e9463935ba 100644
---- a/common/src/main/java/io/netty/util/concurrent/AbstractEventExecutor.java
-+++ b/common/src/main/java/io/netty/util/concurrent/AbstractEventExecutor.java
-@@ -19,8 +19,6 @@ import io.netty.util.internal.UnstableApi;
- import io.netty.util.internal.logging.InternalLogger;
- import io.netty.util.internal.logging.InternalLoggerFactory;
- 
--import org.jetbrains.annotations.Async.Execute;
--
- import java.util.Collection;
- import java.util.Collections;
- import java.util.Iterator;
-@@ -169,7 +167,7 @@ public abstract class AbstractEventExecutor extends AbstractExecutorService impl
-         }
-     }
- 
--    protected static void runTask(@Execute Runnable task) {
-+    protected static void runTask(Runnable task) {
-         task.run();
-     }
- 
-diff --git a/common/src/main/java/io/netty/util/concurrent/GlobalEventExecutor.java b/common/src/main/java/io/netty/util/concurrent/GlobalEventExecutor.java
-index 4514c023a3..542eecee3f 100644
---- a/common/src/main/java/io/netty/util/concurrent/GlobalEventExecutor.java
-+++ b/common/src/main/java/io/netty/util/concurrent/GlobalEventExecutor.java
-@@ -21,8 +21,6 @@ import io.netty.util.internal.ThreadExecutorMap;
- import io.netty.util.internal.logging.InternalLogger;
- import io.netty.util.internal.logging.InternalLoggerFactory;
- 
--import org.jetbrains.annotations.Async.Schedule;
--
- import java.security.AccessController;
- import java.security.PrivilegedAction;
- import java.util.Queue;
-@@ -221,7 +219,7 @@ public final class GlobalEventExecutor extends AbstractScheduledEventExecutor im
-         execute0(task);
-     }
- 
--    private void execute0(@Schedule Runnable task) {
-+    private void execute0(Runnable task) {
-         addTask(ObjectUtil.checkNotNull(task, "task"));
-         if (!inEventLoop()) {
-             startThread();
-diff --git a/common/src/main/java/io/netty/util/concurrent/SingleThreadEventExecutor.java b/common/src/main/java/io/netty/util/concurrent/SingleThreadEventExecutor.java
-index b93b7cd377..7838cb7787 100644
---- a/common/src/main/java/io/netty/util/concurrent/SingleThreadEventExecutor.java
-+++ b/common/src/main/java/io/netty/util/concurrent/SingleThreadEventExecutor.java
-@@ -21,7 +21,6 @@ import io.netty.util.internal.SystemPropertyUtil;
- import io.netty.util.internal.ThreadExecutorMap;
- import io.netty.util.internal.logging.InternalLogger;
- import io.netty.util.internal.logging.InternalLoggerFactory;
--import org.jetbrains.annotations.Async.Schedule;
- 
- import java.lang.Thread.State;
- import java.util.ArrayList;
-@@ -822,12 +821,12 @@ public abstract class SingleThreadEventExecutor extends AbstractScheduledEventEx
-         lazyExecute0(task);
-     }
- 
--    private void execute0(@Schedule Runnable task) {
-+    private void execute0(Runnable task) {
-         ObjectUtil.checkNotNull(task, "task");
-         execute(task, wakesUpForTask(task));
-     }
- 
--    private void lazyExecute0(@Schedule Runnable task) {
-+    private void lazyExecute0(Runnable task) {
-         execute(ObjectUtil.checkNotNull(task, "task"), false);
-     }
- 
-diff --git a/common/src/test/java/io/netty/util/RecyclerFastThreadLocalTest.java b/common/src/test/java/io/netty/util/RecyclerFastThreadLocalTest.java
-index 7c8d4da113..1dfaffc7da 100644
---- a/common/src/test/java/io/netty/util/RecyclerFastThreadLocalTest.java
-+++ b/common/src/test/java/io/netty/util/RecyclerFastThreadLocalTest.java
-@@ -16,7 +16,6 @@
- package io.netty.util;
- 
- import io.netty.util.concurrent.FastThreadLocalThread;
--import org.jetbrains.annotations.NotNull;
- import org.junit.jupiter.api.Test;
- import org.junit.jupiter.api.Timeout;
- import org.junit.jupiter.api.extension.ExtendWith;
-@@ -29,7 +28,6 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
- 
- @ExtendWith(RunInFastThreadLocalThreadExtension.class)
- public class RecyclerFastThreadLocalTest extends RecyclerTest {
--    @NotNull
-     @Override
-     protected Thread newThread(Runnable runnable) {
-         return new FastThreadLocalThread(runnable);
-diff --git a/common/src/test/java/io/netty/util/RecyclerTest.java b/common/src/test/java/io/netty/util/RecyclerTest.java
-index 49359ff962..1ee4c6bd5c 100644
---- a/common/src/test/java/io/netty/util/RecyclerTest.java
-+++ b/common/src/test/java/io/netty/util/RecyclerTest.java
-@@ -15,7 +15,6 @@
- */
- package io.netty.util;
- 
--import org.jetbrains.annotations.NotNull;
- import org.junit.jupiter.api.Test;
- import org.junit.jupiter.api.Timeout;
- import org.junit.jupiter.api.function.Executable;
-@@ -55,7 +54,6 @@ public class RecyclerTest {
-         };
-     }
- 
--    @NotNull
-     protected Thread newThread(Runnable runnable) {
-         return new Thread(runnable);
-     }
-@@ -341,7 +339,7 @@ public class RecyclerTest {
- 
-         ExecutorService single = Executors.newSingleThreadExecutor(new ThreadFactory() {
-             @Override
--            public Thread newThread(@NotNull Runnable r) {
-+            public Thread newThread(Runnable r) {
-                 return RecyclerTest.this.newThread(r);
-             }
-         });
--- 
-2.46.1
-

0007-Do-not-require-the-tcnative-native-library.patch

@@ -1,29 +0,0 @@
-From b34ce776e1331f91e67dabd69dd31e17fd0efd22 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:21:56 +0200
-Subject: [PATCH 7/7] Do not require the tcnative native library
-
----
- handler/pom.xml | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/handler/pom.xml b/handler/pom.xml
-index 35bdbf9272..57165fd4fe 100644
---- a/handler/pom.xml
-+++ b/handler/pom.xml
-@@ -70,12 +70,6 @@
-       <artifactId>netty-tcnative-classes</artifactId>
-       <optional>true</optional>
-     </dependency>
--    <dependency>
--      <groupId>${project.groupId}</groupId>
--      <artifactId>${tcnative.artifactId}</artifactId>
--      <classifier>${tcnative.classifier}</classifier>
--      <optional>true</optional>
--    </dependency>
-     <dependency>
-       <groupId>org.bouncycastle</groupId>
-       <artifactId>bcpkix-jdk15on</artifactId>
--- 
-2.46.1
-

netty-4.1.114.Final.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6de44a2d06a6f86d54a117a84b887a55d61812b8020a9256cdee4610d96f9975
-size 3176566

netty-4.1.115.Final.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5b999b9d8305275089421cd27e58be84b97ff299375dd6a1b952bec44aa08a80
-size 3179909

netty-4.1.118.Final.tar.gz

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