Spring code samples refresh + overall refresh of deps

.run/Template JUnit.run.xml

@@ -0,0 +1,11 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="true" type="JUnit" factoryName="JUnit">
+    <option name="MAIN_CLASS_NAME" value="" />
+    <option name="METHOD_NAME" value="" />
+    <option name="TEST_OBJECT" value="class" />
+    <option name="VM_PARAMETERS" value="-ea -Djava.net.preferIPv4Stack=true" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>

enterprise/tls-custom-login-module/src/test/java/sample/ClientCertCheckingLoginModuleTest.java

@@ -97,12 +97,13 @@ private Config createMemberConfig(String storeName, String memberRealmAllowedSan
                 .setProperty("hazelcast.phone.home.enabled", "false");
         JoinConfig joinConfig = config.getNetworkConfig().getJoin();
         joinConfig.getTcpIpConfig().setEnabled(true).addMember("127.0.0.1");
-        config.getNetworkConfig().setSSLConfig(new SSLConfig()).getSSLConfig().setEnabled(true)
-                .setProperty("mutualAuthentication", "REQUIRED") //
-                .setProperty("keyStore", "src/" + storeName + ".p12") //
-                .setProperty("keyStorePassword", "123456") //
-                .setProperty("trustStore", "src/ca.p12") //
-                .setProperty("trustStorePassword", "123456");
+        SSLConfig sslConf = config.getNetworkConfig().setSSLConfig(new SSLConfig()).getSSLConfig();
+        sslConf.setEnabled(true)
+                 .setProperty("mutualAuthentication", "REQUIRED") //
+                 .setProperty("keyStore", "src/" + storeName + ".p12") //
+                 .setProperty("keyStorePassword", "123456") //
+                 .setProperty("trustStore", "src/ca.p12") //
+                 .setProperty("trustStorePassword", "123456");
         SecurityConfig securityConfig = config.getSecurityConfig().setEnabled(true);
         securityConfig.setMemberRealmConfig("memberRealm",
                 new RealmConfig().setJaasAuthenticationConfig(new JaasAuthenticationConfig().addLoginModuleConfig(

pom.xml

@@ -121,6 +121,27 @@
             </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <classesDirectory>${project.build.outputDirectory}</classesDirectory>
+                    <argLine>-Djava.net.preferIPv4Stack=true</argLine>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>3.5.2</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                        <phase>integration-test</phase>
+                    </execution>
+                </executions>
+                <configuration>
+                    <classesDirectory>${project.build.outputDirectory}</classesDirectory>
+                    <argLine>-Djava.net.preferIPv4Stack=true</argLine>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -188,26 +209,35 @@
                 <artifactId>lombok</artifactId>
                 <version>${lombok.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.junit</groupId>
+                <artifactId>junit-bom</artifactId>
+                <version>5.11.4</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
     <dependencies>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.10.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.vintage</groupId>
             <artifactId>junit-vintage-engine</artifactId>
-            <version>5.10.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.10.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-commons</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

serialization/hazelcast-airlines/grid-node/pom.xml

@@ -27,7 +27,7 @@
 
         <dependency>
             <groupId>org.springframework.shell</groupId>
-            <artifactId>spring-shell</artifactId>
+            <artifactId>spring-shell-starter</artifactId>
         </dependency>
     </dependencies>
 

serialization/hazelcast-airlines/grid-node/src/main/java/com/hazelcast/samples/serialization/hazelcast/airlines/Application.java

@@ -1,7 +1,7 @@
 package com.hazelcast.samples.serialization.hazelcast.airlines;
 
+import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.shell.Bootstrap;
 
 /**
  * <p>Use Spring Boot and Spring Shell to build a Hazelcast
@@ -19,9 +19,9 @@ public class Application {
      *
      * @param args From command line
      */
-    public static void main(String[] args) throws Exception {
+    public static void main(String[] args) {
         System.setProperty("hazelcast.logging.type", "slf4j");
-        Bootstrap.main(args);
+        SpringApplication.run(Application.class, args);
     }
 
 }

serialization/hazelcast-airlines/grid-node/src/main/java/com/hazelcast/samples/serialization/hazelcast/airlines/CLI.java

@@ -7,9 +7,8 @@
 import com.hazelcast.samples.serialization.hazelcast.airlines.util.Constants;
 import com.hazelcast.samples.serialization.hazelcast.airlines.util.FlightBuilder;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.shell.core.CommandMarker;
-import org.springframework.shell.core.annotation.CliCommand;
-import org.springframework.shell.core.annotation.CliOption;
+import org.springframework.shell.command.annotation.Command;
+import org.springframework.shell.command.annotation.Option;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
@@ -28,7 +27,7 @@
  * </p>
  */
 @Component
-public class CLI implements CommandMarker {
+public class CLI {
 
     @Autowired
     private HazelcastInstance hazelcastInstance;
@@ -59,12 +58,12 @@ public class CLI implements CommandMarker {
      * @param name Who to book the seat for
      * @return The seat booked
      */
-    @CliCommand(value = "BOOK",
-            help = "BOOK A SEAT ON A FLIGHT")
+    @Command(command = "BOOK",
+            description = "BOOK A SEAT ON A FLIGHT")
     public String loading(
-            @CliOption(key = {"CODE"}, mandatory = true, help = "THE FLIGHT TO BOOK ONTO")
+            @Option(label = "CODE", required = true, description = "THE FLIGHT TO BOOK ONTO")
                     String code,
-            @CliOption(key = {"NAME"}, mandatory = true, help = "WHO TO BOOK ONTO THE FLIGHT")
+            @Option(label = "NAME", required = true, description = "WHO TO BOOK ONTO THE FLIGHT")
                     String name
             ) {
         IMap<MyKey, AbstractFlight> flightsMap = this.hazelcastInstance.getMap(Constants.IMAP_FLIGHTS);
@@ -96,10 +95,10 @@ public String loading(
      * @param code The flight code, Date is hardcoded
      * @return Flight if found
      */
-    @CliCommand(value = "GET",
-            help = "RETRIEVE A FLIGHT")
+    @Command(command = "GET",
+            description = "RETRIEVE A FLIGHT")
     public String get(
-            @CliOption(key = {"CODE"}, mandatory = true) String code
+            @Option(label = "CODE", required = true) String code
             ) {
         IMap<MyKey, AbstractFlight> flightsMap = this.hazelcastInstance.getMap(Constants.IMAP_FLIGHTS);
 
@@ -119,12 +118,12 @@ public String get(
      * <p>List the stored flights, keys are {@link java.lang.Comparable} so sort before printing.
      * </p>
      */
-    @CliCommand(value = "KEYS",
-            help = "DISPLAY THE STORED FLIGHTS")
+    @Command(command = "KEYS",
+            description = "DISPLAY THE STORED FLIGHTS")
     public String keys() {
             IMap<MyKey, AbstractFlight> flightsMap = this.hazelcastInstance.getMap(Constants.IMAP_FLIGHTS);
 
-            Set<MyKey> keys = flightsMap.keySet().stream().collect(Collectors.toCollection(TreeSet::new));
+            Set<MyKey> keys = new TreeSet<>(flightsMap.keySet());
 
             keys.forEach(key -> System.out.println(" -> " + key));
 
@@ -143,10 +142,10 @@ public String keys() {
      * @param code The flight code, Date is hardcoded
      * @return How many passengers
      */
-    @CliCommand(value = "LOADING",
-            help = "HOW MANY SEATS ARE IN USE ON A FLIGHT")
+    @Command(command = "LOADING",
+            description = "HOW MANY SEATS ARE IN USE ON A FLIGHT")
     public String loading(
-            @CliOption(key = {"CODE"}, mandatory = true) String code
+            @Option(label = "CODE", required = true) String code
             ) {
         IMap<MyKey, AbstractFlight> flightsMap = this.hazelcastInstance.getMap(Constants.IMAP_FLIGHTS);
 
@@ -168,8 +167,8 @@ public String loading(
      * <p>Load test data into the cluster.
      * </p>
      */
-    @CliCommand(value = "TESTDATA",
-            help = "INJECT TEST DATA INTO THE CLUSTER")
+    @Command(command = "TESTDATA",
+            description = "INJECT TEST DATA INTO THE CLUSTER")
     public String testData() {
         IMap<MyKey, AbstractFlight> hazelcastMap = this.hazelcastInstance.getMap(Constants.IMAP_FLIGHTS);
         StringBuilder sb = new StringBuilder();

serialization/hazelcast-airlines/grid-node/src/main/resources/application.properties

@@ -0,0 +1,4 @@
+logging.level.root=OFF
+spring.main.banner-mode=off
+spring.main.web-application-type=none
+spring.shell.interactive.enabled=true

serialization/hazelcast-airlines/pom.xml

@@ -20,9 +20,9 @@
         <main.basedir>${project.parent.parent.basedir}</main.basedir>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <hazelcast.version>4.0</hazelcast.version>
+        <hazelcast.version>5.5.0</hazelcast.version>
         <kryo.version>4.0.0</kryo.version>
-        <spring-shell.version>1.2.0.RELEASE</spring-shell.version>
+        <spring-shell.version>3.4.0</spring-shell.version>
     </properties>
 
     <modules>
@@ -52,14 +52,27 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.junit.platform</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>org.springframework.shell</groupId>
-                <artifactId>spring-shell</artifactId>
+                <artifactId>spring-shell-dependencies</artifactId>
                 <version>${spring-shell.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
 
             <dependency>

serialization/hazelcast-airlines/the-code/src/test/java/com/hazelcast/samples/serialization/hazelcast/airlines/SeatReservationEntryProcessorTest.java

@@ -8,7 +8,7 @@
 import com.hazelcast.samples.serialization.hazelcast.airlines.util.FlightBuilder;
 import com.hazelcast.samples.serialization.hazelcast.airlines.util.MyDataSerializableFactory;
 import lombok.extern.slf4j.Slf4j;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.AbstractMap.SimpleEntry;
 import java.util.Map.Entry;

serialization/hazelcast-airlines/the-code/src/test/java/com/hazelcast/samples/serialization/hazelcast/airlines/V1FlightTest.java

@@ -2,7 +2,7 @@
 
 import com.hazelcast.samples.serialization.hazelcast.airlines.util.FlightBuilder;
 import lombok.extern.slf4j.Slf4j;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

serialization/hazelcast-airlines/the-code/src/test/java/com/hazelcast/samples/serialization/hazelcast/airlines/V2FlightTest.java

@@ -2,7 +2,7 @@
 
 import com.hazelcast.samples.serialization.hazelcast.airlines.util.FlightBuilder;
 import lombok.extern.slf4j.Slf4j;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

serialization/hazelcast-airlines/the-code/src/test/java/com/hazelcast/samples/serialization/hazelcast/airlines/V3FlightTest.java

@@ -4,7 +4,7 @@
 import com.hazelcast.internal.serialization.SerializationService;
 import com.hazelcast.samples.serialization.hazelcast.airlines.util.FlightBuilder;
 import lombok.extern.slf4j.Slf4j;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 

serialization/hazelcast-airlines/the-code/src/test/java/com/hazelcast/samples/serialization/hazelcast/airlines/V4FlightTest.java

@@ -6,7 +6,7 @@
 import com.hazelcast.samples.serialization.hazelcast.airlines.util.FlightBuilder;
 import com.hazelcast.samples.serialization.hazelcast.airlines.util.MyDataSerializableFactory;
 import lombok.extern.slf4j.Slf4j;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 

serialization/hazelcast-airlines/the-code/src/test/java/com/hazelcast/samples/serialization/hazelcast/airlines/V5FlightTest.java

@@ -6,7 +6,7 @@
 import com.hazelcast.internal.serialization.SerializationService;
 import com.hazelcast.samples.serialization.hazelcast.airlines.util.FlightBuilder;
 import lombok.extern.slf4j.Slf4j;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 

spring/pom.xml

@@ -30,10 +30,24 @@
         <version>0.1-SNAPSHOT</version>
     </parent>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${spring.boot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <properties>
         <!-- needed for checkstyle/findbugs -->
         <main.basedir>${project.parent.basedir}</main.basedir>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+        <spring.boot.version>3.4.2</spring.boot.version>
     </properties>
 
     <modules>
@@ -49,16 +63,22 @@
     </modules>
 
     <dependencies>
+        <dependency>
+            <groupId>com.hazelcast.samples</groupId>
+            <artifactId>helper</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.hazelcast</groupId>
             <artifactId>hazelcast</artifactId>
             <version>${hazelcast.version}</version>
         </dependency>
 
+        <!-- needed for spring test -->
         <dependency>
-            <groupId>com.hazelcast.samples</groupId>
-            <artifactId>helper</artifactId>
-            <version>${project.version}</version>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.3.4</version>
         </dependency>
     </dependencies>
 </project>