diff --git a/.gitignore b/.gitignore
index 91d7a6fb6..14874bafb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,4 +19,5 @@ springHibernateDB
 osgi/felix-cache/
 .java-version
 *.code-workspace
+dependency-reduced-pom.xml
 /enterprise/tls-rbac-demo/keymaterial/
diff --git a/hazelcast-integration/openshift/client-apps/ocp-demo-frontend/pom.xml b/hazelcast-integration/openshift/client-apps/ocp-demo-frontend/pom.xml
index 47c3aabd4..75b36b652 100644
--- a/hazelcast-integration/openshift/client-apps/ocp-demo-frontend/pom.xml
+++ b/hazelcast-integration/openshift/client-apps/ocp-demo-frontend/pom.xml
@@ -56,12 +56,6 @@
             <version>${spring.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <optional>true</optional>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
diff --git a/jcache-1.1/times-table/pom.xml b/jcache-1.1/times-table/pom.xml
index 998fc62b9..502e6bd3c 100644
--- a/jcache-1.1/times-table/pom.xml
+++ b/jcache-1.1/times-table/pom.xml
@@ -46,11 +46,6 @@
             <version>${javax-cache.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
diff --git a/jet/operator-jet-job-snapshot/jet-pipelines/pom.xml b/jet/operator-jet-job-snapshot/jet-pipelines/pom.xml
index 00dfb49e0..dbab3e07f 100644
--- a/jet/operator-jet-job-snapshot/jet-pipelines/pom.xml
+++ b/jet/operator-jet-job-snapshot/jet-pipelines/pom.xml
@@ -14,19 +14,6 @@
 
     <name>jet-pipelines</name>
 
-    <dependencies>
-        <dependency>
-            <groupId>com.hazelcast</groupId>
-            <artifactId>hazelcast</artifactId>
-            <version>${hazelcast.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
     <build>
         <plugins>
             <plugin>
diff --git a/json/jsongrid/pom.xml b/json/jsongrid/pom.xml
index 3188d6c9a..bb5ce25a9 100644
--- a/json/jsongrid/pom.xml
+++ b/json/jsongrid/pom.xml
@@ -33,11 +33,6 @@
             <artifactId>hsqldb</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
diff --git a/near-cache/fraud-detection/pom.xml b/near-cache/fraud-detection/pom.xml
index f8aa6e646..c83c1fe92 100644
--- a/near-cache/fraud-detection/pom.xml
+++ b/near-cache/fraud-detection/pom.xml
@@ -29,11 +29,6 @@
     </modules>
 
     <dependencies>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
diff --git a/platform-operator/hazelcast-platform-operator-map-store/mapstore/dependency-reduced-pom.xml b/platform-operator/hazelcast-platform-operator-map-store/mapstore/dependency-reduced-pom.xml
index c2fa3ac85..795f0c5b9 100644
--- a/platform-operator/hazelcast-platform-operator-map-store/mapstore/dependency-reduced-pom.xml
+++ b/platform-operator/hazelcast-platform-operator-map-store/mapstore/dependency-reduced-pom.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <artifactId>operator-samples</artifactId>
+    <groupId>com.hazelcast.samples</groupId>
+    <version>0.1-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
+  </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.hazelcast.operator.mongodb</groupId>
   <artifactId>mapstore-mongodb</artifactId>
@@ -65,8 +71,79 @@
       </build>
     </profile>
   </profiles>
+  <dependencies>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>5.11.4</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>opentest4j</artifactId>
+          <groupId>org.opentest4j</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>apiguardian-api</artifactId>
+          <groupId>org.apiguardian</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
+      <version>5.11.4</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>junit-platform-engine</artifactId>
+          <groupId>org.junit.platform</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>junit</artifactId>
+          <groupId>junit</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>apiguardian-api</artifactId>
+          <groupId>org.apiguardian</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <version>5.11.4</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>junit-platform-engine</artifactId>
+          <groupId>org.junit.platform</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>apiguardian-api</artifactId>
+          <groupId>org.apiguardian</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-commons</artifactId>
+      <version>1.11.4</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>apiguardian-api</artifactId>
+          <groupId>org.apiguardian</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <version>3.24.2</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
   <properties>
-    <maven.compiler.target>11</maven.compiler.target>
-    <maven.compiler.source>11</maven.compiler.source>
+    <main.basedir>${project.parent.parent.basedir}</main.basedir>
   </properties>
 </project>
diff --git a/pom.xml b/pom.xml
index 56f46c43b..57a8c9618 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
         <maven.checkstyle.plugin.version>3.3.1</maven.checkstyle.plugin.version>
         <maven.assembly.plugin.version>3.0.0</maven.assembly.plugin.version>
 
-        <lombok.version>1.18.30</lombok.version>
+        <lombok.version>1.18.40</lombok.version>
         <spring.boot.version>3.5.4</spring.boot.version>
     </properties>
 
@@ -99,6 +99,13 @@
                 <configuration>
                     <release>${java.version}</release>
                     <encoding>${project.build.sourceEncoding}</encoding>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>${lombok.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
                 </configuration>
             </plugin>
             <plugin>
@@ -227,6 +234,11 @@
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
diff --git a/spring/spring-data-hazelcast-chemistry-sample/pom.xml b/spring/spring-data-hazelcast-chemistry-sample/pom.xml
index 7d634db2e..aae6b8756 100644
--- a/spring/spring-data-hazelcast-chemistry-sample/pom.xml
+++ b/spring/spring-data-hazelcast-chemistry-sample/pom.xml
@@ -56,15 +56,6 @@
             <artifactId>spring-data-hazelcast</artifactId>
             <version>${spring-data-hazelcast.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.hazelcast</groupId>
-            <artifactId>hazelcast</artifactId>
-            <version>${hazelcast.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.jboss.spec.javax.annotation</groupId>
             <artifactId>jboss-annotations-api_1.2_spec</artifactId>
diff --git a/spring/spring-data-jpa-hazelcast-migration/before/before-jpa-repository/src/test/java/com/hazelcast/samples/spring/data/migration/AbstractNounRepositoryTest.java b/spring/spring-data-jpa-hazelcast-migration/before/before-jpa-repository/src/test/java/com/hazelcast/samples/spring/data/migration/AbstractNounRepositoryTest.java
index 55715d622..384b2a01f 100644
--- a/spring/spring-data-jpa-hazelcast-migration/before/before-jpa-repository/src/test/java/com/hazelcast/samples/spring/data/migration/AbstractNounRepositoryTest.java
+++ b/spring/spring-data-jpa-hazelcast-migration/before/before-jpa-repository/src/test/java/com/hazelcast/samples/spring/data/migration/AbstractNounRepositoryTest.java
@@ -25,7 +25,7 @@ public abstract class AbstractNounRepositoryTest {
 
 	protected static Noun cat;
 
-	private Logger log;
+	protected Logger log;
 	private CrudRepository<Noun, Integer> nounRepository;
 
 	@BeforeClass
diff --git a/spring/spring-data-jpa-hazelcast-migration/pom.xml b/spring/spring-data-jpa-hazelcast-migration/pom.xml
index 8810ef8fd..e279669b6 100644
--- a/spring/spring-data-jpa-hazelcast-migration/pom.xml
+++ b/spring/spring-data-jpa-hazelcast-migration/pom.xml
@@ -36,11 +36,6 @@
             <artifactId>spring-data-hazelcast</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>