diff --git a/.github/workflows/build-check.yml b/.github/workflows/build-check.yml
index e8232d2a..3e9eb28a 100644
--- a/.github/workflows/build-check.yml
+++ b/.github/workflows/build-check.yml
@@ -17,11 +17,11 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v4
 
-      - name: Set up JDK 21
+      - name: Set up JDK 25
         uses: actions/setup-java@v4
         with:
-          java-version: '21'
-          distribution: 'temurin'
+          java-version: '25'
+          distribution: 'microsoft'
           cache: maven
 
       - name: Build All Plugins
diff --git a/.github/workflows/test-install-plugins.yml b/.github/workflows/test-install-plugins.yml
index bc6b7a06..cf36240e 100644
--- a/.github/workflows/test-install-plugins.yml
+++ b/.github/workflows/test-install-plugins.yml
@@ -22,11 +22,11 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v4
 
-      - name: Set up JDK 21
+      - name: Set up JDK 25
         uses: actions/setup-java@v4
         with:
-          java-version: '21'
-          distribution: 'temurin'
+          java-version: '25'
+          distribution: 'microsoft'
           cache: maven
 
       - name: Build Plugins
diff --git a/.github/workflows/test-on-dotcms-release.yml b/.github/workflows/test-on-dotcms-release.yml
index 0d7a810a..21b85021 100644
--- a/.github/workflows/test-on-dotcms-release.yml
+++ b/.github/workflows/test-on-dotcms-release.yml
@@ -84,11 +84,11 @@ jobs:
           echo "pom.xml updated:"
           grep dotcms-core.version pom.xml
 
-      - name: Set up JDK 21
+      - name: Set up JDK 25
         uses: actions/setup-java@v4
         with:
-          java-version: '21'
-          distribution: 'temurin'
+          java-version: '25'
+          distribution: 'microsoft'
           cache: maven
 
       - name: Build Plugins
diff --git a/.sdkmanrc b/.sdkmanrc
new file mode 100644
index 00000000..ed035fe4
--- /dev/null
+++ b/.sdkmanrc
@@ -0,0 +1,3 @@
+# sets the SDKMAN_JAVA_VERSION for dotCMS plugin examples
+# this is the version of java used to build the plugins and matches the dotCMS core runtime
+java=25.0.2-ms
diff --git a/com.dotcms.3rd.party/pom.xml b/com.dotcms.3rd.party/pom.xml
index fcbe5f31..4e4083a7 100644
--- a/com.dotcms.3rd.party/pom.xml
+++ b/com.dotcms.3rd.party/pom.xml
@@ -16,8 +16,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>25</maven.compiler.source>
+        <maven.compiler.target>25</maven.compiler.target>
     </properties>
 
     <repositories>
@@ -64,6 +64,7 @@
                            <Embed-Directory>lib</Embed-Directory>
                            <Embed-StripGroup>true</Embed-StripGroup>
                            <Bundle-ClassPath>.,{maven-dependencies}</Bundle-ClassPath>
+                           <_noee>true</_noee>
                        </instructions>
                    </configuration>
                </plugin>
diff --git a/com.dotcms.actionlet/pom.xml b/com.dotcms.actionlet/pom.xml
index f62c42cc..f3a2a9f9 100644
--- a/com.dotcms.actionlet/pom.xml
+++ b/com.dotcms.actionlet/pom.xml
@@ -17,8 +17,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>25</maven.compiler.source>
+        <maven.compiler.target>25</maven.compiler.target>
     </properties>
 
     <repositories>
@@ -52,6 +52,7 @@
                         <Bundle-DocURL>https://dotcms.com/</Bundle-DocURL>
                         <Bundle-Activator>com.dotcms.osgi.actionlet.Activator</Bundle-Activator>
                         <Import-Package>*</Import-Package>
