diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index dc59978..d10d16a 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -14,8 +14,8 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v3
         with:
-          distribution: 'adopt'
-          java-version: 21
+          distribution: 'corretto'
+          java-version: 25
           cache: 'maven'
       - name: Maven Build
         run: mvn -B package
diff --git a/pom.xml b/pom.xml
index 5880b6c..3c2e1ed 100755
--- a/pom.xml
+++ b/pom.xml
@@ -42,6 +42,26 @@
         <system>GitHub Issues</system>
     </issueManagement>
 
+    <repositories>
+        <repository>
+            <!--
+            Maven Central repository for SNAPSHOT versions, enabling the use of CloudSim Plus
+            SNAPSHOT versions (such as 9.0.0-SNAPSHOT) before they are released.
+            Final versions are still downloaded from Maven Central, since releases are disabled here.
+            https://central.sonatype.org/publish/publish-portal-snapshots/
+            -->
+            <name>Central Portal Snapshots</name>
+            <id>central-portal-snapshots</id>
+            <url>https://central.sonatype.com/repository/maven-snapshots/</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+
     <dependencies>
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
@@ -104,7 +124,7 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.14.0</version>
                 <configuration>
-                    <release>17</release>
+                    <release>25</release>
                     <annotationProcessorPaths>
                         <path>
                             <groupId>org.openjdk.jmh</groupId>
@@ -141,8 +161,6 @@
                     <compilerArgs>
                         <!-- Error Prone and NullAway settings (see the comments in annotationProcessorPaths above). -->
                         <arg>-XDcompilePolicy=simple</arg>
-                        <!-- Required by Error Prone on JDK 21 -->
-                        <arg>-XDaddTypeAnnotationsToSymbol=true</arg>
                         <arg>--should-stop=ifError=FLOW</arg>
                         <arg>-Xplugin:ErrorProne ${errorprone.args} -Xep:NullAway:ERROR -XepOpt:NullAway:OnlyNullMarked=true</arg>
                     </compilerArgs>