diff --git a/helloworld/pom.xml b/helloworld/pom.xml
index 0c9a0b3..5c83823 100644
--- a/helloworld/pom.xml
+++ b/helloworld/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.samples.spring</groupId>
 	<artifactId>spring-rabbit-helloworld</artifactId>
-	<version>2.4.1</version>
+	<version>3.0.0-M1</version>
 	<packaging>jar</packaging>
 	<name>Spring AMQP Hello World</name>
 	<url>https://www.spring.io</url>
@@ -16,7 +16,7 @@
 	</description>
 	<properties>
 		<maven.test.failure.ignore>true</maven.test.failure.ignore>
-		<spring.amqp.version>2.4.1</spring.amqp.version>
+		<spring.amqp.version>3.0.0-M1</spring.amqp.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
 		<maven.test.failure.ignore>false</maven.test.failure.ignore>
diff --git a/log4j2/pom.xml b/log4j2/pom.xml
index b233443..8e7a4c7 100644
--- a/log4j2/pom.xml
+++ b/log4j2/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.amqp.samples</groupId>
 	<artifactId>log4j2</artifactId>
-	<version>2.4.1</version>
+	<version>3.0.0-M1</version>
 	<packaging>jar</packaging>
 
 	<name>log4j2</name>
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.6.0</version>
+		<version>3.0.0-M1</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
@@ -22,7 +22,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
 		<spring.framework.version>5.3.13</spring.framework.version>
-		<spring.amqp.version>2.4.1</spring.amqp.version>
+		<spring.amqp.version>3.0.0-M1</spring.amqp.version>
 	</properties>
 
 	<dependencies>
diff --git a/pom.xml b/pom.xml
index 53c68c2..66e2306 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,11 +4,11 @@
 	<groupId>org.springframework.amqp</groupId>
 	<artifactId>spring-amqp-samples</artifactId>
 	<name>Spring AMQP Samples</name>
-	<version>2.4.1</version>
+	<version>3.0.0-M1</version>
 	<packaging>pom</packaging>
 	<modules>
 		<module>helloworld</module>
-		<module>stocks</module>
+		<!--module>stocks</module-->
 		<module>log4j2</module>
 		<module>spring-rabbit-confirms-returns</module>
 		<module>spring-rabbit-json</module>
diff --git a/spring-rabbit-confirms-returns/pom.xml b/spring-rabbit-confirms-returns/pom.xml
index eef5834..42275a2 100644
--- a/spring-rabbit-confirms-returns/pom.xml
+++ b/spring-rabbit-confirms-returns/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.amqp.samples</groupId>
 	<artifactId>spring-rabbit-confirms-returns</artifactId>
-	<version>2.4.1</version>
+	<version>3.0.0-M1</version>
 	<packaging>jar</packaging>
 
 	<name>spring-rabbit-confirms-returns</name>
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.6.0</version>
+		<version>3.0.0-M1</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -22,7 +22,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<spring.amqp.version>2.4.1</spring.amqp.version>
+		<spring.amqp.version>3.0.0-M1</spring.amqp.version>
 	</properties>
 
 	<dependencies>
diff --git a/spring-rabbit-global-errorhandler/pom.xml b/spring-rabbit-global-errorhandler/pom.xml
index 90a4f5c..27d7bb6 100644
--- a/spring-rabbit-global-errorhandler/pom.xml
+++ b/spring-rabbit-global-errorhandler/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.example</groupId>
 	<artifactId>spring-rabbit-global-errorhandler</artifactId>
-	<version>2.4.1</version>
+	<version>3.0.0-M1</version>
 	<packaging>jar</packaging>
 
 	<name>spring-rabbit-global-errorhandler</name>
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.6.0</version>
+		<version>3.0.0-M1</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -22,7 +22,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<spring.amqp.version>2.4.1</spring.amqp.version>
+		<spring.amqp.version>3.0.0-M1</spring.amqp.version>
 	</properties>
 
 	<dependencies>
diff --git a/spring-rabbit-json/pom.xml b/spring-rabbit-json/pom.xml
index 6d9c127..a0c6633 100644
--- a/spring-rabbit-json/pom.xml
+++ b/spring-rabbit-json/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.example</groupId>
 	<artifactId>spring-rabbit-json</artifactId>
-	<version>2.4.1</version>
+	<version>3.0.0-M1</version>
 	<packaging>jar</packaging>
 
 	<name>spring-rabbit-json</name>
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.6.0</version>
+		<version>3.0.0-M1</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -22,7 +22,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<spring.amqp.version>2.4.1</spring.amqp.version>
+		<spring.amqp.version>3.0.0-M1</spring.amqp.version>
 	</properties>
 
 	<dependencies>
diff --git a/stocks/pom.xml b/stocks/pom.xml
index 01c7202..8e5ae67 100644
--- a/stocks/pom.xml
+++ b/stocks/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.samples.spring</groupId>
 	<artifactId>spring-rabbit-stocks</artifactId>
-	<version>2.4.1</version>
+	<version>3.0.0-M1</version>
 	<packaging>war</packaging>
 	<name>Spring Rabbit Stocks</name>
 	<url>https://www.spring.io</url>
@@ -15,8 +15,8 @@
 	</description>
 	<properties>
 		<maven.test.failure.ignore>true</maven.test.failure.ignore>
-		<spring.framework.version>5.3.11</spring.framework.version>
-		<spring.amqp.version>2.4.1</spring.amqp.version>
+		<spring.framework.version>6.0.0-M2</spring.framework.version>
+		<spring.amqp.version>3.0.0-M1</spring.amqp.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
 		<maven.test.failure.ignore>false</maven.test.failure.ignore>
@@ -63,9 +63,9 @@
 			<version>${spring.framework.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-			<version>3.1.0</version>
+			<groupId>jakarta.servlet</groupId>
+			<artifactId>jakarta.servlet-api</artifactId>
+			<version>5.0.0</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
diff --git a/stocks/src/main/resources/server-jmx.xml b/stocks/src/main/resources/server-jmx.xml
index cbd2a5a..92f3fc2 100644
--- a/stocks/src/main/resources/server-jmx.xml
+++ b/stocks/src/main/resources/server-jmx.xml
@@ -8,12 +8,12 @@
 
     <context:mbean-export/>
 
-    <bean id="registry" class="org.springframework.remoting.rmi.RmiRegistryFactoryBean"
-          p:port="1099" />
+<!--     <bean id="registry" class="org.springframework.remoting.rmi.RmiRegistryFactoryBean" -->
+<!--           p:port="1099" /> -->
 
     <!-- Expose JMX over RMI -->
-    <bean id="serverConnector" class="org.springframework.jmx.support.ConnectorServerFactoryBean" depends-on="registry"
-          p:objectName="connector:name=rmi"
-          p:serviceUrl="service:jmx:rmi://localhost/jndi/rmi://localhost:1099/myconnector" />
+<!--     <bean id="serverConnector" class="org.springframework.jmx.support.ConnectorServerFactoryBean" depends-on="registry" -->
+<!--           p:objectName="connector:name=rmi" -->
+<!--           p:serviceUrl="service:jmx:rmi://localhost/jndi/rmi://localhost:1099/myconnector" /> -->
 
 </beans>