+                        <_noee>true</_noee>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/com.dotcms.aop/pom.xml b/com.dotcms.aop/pom.xml
index 84ee34fa..450d95cd 100644
--- a/com.dotcms.aop/pom.xml
+++ b/com.dotcms.aop/pom.xml
@@ -17,8 +17,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>25</maven.compiler.source>
+        <maven.compiler.target>25</maven.compiler.target>
         <aspectj.version>1.8.10</aspectj.version> <!-- Adjust as per your AspectJ version -->
     </properties>
 
@@ -65,6 +65,7 @@
                         <Bundle-DocURL>https://dotcms.com/</Bundle-DocURL>
                         <Bundle-Activator>com.dotcms.plugin.aop.Activator</Bundle-Activator>
                         <Import-Package>*</Import-Package>
+                        <_noee>true</_noee>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/com.dotcms.app.example/pom.xml b/com.dotcms.app.example/pom.xml
index 2ad1c28e..e7373bd7 100644
--- a/com.dotcms.app.example/pom.xml
+++ b/com.dotcms.app.example/pom.xml
@@ -17,8 +17,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>25</maven.compiler.source>
+        <maven.compiler.target>25</maven.compiler.target>
     </properties>
 
     <repositories>
@@ -63,6 +63,7 @@
                         org.apache.commons.io.input;version="[1.4,3)",
                         *
                         </Import-Package>
+                        <_noee>true</_noee>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/com.dotcms.content.validation/pom.xml b/com.dotcms.content.validation/pom.xml
index 3c9546aa..309dece9 100644
--- a/com.dotcms.content.validation/pom.xml
+++ b/com.dotcms.content.validation/pom.xml
@@ -17,8 +17,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>25</maven.compiler.source>
+        <maven.compiler.target>25</maven.compiler.target>
     </properties>
 
     <repositories>
@@ -52,6 +52,7 @@
                         <Bundle-DocURL>https://dotcms.com/</Bundle-DocURL>
                         <Bundle-Activator>com.dotcms.content.validation.Activator</Bundle-Activator>
                         <Import-Package>*</Import-Package>
+                        <_noee>true</_noee>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/com.dotcms.contenttype/pom.xml b/com.dotcms.contenttype/pom.xml
index f369b13a..e32bec84 100644
--- a/com.dotcms.contenttype/pom.xml
+++ b/com.dotcms.contenttype/pom.xml
@@ -17,8 +17,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>25</maven.compiler.source>
+        <maven.compiler.target>25</maven.compiler.target>
     </properties>
 
     <repositories>
@@ -62,6 +62,7 @@
                         <Bundle-DocURL>https://dotcms.com/</Bundle-DocURL>
                         <Bundle-Activator>com.dotcms.osgi.actionlet.Activator</Bundle-Activator>
                         <Import-Package>*</Import-Package>
+                        <_noee>true</_noee>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/com.dotcms.dynamic.skeleton/pom.xml b/com.dotcms.dynamic.skeleton/pom.xml
index 7d543217..974cc822 100644
--- a/com.dotcms.dynamic.skeleton/pom.xml
+++ b/com.dotcms.dynamic.skeleton/pom.xml
@@ -17,8 +17,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>11</maven.compiler.source> <!-- As per sourceCompatibility -->
-        <maven.compiler.target>11</maven.compiler.target> <!-- As per sourceCompatibility -->
+        <maven.compiler.source>25</maven.compiler.source> <!-- As per sourceCompatibility -->
+        <maven.compiler.target>25</maven.compiler.target> <!-- As per sourceCompatibility -->
     </properties>
 
     <repositories>
@@ -53,6 +53,7 @@
                         <Bundle-Activator><!-- Placeholder, replace with actual activator package --></Bundle-Activator>
                         <Import-Package>*</Import-Package>
                         <!-- Any additional instructions go here -->
