diff --git a/core/pom.xml b/core/pom.xml
index 5b6bbb4d..25df9488 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.google.googlejavaformat</groupId>
     <artifactId>google-java-format-parent</artifactId>
-  <version>HEAD-SNAPSHOT</version>
+  <version>1.25.2</version>
   </parent>
 
   <artifactId>google-java-format</artifactId>
diff --git a/core/src/main/java/com/google/googlejavaformat/java/StringWrapper.java b/core/src/main/java/com/google/googlejavaformat/java/StringWrapper.java
index c1c38d34..5d10da38 100644
--- a/core/src/main/java/com/google/googlejavaformat/java/StringWrapper.java
+++ b/core/src/main/java/com/google/googlejavaformat/java/StringWrapper.java
@@ -225,7 +225,9 @@ private void indentTextBlocks(
           }
           if (i == lines.size() - 1) {
             String withoutDelimiter =
-                trimmed.substring(0, trimmed.length() - TEXT_BLOCK_DELIMITER.length());
+                trimmed
+                    .substring(0, trimmed.length() - TEXT_BLOCK_DELIMITER.length())
+                    .stripTrailing();
             if (!withoutDelimiter.stripLeading().isEmpty()) {
               output.append(withoutDelimiter).append('\\').append(separator).append(prefix);
             }
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/I1205.input b/core/src/test/resources/com/google/googlejavaformat/java/testdata/I1205.input
new file mode 100644
index 00000000..8f8acaa1
--- /dev/null
+++ b/core/src/test/resources/com/google/googlejavaformat/java/testdata/I1205.input
@@ -0,0 +1,7 @@
+public interface Foo {
+
+  private static String foo =
+      """
+       foo\
+       bar """;
+}
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/I1205.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/I1205.output
new file mode 100644
index 00000000..c82862c0
--- /dev/null
+++ b/core/src/test/resources/com/google/googlejavaformat/java/testdata/I1205.output
@@ -0,0 +1,8 @@
+public interface Foo {
+
+  private static String foo =
+      """
+      foo\
+      bar\
+      """;
+}
diff --git a/eclipse_plugin/META-INF/MANIFEST.MF b/eclipse_plugin/META-INF/MANIFEST.MF
index 91324539..2dcc7b2b 100644
--- a/eclipse_plugin/META-INF/MANIFEST.MF
+++ b/eclipse_plugin/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: google-java-format
 Bundle-SymbolicName: google-java-format-eclipse-plugin;singleton:=true
 Bundle-Vendor: Google
-Bundle-Version: 1.13.0
+Bundle-Version: 1.25.2
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.jdt.core;bundle-version="3.10.0",
  org.eclipse.jface,
diff --git a/eclipse_plugin/pom.xml b/eclipse_plugin/pom.xml
index b2c6e368..1fad0e7b 100644
--- a/eclipse_plugin/pom.xml
+++ b/eclipse_plugin/pom.xml
@@ -22,7 +22,7 @@
   <groupId>com.google.googlejavaformat</groupId>
   <artifactId>google-java-format-eclipse-plugin</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>1.13.0</version>
+  <version>1.25.2</version>
 
   <name>Google Java Format Plugin for Eclipse 4.5+</name>
 
diff --git a/idea_plugin/build.gradle.kts b/idea_plugin/build.gradle.kts
index 74cd1bd0..b2405603 100644
--- a/idea_plugin/build.gradle.kts
+++ b/idea_plugin/build.gradle.kts
@@ -18,7 +18,7 @@ import org.jetbrains.intellij.platform.gradle.TestFrameworkType
 
 // https://github.com/JetBrains/intellij-platform-gradle-plugin/releases
 plugins {
-  id("org.jetbrains.intellij.platform") version "2.1.0"
+  id("org.jetbrains.intellij.platform") version "2.2.0"
 }
 
 repositories {
@@ -30,7 +30,7 @@ repositories {
 }
 
 // https://github.com/google/google-java-format/releases
-val googleJavaFormatVersion = "1.25.0"
+val googleJavaFormatVersion = "1.25.1"
 
 java {
   sourceCompatibility = JavaVersion.VERSION_17
diff --git a/idea_plugin/src/main/resources/META-INF/plugin.xml b/idea_plugin/src/main/resources/META-INF/plugin.xml
index 612f922c..edede315 100644
--- a/idea_plugin/src/main/resources/META-INF/plugin.xml
+++ b/idea_plugin/src/main/resources/META-INF/plugin.xml
@@ -35,6 +35,8 @@
   ]]></description>
   <change-notes><![CDATA[
     <dl>
+      <dt>1.25.1.0</dt>
+      <dd>Updated to use google-java-format 1.25.1.</dd>
       <dt>1.25.0.0</dt>
       <dd>Updated to use google-java-format 1.25.0.</dd>
       <dt>1.24.0.0</dt>
diff --git a/pom.xml b/pom.xml
index f6efb7b7..1edcc95e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
   <groupId>com.google.googlejavaformat</groupId>
   <artifactId>google-java-format-parent</artifactId>
   <packaging>pom</packaging>
-  <version>HEAD-SNAPSHOT</version>
+  <version>1.25.2</version>
 
   <modules>
     <module>core</module>