ISPN-14733 Make quarkus modules inherit from Infinispan parent

- Upgrade to wildfly-common version with fix for native compilation quarkusio/quarkus#23769 - Align version dependencies with Quarkus - Fix Checkstyle failures
ryanemerson · Apr 3, 2023 · c283e50 · c283e50
1 parent 285f92d
commit c283e50
Show file tree

Hide file tree

Showing 15 changed files with 51 additions and 95 deletions.
diff --git a/pom.xml b/pom.xml
@@ -404,7 +404,7 @@
       <versionx.org.testng.testng>6.14.3</versionx.org.testng.testng>
       <versionx.org.twdata.maven.mojo-executor>2.4.0</versionx.org.twdata.maven.mojo-executor>
       <versionx.org.wildfly.arquillian.wildfly-arquillian-container-managed>${version.org.wildfly.arquillian}</versionx.org.wildfly.arquillian.wildfly-arquillian-container-managed>
-      <versionx.org.wildfly.common.wildfly-common>1.5.4.Final</versionx.org.wildfly.common.wildfly-common>
+      <versionx.org.wildfly.common.wildfly-common>1.5.4.Final-format-001</versionx.org.wildfly.common.wildfly-common>
       <versionx.org.wildfly.core.wildfly-core-testsuite-shared>${version.org.wildfly.core}</versionx.org.wildfly.core.wildfly-core-testsuite-shared>
       <versionx.org.wildfly.maven.plugins.licenses-plugin>2.3.0.Final</versionx.org.wildfly.maven.plugins.licenses-plugin>
       <versionx.org.wildfly.openssl.natives>${version.org.wildfly.openssl.natives}</versionx.org.wildfly.openssl.natives>

diff --git a/quarkus/embedded/runtime/pom.xml b/quarkus/embedded/runtime/pom.xml
@@ -75,7 +75,7 @@
         <dependency>
             <groupId>org.jboss.narayana.jta</groupId>
             <artifactId>narayana-jta</artifactId>
-            <optional>true</optional>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>jakarta.transaction</groupId>

diff --git a/...ime/src/main/java/org/infinispan/quarkus/embedded/runtime/InfinispanEmbeddedProducer.java b/...ime/src/main/java/org/infinispan/quarkus/embedded/runtime/InfinispanEmbeddedProducer.java
@@ -57,7 +57,7 @@ EmbeddedCacheManager manager() {
     /**
      * Verifies that if a configuration has transactions enabled that it only uses the lookup that uses the
      * JBossStandaloneJTAManager, which looks up the transaction manager used by Quarkus
-     * 
+     *
      * @param configurationBuilder the current configuration
      * @param cacheName the cache for the configuration
      */

diff --git a/...ded/runtime/src/main/java/org/infinispan/quarkus/embedded/runtime/InfinispanRecorder.java b/...ded/runtime/src/main/java/org/infinispan/quarkus/embedded/runtime/InfinispanRecorder.java
@@ -10,4 +10,4 @@ public void configureRuntimeProperties(InfinispanEmbeddedRuntimeConfig infinispa
         InfinispanEmbeddedProducer iep = Arc.container().instance(InfinispanEmbeddedProducer.class).get();
         iep.setRuntimeConfig(infinispanEmbeddedRuntimeConfig);
     }
-}
+}
diff --git a/...untime/src/main/java/org/infinispan/quarkus/embedded/runtime/graal/SubstituteJGroups.java b/...untime/src/main/java/org/infinispan/quarkus/embedded/runtime/graal/SubstituteJGroups.java
@@ -1,17 +1,14 @@
 package org.infinispan.quarkus.embedded.runtime.graal;
 
-import java.security.SecureRandom;
-import java.util.Random;
-
-import org.jgroups.JChannel;
-import org.jgroups.protocols.DELAY;
-import org.jgroups.util.UUID;
-import org.jgroups.util.Util;
-
 import com.oracle.svm.core.annotate.Alias;
 import com.oracle.svm.core.annotate.RecomputeFieldValue;
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
+import org.jgroups.JChannel;
+import org.jgroups.protocols.DELAY;
+import org.jgroups.util.Util;
+
+import java.util.Random;
 
 public class SubstituteJGroups {
 }

diff --git a/...ests/embedded/src/main/java/org/infinispan/quarkus/embedded/TestAdvancedExternalizer.java b/...ests/embedded/src/main/java/org/infinispan/quarkus/embedded/TestAdvancedExternalizer.java
@@ -36,7 +36,7 @@ public IdViaConfigObj readObject(ObjectInput input) throws IOException, ClassNot
 
             @Override
             public Set<Class<? extends IdViaConfigObj>> getTypeClasses() {
-                return Util.<Class<? extends IdViaConfigObj>> asSet(IdViaConfigObj.class);
+                return Util.asSet(IdViaConfigObj.class);
             }
 
             @Override