+                        <_noee>true</_noee>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/com.dotcms.fixasset/pom.xml b/com.dotcms.fixasset/pom.xml
index 90253e31..968401f2 100644
--- a/com.dotcms.fixasset/pom.xml
+++ b/com.dotcms.fixasset/pom.xml
@@ -17,8 +17,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>25</maven.compiler.source>
+        <maven.compiler.target>25</maven.compiler.target>
     </properties>
 
     <repositories>
@@ -53,6 +53,7 @@
                         <Bundle-Activator>com.dotcms.osgi.fixasset.Activator</Bundle-Activator>
                         <DynamicImport-Package>*</DynamicImport-Package>
                         <Import-Package>*</Import-Package>
+                        <_noee>true</_noee>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/com.dotcms.hooks.pubsub/pom.xml b/com.dotcms.hooks.pubsub/pom.xml
index 9d9865ca..b34a7925 100644
--- a/com.dotcms.hooks.pubsub/pom.xml
+++ b/com.dotcms.hooks.pubsub/pom.xml
@@ -17,8 +17,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>25</maven.compiler.source>
+        <maven.compiler.target>25</maven.compiler.target>
     </properties>
 
     <repositories>
@@ -52,6 +52,7 @@
                         <Bundle-DocURL>https://dotcms.com/</Bundle-DocURL>
                         <Bundle-Activator>com.dotcms.osgi.hooks.Activator</Bundle-Activator>
                         <Import-Package>*</Import-Package>
+                        <_noee>true</_noee>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/com.dotcms.hooks.validations/pom.xml b/com.dotcms.hooks.validations/pom.xml
index 20e04251..b437255c 100644
--- a/com.dotcms.hooks.validations/pom.xml
+++ b/com.dotcms.hooks.validations/pom.xml
@@ -17,8 +17,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>25</maven.compiler.source>
+        <maven.compiler.target>25</maven.compiler.target>
     </properties>
 
     <repositories>
@@ -52,6 +52,7 @@
                         <Bundle-DocURL>https://dotcms.com/</Bundle-DocURL>
                         <Bundle-Activator>com.dotcms.osgi.hooks.Activator</Bundle-Activator>
                         <Import-Package>*</Import-Package>
+                        <_noee>true</_noee>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/com.dotcms.hooks/pom.xml b/com.dotcms.hooks/pom.xml
index 9226f595..8ac6c1e5 100644
--- a/com.dotcms.hooks/pom.xml
+++ b/com.dotcms.hooks/pom.xml
@@ -17,8 +17,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>25</maven.compiler.source>
+        <maven.compiler.target>25</maven.compiler.target>
     </properties>
 
     <repositories>
@@ -52,6 +52,7 @@
                         <Bundle-DocURL>https://dotcms.com/</Bundle-DocURL>
                         <Bundle-Activator>com.dotcms.osgi.hooks.Activator</Bundle-Activator>
                         <Import-Package>*</Import-Package>
+                        <_noee>true</_noee>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/com.dotcms.job/pom.xml b/com.dotcms.job/pom.xml
index 6b82b7fc..8bbf2a70 100644
--- a/com.dotcms.job/pom.xml
+++ b/com.dotcms.job/pom.xml
@@ -17,8 +17,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>25</maven.compiler.source>
+        <maven.compiler.target>25</maven.compiler.target>
     </properties>
 
     <repositories>
@@ -52,6 +52,7 @@
                         <Bundle-DocURL>https://dotcms.com/</Bundle-DocURL>
                         <Bundle-Activator>com.dotcms.osgi.job.Activator</Bundle-Activator>
                         <Import-Package>*</Import-Package>
+                        <_noee>true</_noee>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/com.dotcms.portlet/pom.xml b/com.dotcms.portlet/pom.xml
index d6de8ce8..545926ff 100644
--- a/com.dotcms.portlet/pom.xml
+++ b/com.dotcms.portlet/pom.xml
@@ -17,8 +17,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>25</maven.compiler.source>
+        <maven.compiler.target>25</maven.compiler.target>
     </properties>
 
     <repositories>
