Merge remote-tracking branch 'upstream/master'

google · Nov 26, 2023 · 2a2ca85 · 2a2ca85
2 parents f99fcf8 + 5d65702
commit 2a2ca85
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/mug-errorprone/pom.xml b/mug-errorprone/pom.xml
@@ -150,7 +150,7 @@
 	<dependency>
 	  <groupId>com.google.mug</groupId>
 	  <artifactId>mug-guava</artifactId>
-	  <version>${version}</version>
+	  <version>${project.version}</version>
 	</dependency>
   </dependencies>
 </project>
diff --git a/mug-protobuf/pom.xml b/mug-protobuf/pom.xml
@@ -57,7 +57,7 @@
 		<groupId>com.google.mug</groupId>
 		<artifactId>mug-guava</artifactId>
 		<scope>test</scope>
-		<version>${version}</version>
+		<version>${project.version}</version>
 	</dependency>
   </dependencies>
 </project>
diff --git a/mug/src/main/java/com/google/mu/util/StringFormat.java b/mug/src/main/java/com/google/mu/util/StringFormat.java
@@ -500,7 +500,7 @@ public final <R> Optional<R> parseGreedy(
   }
 
   /**
-   * Similar to {@link #parse(String, MapFrom3)}, parses {@code input} and applies {@code mapper}
+   * Similar to {@link #parse(String, Ternary)}, parses {@code input} and applies {@code mapper}
    * with the 3 placeholder values in this format string, but matches the placeholders backwards
    * from the end to the beginning of the input string.
    *
@@ -518,7 +518,7 @@ public final <R> Optional<R> parseGreedy(
   }
 
   /**
-   * Similar to {@link #parse(String, MapFrom4)}, parses {@code input} and applies {@code mapper}
+   * Similar to {@link #parse(String, Quarternary)}, parses {@code input} and applies {@code mapper}
    * with the 3 placeholder values in this format string, but matches the placeholders backwards
    * from the end to the beginning of the input string.
    *
@@ -536,7 +536,7 @@ public final <R> Optional<R> parseGreedy(
   }
 
   /**
-   * Similar to {@link #parse(String, MapFrom5)}, parses {@code input} and applies {@code mapper}
+   * Similar to {@link #parse(String, Quinary)}, parses {@code input} and applies {@code mapper}
    * with the 5 placeholder values in this format string, but matches the placeholders backwards
    * from the end to the beginning of the input string.
    *