diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 92b1aae3..c26984e8 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest ]
-        java-version: [ 11.0.3, 11 ]
+        java-version: [ 25 ]
     steps:
     - uses: actions/checkout@v2
     - name: Set up JDK ${{ matrix.java-version }}
diff --git a/Changes.md b/Changes.md
index 0802ba96..1af37368 100644
--- a/Changes.md
+++ b/Changes.md
@@ -1,8 +1,8 @@
 ### Changes
 
-### version 3.31
+### version 3.31.0 on April 20, 2026
 
-* GitHub PR #480, #484, #486, #491, #492
+* GitHub PR #480, #484, #486, #491, #492, #495, #506
 
 ### version 3.30.2 on December 25, 2023
 
diff --git a/README.md b/README.md
index c21f8382..918bbc79 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 Java bytecode engineering toolkit
 ### [Javassist version 3](http://www.javassist.org)
 
-Copyright (C) 1999-2023 by Shigeru Chiba, All rights reserved.
+Copyright (C) 1999-2026 by Shigeru Chiba, All rights reserved.
 
 Javassist (JAVA programming ASSISTant) makes Java bytecode manipulation
 simple. It is a class library for editing bytecodes in Java; it enables Java
diff --git a/build.xml b/build.xml
index 6fec7edf..78d0e55f 100644
--- a/build.xml
+++ b/build.xml
@@ -6,7 +6,7 @@
 
 <project name="javassist" default="jar" basedir=".">
 
-  <property name="dist-version" value="javassist-3.30.2-GA"/>
+  <property name="dist-version" value="javassist-3.31.0-GA"/>
 
   <property environment="env"/>
   <property name="target.jar" value="javassist.jar"/>
diff --git a/javassist.jar b/javassist.jar
index 0fbf8ed5..a630a582 100644
Binary files a/javassist.jar and b/javassist.jar differ
diff --git a/pom.xml b/pom.xml
index d13fee29..b71e427b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>org.javassist</groupId>
   <artifactId>javassist</artifactId>
-  <version>3.30.2-GA</version>
+  <version>3.31.0-GA</version>
   <packaging>bundle</packaging>
   <name>Javassist</name>
   <description>
@@ -295,7 +295,7 @@ Copyright (C) ${project.inceptionYear}- Shigeru Chiba. All Rights Reserved.</i>]
       <!-- obviously we need to use the Sonatype staging repo for upload -->
       <distributionManagement>
         <repository>
-          <id>sonatype-releases-repository</id>
+          <id>central</id>
           <name>Sonatype Releases Repository</name>
           <url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
         </repository>
@@ -303,6 +303,15 @@ Copyright (C) ${project.inceptionYear}- Shigeru Chiba. All Rights Reserved.</i>]
       <!-- we need to be able to sign the jars we install -->
       <build>
         <plugins>
+          <plugin>
+            <groupId>org.sonatype.central</groupId>
+            <artifactId>central-publishing-maven-plugin</artifactId>
+            <version>0.9.0</version>
+            <extensions>true</extensions>
+            <configuration>
+              <publishingServerId>central</publishingServerId>
+            </configuration>
+          </plugin>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
@@ -324,40 +333,5 @@ Copyright (C) ${project.inceptionYear}- Shigeru Chiba. All Rights Reserved.</i>]
         </plugins>
       </build>
     </profile>
-    <!-- profiles to add tools jar containing com.sun.jdi code
-         needed by sample code
-      -->
-    <profile>
-      <id>default-tools</id>
-      <activation>
-        <jdk>[,1.8]</jdk>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>com.sun</groupId>
-          <artifactId>tools</artifactId>
-          <version>${java.version}</version>
-          <scope>system</scope>
-          <optional>true</optional>
-          <systemPath>${java.home}/../lib/tools.jar</systemPath>
-        </dependency>
-      </dependencies>
-    </profile>
-    <profile>
-      <id>java9-tools</id>
-      <activation>
-        <jdk>[1.9,]</jdk>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>com.sun</groupId>
-          <artifactId>tools</artifactId>
-          <version>${java.version}</version>
-          <scope>system</scope>
-          <optional>true</optional>
-          <systemPath>${java.home}/lib/jrt-fs.jar</systemPath>
-        </dependency>
-      </dependencies>
-    </profile>
   </profiles>
 </project>
diff --git a/src/main/javassist/CtClass.java b/src/main/javassist/CtClass.java
index 3b73f8ac..2954bc45 100644
--- a/src/main/javassist/CtClass.java
+++ b/src/main/javassist/CtClass.java
@@ -69,7 +69,7 @@ public abstract class CtClass {
     /**
      * The version number of this release.
      */
-    public static final String version = "3.30.2-GA";
+    public static final String version = "3.31.0-GA";
 
     private int linesCount = 0;
 
@@ -82,7 +82,7 @@ public abstract class CtClass {
      */
     public static void main(String[] args) {
         System.out.println("Javassist version " + CtClass.version);
-        System.out.println("Copyright (C) 1999-2023 Shigeru Chiba."
+        System.out.println("Copyright (C) 1999-2026 Shigeru Chiba."
                            + " All Rights Reserved.");
     }
 
diff --git a/src/test/javassist/bytecode/BytecodeTest.java b/src/test/javassist/bytecode/BytecodeTest.java
index 68e3b2c2..cbd8410a 100644
--- a/src/test/javassist/bytecode/BytecodeTest.java
+++ b/src/test/javassist/bytecode/BytecodeTest.java
@@ -313,7 +313,7 @@ public void testRenameClass() throws Exception {
 
     public void testDeprecatedAttribute() throws Exception {
         CtClass cc = loader.get("java.lang.Thread");
-        CtMethod m = cc.getDeclaredMethod("suspend");
+        CtMethod m = cc.getDeclaredMethod("stop");
         MethodInfo minfo = m.getMethodInfo();
         DeprecatedAttribute ainfo
             = (DeprecatedAttribute)minfo.getAttribute(DeprecatedAttribute.tag);