@@ -52,6 +52,7 @@
                         <Bundle-DocURL>https://dotcms.com/</Bundle-DocURL>
                         <Bundle-Activator>com.dotcms.osgi.portlet.Activator</Bundle-Activator>
                         <Import-Package>*</Import-Package>
+                        <_noee>true</_noee>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/com.dotcms.pushpublish.listener/pom.xml b/com.dotcms.pushpublish.listener/pom.xml
index e10a2610..372f9778 100644
--- a/com.dotcms.pushpublish.listener/pom.xml
+++ b/com.dotcms.pushpublish.listener/pom.xml
@@ -17,8 +17,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>25</maven.compiler.source>
+        <maven.compiler.target>25</maven.compiler.target>
     </properties>
 
     <repositories>
@@ -52,6 +52,7 @@
                         <Bundle-DocURL>https://dotcms.com/</Bundle-DocURL>
                         <Bundle-Activator>com.dotcms.pushpublish.Activator</Bundle-Activator>
                         <Import-Package>*</Import-Package>
+                        <_noee>true</_noee>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/com.dotcms.rest/pom.xml b/com.dotcms.rest/pom.xml
index a3b3a549..e2f04bd8 100644
--- a/com.dotcms.rest/pom.xml
+++ b/com.dotcms.rest/pom.xml
@@ -17,8 +17,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>25</maven.compiler.source>
+        <maven.compiler.target>25</maven.compiler.target>
     </properties>
 
     <repositories>
@@ -52,6 +52,7 @@
                         <Bundle-DocURL>https://dotcms.com/</Bundle-DocURL>
                         <Bundle-Activator>com.dotcms.plugin.rest.Activator</Bundle-Activator>
                         <Import-Package>*</Import-Package>
+                        <_noee>true</_noee>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/com.dotcms.ruleengine.velocityscriptingactionlet/pom.xml b/com.dotcms.ruleengine.velocityscriptingactionlet/pom.xml
index 263e8d07..0a5a60e8 100644
--- a/com.dotcms.ruleengine.velocityscriptingactionlet/pom.xml
+++ b/com.dotcms.ruleengine.velocityscriptingactionlet/pom.xml
@@ -17,8 +17,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>25</maven.compiler.source>
+        <maven.compiler.target>25</maven.compiler.target>
     </properties>
 
     <repositories>
@@ -76,6 +76,7 @@
                         <Bundle-DocURL>https://dotcms.com/</Bundle-DocURL>
                         <Bundle-Activator>com.dotcms.osgi.ruleengine.actionlet.Activator</Bundle-Activator>
                         <Import-Package>*</Import-Package>
+                        <_noee>true</_noee>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/com.dotcms.ruleengine.visitoripconditionlet/pom.xml b/com.dotcms.ruleengine.visitoripconditionlet/pom.xml
index 72d4aa3c..fb1dba90 100644
--- a/com.dotcms.ruleengine.visitoripconditionlet/pom.xml
+++ b/com.dotcms.ruleengine.visitoripconditionlet/pom.xml
@@ -17,8 +17,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>25</maven.compiler.source>
+        <maven.compiler.target>25</maven.compiler.target>
     </properties>
 
     <repositories>
@@ -82,6 +82,7 @@
                         <Bundle-DocURL>https://dotcms.com/</Bundle-DocURL>
                         <Bundle-Activator>com.dotcms.osgi.ruleengine.conditionlet.Activator</Bundle-Activator>
                         <Import-Package>*</Import-Package>
+                        <_noee>true</_noee>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/com.dotcms.simpleService/pom.xml b/com.dotcms.simpleService/pom.xml
index d537b5f6..c658133b 100644
--- a/com.dotcms.simpleService/pom.xml
+++ b/com.dotcms.simpleService/pom.xml
@@ -17,8 +17,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>25</maven.compiler.source>
+        <maven.compiler.target>25</maven.compiler.target>
     </properties>
 
     <repositories>
