merge master

apache · Mar 1, 2024 · 1677c5d · 1677c5d
2 parents 9ea0b96 + 98ada55
commit 1677c5d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/src/site/apt/index.apt.vm b/src/site/apt/index.apt.vm
@@ -26,14 +26,14 @@
 ${project.name}
 
   The Toolchains Plugins enables sharing configuration across plugins,
-  for example to make sure the plugins like compiler, surefire, javadoc, webstart etc. all use the same JDK for execution.
+  for example to make sure the plugins like compiler, surefire, javadoc, webstart etc. all use the same JDK for execution independently from JRE used to run Maven itself.
   Similarly to the maven-enforcer-plugin, it allows you to control environmental constraints in the build.
 
 * Goals Overview
 
   The Toolchains plugin has one goal:
 
-  * {{{./toolchain-mojo.html}toolchains:toolchain}} checks that toolchains requirements are met by currently configured toolchains.
+  * {{{./toolchain-mojo.html}toolchains:toolchain}} selects a toolchain based on configured requirements and stores it in build context for later retrieval by other plugins.
 
 * Usage
 

diff --git a/src/site/apt/toolchains/custom.apt b/src/site/apt/toolchains/custom.apt
@@ -38,7 +38,7 @@ Custom Toolchains
 
   Following instructions are explanations of key points of the sample.
 
-* Creating Custom Toolchain
+* Creating a Custom Toolchain
 
   A toolchain consists in:
 
@@ -67,7 +67,7 @@ Custom Toolchains
     @Component
     private ToolchainManager toolchainManager;
 
-    @Parameter( defaultValue = "${session}", required = true, readonly = true )
+    @Component
     private MavenSession session;
 
     public void execute()

diff --git a/src/site/site.xml b/src/site/site.xml
@@ -25,15 +25,16 @@ under the License.
   <body>
     <menu name="Overview">
       <item name="Introduction" href="index.html"/>
-      <item name="Goals" href="plugin-info.html"/>
-      <item name="Usage" href="usage.html"/>
+      <item name="Goals" href="plugin-info.html">
+        <item name="toolchains:toolchain" href="toolchain-mojo.html"/>
+      </item>
+      <item name="Usage" href="usage.html">
+        <item name="Standard Toolchains" href="toolchains/index.html"/>
+        <item name="JDK Standard Toolchain" href="toolchains/jdk.html"/>
+        <item name="Custom Toolchains" href="toolchains/custom.html"/>
+      </item>
       <item name="License" href="https://www.apache.org/licenses/"/>
       <item name="Download" href="download.html"/>
     </menu>
-    <menu name="Toolchains">
-      <item name="Standard Toolchains" href="toolchains/index.html"/>
-      <item name="JDK Standard Toolchain" href="toolchains/jdk.html"/>
-      <item name="Custom Toolchains" href="toolchains/custom.html"/>
-    </menu>
   </body>
 </project>