@@ -72,40 +72,8 @@ public Integer getId() {
 
             @Override
             public Set<Class<? extends IdViaAnnotationObj>> getTypeClasses() {
-                return Util.<Class<? extends IdViaAnnotationObj>> asSet(IdViaAnnotationObj.class);
+                return Util.asSet(IdViaAnnotationObj.class);
             }
         }
     }
-
-    public static class IdViaBothObj {
-        int age;
-
-        public IdViaBothObj setAge(int age) {
-            this.age = age;
-            return this;
-        }
-
-        public static class Externalizer extends AbstractExternalizer<IdViaBothObj> {
-            @Override
-            public void writeObject(ObjectOutput output, IdViaBothObj object) throws IOException {
-                output.writeInt(object.age);
-            }
-
-            @Override
-            public IdViaBothObj readObject(ObjectInput input) throws IOException, ClassNotFoundException {
-                return new IdViaBothObj().setAge(input.readInt());
-            }
-
-            @Override
-            public Integer getId() {
-                return 9012;
-            }
-
-            @Override
-            public Set<Class<? extends IdViaBothObj>> getTypeClasses() {
-                return Util.<Class<? extends IdViaBothObj>> asSet(IdViaBothObj.class);
-            }
-        }
-    }
-
 }
diff --git a/quarkus/integration-tests/embedded/src/main/resources/application.properties b/quarkus/integration-tests/embedded/src/main/resources/application.properties
@@ -2,4 +2,4 @@ quarkus.log.console.level=INFO
 quarkus.log.category."org.infinispan".level=TRACE
 quarkus.log.file.enable=true
 
-# quarkus.infinispan-embedded.xml-config=dist.xml
+# quarkus.infinispan-embedded.xml-config=dist.xml
diff --git a/quarkus/pom.xml b/quarkus/pom.xml
@@ -5,9 +5,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.infinispan</groupId>
-        <artifactId>infinispan-build-configuration-parent</artifactId>
+        <artifactId>infinispan-parent</artifactId>
         <version>15.0.0-SNAPSHOT</version>
-        <relativePath>../build/configuration/pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>infinispan-quarkus-parent</artifactId>
@@ -23,6 +23,10 @@
         <native-build-args>-Ob,</native-build-args>
         <quarkus.native.additional-build-args>${native-build-args}</quarkus.native.additional-build-args>
         <exe.suffix/>
+        <version.caffeine>2.9.3</version.caffeine>
+        <version.org.wildfly.elytron>1.20.1.Final</version.org.wildfly.elytron>
+        <version.smallrye-mutiny>1.7.0</version.smallrye-mutiny>
+        <versionx.org.jboss.threads.jboss-threads>3.4.3.Final</versionx.org.jboss.threads.jboss-threads>
     </properties>
 
     <modules>

diff --git a/...ent/src/main/java/org/infinispan/quarkus/server/deployment/InfinispanServerProcessor.java b/...ent/src/main/java/org/infinispan/quarkus/server/deployment/InfinispanServerProcessor.java
@@ -1,13 +1,22 @@
 package org.infinispan.quarkus.server.deployment;
 
-import java.lang.management.MemoryType;
-import java.lang.management.MemoryUsage;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.ServiceLoader;
-
+import com.thoughtworks.xstream.security.NoTypePermission;
+import io.netty.handler.codec.http2.CleartextHttp2ServerUpgradeHandler;
+import io.netty.handler.codec.http2.Http2ServerUpgradeCodec;
+import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
+import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem;
+import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.deployment.builditem.IndexDependencyBuildItem;
+import io.quarkus.deployment.builditem.SystemPropertyBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ExcludeConfigBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.NativeImageSystemPropertyBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
 import org.infinispan.anchored.configuration.AnchoredKeysConfigurationBuilder;
 import org.infinispan.commands.module.ModuleCommandExtensions;
 import org.infinispan.commons.util.JVMMemoryInfoInfo;
@@ -30,26 +39,13 @@
 import org.jboss.jandex.IndexView;
 import org.wildfly.security.password.impl.PasswordFactorySpiImpl;
 
-import com.thoughtworks.xstream.security.NoTypePermission;
-
-import io.netty.handler.codec.http2.CleartextHttp2ServerUpgradeHandler;
-import io.netty.handler.codec.http2.Http2ServerUpgradeCodec;
-import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
-import io.quarkus.deployment.annotations.BuildProducer;
-import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.annotations.ExecutionTime;
-import io.quarkus.deployment.annotations.Record;
-import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
-import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem;
-import io.quarkus.deployment.builditem.FeatureBuildItem;
-import io.quarkus.deployment.builditem.IndexDependencyBuildItem;
-import io.quarkus.deployment.builditem.SystemPropertyBuildItem;
-import io.quarkus.deployment.builditem.nativeimage.ExcludeConfigBuildItem;
-import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
-import io.quarkus.deployment.builditem.nativeimage.NativeImageSystemPropertyBuildItem;
-import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
-import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
-import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
+import java.lang.management.MemoryType;
+import java.lang.management.MemoryUsage;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.ServiceLoader;
 
 class InfinispanServerProcessor {
    private static final String FEATURE_NAME = "infinispan-server";

diff --git a/...time/src/main/java/org/infinispan/quarkus/server/runtime/graal/DisableAuthentication.java b/...time/src/main/java/org/infinispan/quarkus/server/runtime/graal/DisableAuthentication.java
@@ -45,4 +45,3 @@ public static X500Principal asX500Principal(Principal principal, boolean convert
       return null;
    }
 }