@@ -53,6 +53,7 @@
                         <Bundle-Activator>com.dotcms.osgi.service.Activator</Bundle-Activator>
                         <Export-Package>com.dotcms.osgi.service</Export-Package>
                         <Import-Package>*</Import-Package>
+                        <_noee>true</_noee>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/com.dotcms.staticpublish.listener/pom.xml b/com.dotcms.staticpublish.listener/pom.xml
index 1333998f..aa3cbd48 100644
--- a/com.dotcms.staticpublish.listener/pom.xml
+++ b/com.dotcms.staticpublish.listener/pom.xml
@@ -17,8 +17,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>25</maven.compiler.source>
+        <maven.compiler.target>25</maven.compiler.target>
     </properties>
 
     <repositories>
@@ -52,6 +52,7 @@
                         <Bundle-DocURL>https://dotcms.com/</Bundle-DocURL>
                         <Bundle-Activator>com.dotcms.staticpublish.Activator</Bundle-Activator>
                         <Import-Package>*</Import-Package>
+                        <_noee>true</_noee>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/com.dotcms.tuckey/pom.xml b/com.dotcms.tuckey/pom.xml
index a3576d74..50c9d691 100644
--- a/com.dotcms.tuckey/pom.xml
+++ b/com.dotcms.tuckey/pom.xml
@@ -17,8 +17,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>25</maven.compiler.source>
+        <maven.compiler.target>25</maven.compiler.target>
     </properties>
 
     <repositories>
@@ -55,6 +55,7 @@
                         <Bundle-Activator>com.dotcms.tuckey.Activator</Bundle-Activator>
                         <Import-Package>*</Import-Package>
                         <!-- Additional Bundle instructions as needed -->
+                        <_noee>true</_noee>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/com.dotcms.viewtool/pom.xml b/com.dotcms.viewtool/pom.xml
index 53ed5017..f13ac844 100644
--- a/com.dotcms.viewtool/pom.xml
+++ b/com.dotcms.viewtool/pom.xml
@@ -17,9 +17,9 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-        <maven.compiler.release>11</maven.compiler.release>
+        <maven.compiler.source>25</maven.compiler.source>
+        <maven.compiler.target>25</maven.compiler.target>
+        <maven.compiler.release>25</maven.compiler.release>
     </properties>
 
     <repositories>
@@ -74,6 +74,7 @@
                         <Bundle-DocURL>https://dotcms.com/</Bundle-DocURL>
                         <Bundle-Activator>com.dotcms.osgi.viewtools.Activator</Bundle-Activator>
                         <Import-Package>*</Import-Package>
+                        <_noee>true</_noee>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/com.dotcms.webinterceptor/pom.xml b/com.dotcms.webinterceptor/pom.xml
index e7cdb4e8..045214bf 100644
--- a/com.dotcms.webinterceptor/pom.xml
+++ b/com.dotcms.webinterceptor/pom.xml
@@ -17,8 +17,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>25</maven.compiler.source>
+        <maven.compiler.target>25</maven.compiler.target>
     </properties>
 
     <repositories>
@@ -52,6 +52,7 @@
                         <Bundle-DocURL>https://dotcms.com/</Bundle-DocURL>
                         <Bundle-Activator>com.dotcms.osgi.webinterceptors.Activator</Bundle-Activator>
                         <Import-Package>*</Import-Package>
+                        <_noee>true</_noee>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/pom.xml b/pom.xml
index e79f9765..7d7dc9a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,8 +13,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>21</maven.compiler.source>
-        <maven.compiler.target>21</maven.compiler.target>
+        <maven.compiler.source>25</maven.compiler.source>
+        <maven.compiler.target>25</maven.compiler.target>
         <dotcms-core.version>26.03.27-01</dotcms-core.version>
     </properties>