Merge branch 'main' into honor-pcfiledir-in-pkgconfig-files

canonical · Jan 16, 2025 · 79ca8cc · 79ca8cc
2 parents 726bcbd + 563e5a9
commit 79ca8cc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/craft_parts/plugins/maven_plugin.py b/craft_parts/plugins/maven_plugin.py
@@ -58,8 +58,8 @@ def validate_environment(
 
         :param part_dependencies: A list of the parts this part depends on.
 
-        :raises PluginEnvironmentValidationError: If go is invalid
-          and there are no parts named go.
+        :raises PluginEnvironmentValidationError: If maven is invalid
+          and there are no parts named maven-deps.
         """
         version = self.validate_dependency(
             dependency="mvn",

diff --git a/docs/common/craft-parts/craft-parts.wordlist.txt b/docs/common/craft-parts/craft-parts.wordlist.txt
@@ -338,6 +338,7 @@ distro
 distros
 dl
 dnf
+docstring
 dotnet
 dst
 emacs

diff --git a/docs/reference/changelog.rst b/docs/reference/changelog.rst
@@ -11,6 +11,10 @@ Bug fixes:
   source changes.
 - Preserve the ``pcfiledir`` tag in ``pkgconfig`` files.
 
+Documentation:
+
+- Correct the Maven plugin docstring to refer to Maven from Go.
+
 2.2.1 (2024-12-19)
 ------------------
-Original file line number
+Diff line change
@@ Expand Up / @@ -338,6 +338,7 @@ distro @@
     distros
     dl
     dnf
+    docstring
     dotnet
     dst
     emacs
@@ Expand Down @@