-
diff --git a/...ver/runtime/src/main/java/org/infinispan/quarkus/server/runtime/graal/FixAlpnClasses.java b/...ver/runtime/src/main/java/org/infinispan/quarkus/server/runtime/graal/FixAlpnClasses.java
@@ -69,4 +69,4 @@ public class FixAlpnClasses {
 //      }
 //   }
 //
-//}
+//}
diff --git a/...me/src/main/java/org/infinispan/quarkus/server/runtime/graal/SubstituteClientClasses.java b/...me/src/main/java/org/infinispan/quarkus/server/runtime/graal/SubstituteClientClasses.java
@@ -80,4 +80,3 @@ public void init(OperationsFactory operationsFactory,
 // TODO sort out duplication with quarkus infinispan-client extension
 public class SubstituteClientClasses {
 }
-
diff --git a/...untime/src/main/java/org/infinispan/quarkus/server/runtime/graal/SubstituteDnsLookup.java b/...untime/src/main/java/org/infinispan/quarkus/server/runtime/graal/SubstituteDnsLookup.java
@@ -39,4 +39,4 @@ public InitialContextFactory createInitialContextFactory(Hashtable<?, ?> environ
             throw new NamingException("Native Infinispan Server does not support " + className + " as an InitialContextFactory");
       }
    }
-}
+}
diff --git a/...n/java/org/infinispan/quarkus/server/runtime/graal/SubstituteJBossMarshallingClasses.java b/...n/java/org/infinispan/quarkus/server/runtime/graal/SubstituteJBossMarshallingClasses.java
@@ -25,4 +25,4 @@ public Integer apply(EmbeddedCacheManager embeddedCacheManager) {
 final class Target_org_infinispan_persistence_remote_LifecycleCallbacks {
    @Substitute
    public void cacheManagerStarting(GlobalComponentRegistry gcr, GlobalConfiguration globalCfg) { }
-}
+}
diff --git a/...ime/src/main/java/org/infinispan/quarkus/server/runtime/graal/SubstituteNettyClasses.java b/...ime/src/main/java/org/infinispan/quarkus/server/runtime/graal/SubstituteNettyClasses.java
@@ -1,25 +1,18 @@
 package org.infinispan.quarkus.server.runtime.graal;
 
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.ThreadFactory;
-
-import org.infinispan.server.core.configuration.ProtocolServerConfiguration;
-import org.infinispan.server.core.logging.Log;
-import org.infinispan.server.core.transport.NettyTransport;
-
 import com.oracle.svm.core.annotate.Alias;
 import com.oracle.svm.core.annotate.Delete;
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
-
-import io.netty.channel.EventLoopGroup;
 import io.netty.channel.MultithreadEventLoopGroup;
 import io.netty.channel.ServerChannel;
 import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.channel.socket.SocketChannel;
 import io.netty.channel.socket.nio.NioServerSocketChannel;
-import io.netty.channel.socket.nio.NioSocketChannel;
-import io.netty.util.concurrent.DefaultThreadFactory;
+import org.infinispan.server.core.configuration.ProtocolServerConfiguration;
+import org.infinispan.server.core.logging.Log;
+import org.infinispan.server.core.transport.NettyTransport;
+
+import java.util.concurrent.ThreadFactory;
 
 public class SubstituteNettyClasses {
 }
@@ -57,4 +50,4 @@ public static MultithreadEventLoopGroup buildEventLoop(int nThreads, ThreadFacto
 @Delete
 @TargetClass(className = "org.infinispan.client.hotrod.impl.transport.netty.NativeTransport")
 final class Delete_org_infinispan_client_hotrod_impl_transport_netty_NativeTransport { }
-*/
+*/
-Original file line number
+Diff line change
@@ Expand Up @@
             InfinispanEmbeddedProducer iep = Arc.container().instance(InfinispanEmbeddedProducer.class).get();
             iep.setRuntimeConfig(infinispanEmbeddedRuntimeConfig);
         }
-    }
+    }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -45,4 +45,3 @@ public static X500Principal asX500Principal(Principal principal, boolean convert
		return null;
		}
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -80,4 +80,3 @@ public void init(OperationsFactory operationsFactory,
		// TODO sort out duplication with quarkus infinispan-client extension
		public class SubstituteClientClasses {
		}