You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2024/03/24 21:16:58 UTC
(maven) branch master updated (a075afa20a -> 6e508869f0)
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
discard a075afa20a configure javadoc groups
new 6e508869f0 configure javadoc groups
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (a075afa20a)
\
N -- N -- N refs/heads/master (6e508869f0)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
maven-bom/src/site/site.xml | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
(maven) 01/01: configure javadoc groups
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 6e508869f0d6551d13c58a290661b1ba09ca787c
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sun Mar 24 21:55:51 2024 +0100
configure javadoc groups
---
apache-maven/src/site/site.xml | 6 ++++
.../maven-api-di}/src/site/site.xml | 12 +++++++
.../maven-api-spi}/src/site/site.xml | 12 +++++++
maven-bom/src/site/site.xml | 28 +++++++++++++++
{apache-maven => maven-di}/src/site/site.xml | 9 +++++
{apache-maven => maven-jline}/src/site/site.xml | 9 +++++
pom.xml | 38 +++++++++++++++++++++
src/site/resources/images/maven-deps.svg | 27 +++++++++++----
src/site/xdoc/maven-deps.odg | Bin 35609 -> 35992 bytes
9 files changed, 134 insertions(+), 7 deletions(-)
diff --git a/apache-maven/src/site/site.xml b/apache-maven/src/site/site.xml
index 71da9b0f1a..1a473b3475 100644
--- a/apache-maven/src/site/site.xml
+++ b/apache-maven/src/site/site.xml
@@ -23,4 +23,10 @@ under the License.
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
<edit>${project.scm.url}</edit>
+
+ <body>
+ <menu name="Overview">
+ <item name="Introduction" href="index.html"/>
+ </menu>
+ </body>
</project>
\ No newline at end of file
diff --git a/apache-maven/src/site/site.xml b/api/maven-api-di/src/site/site.xml
similarity index 76%
copy from apache-maven/src/site/site.xml
copy to api/maven-api-di/src/site/site.xml
index 71da9b0f1a..8ffe43d07c 100644
--- a/apache-maven/src/site/site.xml
+++ b/api/maven-api-di/src/site/site.xml
@@ -23,4 +23,16 @@ under the License.
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
<edit>${project.scm.url}</edit>
+
+ <body>
+ <menu name="Overview">
+ <item name="Introduction" href="index.html"/>
+ <item name="Javadocs" href="apidocs/index.html"/>
+ <item name="Source Xref" href="xref/index.html"/>
+ <!--item name="FAQ" href="faq.html"/-->
+ </menu>
+
+ <menu ref="parent"/>
+ <menu ref="reports"/>
+ </body>
</project>
\ No newline at end of file
diff --git a/apache-maven/src/site/site.xml b/api/maven-api-spi/src/site/site.xml
similarity index 76%
copy from apache-maven/src/site/site.xml
copy to api/maven-api-spi/src/site/site.xml
index 71da9b0f1a..8ffe43d07c 100644
--- a/apache-maven/src/site/site.xml
+++ b/api/maven-api-spi/src/site/site.xml
@@ -23,4 +23,16 @@ under the License.
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
<edit>${project.scm.url}</edit>
+
+ <body>
+ <menu name="Overview">
+ <item name="Introduction" href="index.html"/>
+ <item name="Javadocs" href="apidocs/index.html"/>
+ <item name="Source Xref" href="xref/index.html"/>
+ <!--item name="FAQ" href="faq.html"/-->
+ </menu>
+
+ <menu ref="parent"/>
+ <menu ref="reports"/>
+ </body>
</project>
\ No newline at end of file
diff --git a/maven-bom/src/site/site.xml b/maven-bom/src/site/site.xml
index e6ace57357..f9c6913f9e 100644
--- a/maven-bom/src/site/site.xml
+++ b/maven-bom/src/site/site.xml
@@ -28,10 +28,38 @@ under the License.
<href>https://maven.apache.org/</href>
</bannerLeft>
+ <bannerRight>
+ <src>https://maven.apache.org/images/maven-logo-black-on-white.png</src>
+ <href>https://maven.apache.org/</href>
+ </bannerRight>
+
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.11.2</version>
+ </skin>
+
<edit>${project.scm.url}</edit>
+ <custom>
+ <matomo>
+ <siteId>3</siteId>
+ <url>https://analytics.apache.org/</url>
+ <options>
+ <disableCookies/>
+ <trackPageView/>
+ <enableLinkTracking/>
+ </options>
+ </matomo>
+ </custom>
+
+ <publishDate position="right" />
+ <version position="right" />
+
<body>
<breadcrumbs>
+ <item name="Apache" href="https://www.apache.org/" />
+ <item name="Maven" href="https://maven.apache.org/index.html" />
<item name="Ref" href="../" />
<item name="Maven ${project.version}" href="../" />
<item name="${project.name}" href="./" />
diff --git a/apache-maven/src/site/site.xml b/maven-di/src/site/site.xml
similarity index 79%
copy from apache-maven/src/site/site.xml
copy to maven-di/src/site/site.xml
index 71da9b0f1a..78e98089a6 100644
--- a/apache-maven/src/site/site.xml
+++ b/maven-di/src/site/site.xml
@@ -23,4 +23,13 @@ under the License.
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
<edit>${project.scm.url}</edit>
+
+ <body>
+ <menu name="Overview">
+ <item name="Introduction" href="index.html"/>
+ <item name="Javadocs" href="apidocs/index.html"/>
+ <item name="Source Xref" href="xref/index.html"/>
+ <!--item name="FAQ" href="faq.html"/-->
+ </menu>
+ </body>
</project>
\ No newline at end of file
diff --git a/apache-maven/src/site/site.xml b/maven-jline/src/site/site.xml
similarity index 79%
copy from apache-maven/src/site/site.xml
copy to maven-jline/src/site/site.xml
index 71da9b0f1a..78e98089a6 100644
--- a/apache-maven/src/site/site.xml
+++ b/maven-jline/src/site/site.xml
@@ -23,4 +23,13 @@ under the License.
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
<edit>${project.scm.url}</edit>
+
+ <body>
+ <menu name="Overview">
+ <item name="Introduction" href="index.html"/>
+ <item name="Javadocs" href="apidocs/index.html"/>
+ <item name="Source Xref" href="xref/index.html"/>
+ <!--item name="FAQ" href="faq.html"/-->
+ </menu>
+ </body>
</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index d0cc58f1d2..7a955519c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -876,6 +876,44 @@ under the License.
<head>Provisional:</head>
</tag>
</tags>
+ <groups>
+ <group>
+ <title>Maven 4 API - Core</title>
+ <packages>org.apache.maven.api*</packages>
+ </group>
+ <group>
+ <title>Maven 4 API - Plugin</title>
+ <packages>org.apache.maven.api.plugin.descriptor*</packages>
+ </group>
+ <group>
+ <title>Maven 4 API - Model</title>
+ <packages>org.apache.maven.api.model</packages>
+ </group>
+ <group>
+ <title>Maven 4 API - Settings</title>
+ <packages>org.apache.maven.api.settings</packages>
+ </group>
+ <group>
+ <title>Maven 4 API - Toolchain</title>
+ <packages>org.apache.maven.api.toolchain</packages>
+ </group>
+ <group>
+ <title>Maven 4 API - Meta</title>
+ <packages>org.apache.maven.api.annotations</packages>
+ </group>
+ <group>
+ <title>Maven 4 API - DI</title>
+ <packages>org.apache.maven.api.di</packages>
+ </group>
+ <group>
+ <title>Maven 4 API - SPI</title>
+ <packages>org.apache.maven.api.spi</packages>
+ </group>
+ <group>
+ <title>Maven 4 API - XML</title>
+ <packages>org.apache.maven.api.xml</packages>
+ </group>
+ </groups>
</configuration>
<reportSets>
<reportSet>
diff --git a/src/site/resources/images/maven-deps.svg b/src/site/resources/images/maven-deps.svg
index 2521da8dc9..5b3333a926 100644
--- a/src/site/resources/images/maven-deps.svg
+++ b/src/site/resources/images/maven-deps.svg
@@ -639,11 +639,11 @@
<path d="m23193 15967-28 28 435-95-397-202 19 33 13 38 7 40-1 43-8 42-18 39z"/>
</g>
<g>
- <path fill="none" d="M22399 7891h2203v811h-2203z"/>
+ <path fill="none" d="M22599 7891h2203v811h-2203z"/>
<a target="_parent" xlink:href="../maven-xml-impl/">
- <path fill="#9CF" d="M23500 8700h-1100v-808h2200v808z"/>
- <path fill="none" stroke="#000" d="M23500 8700h-1100v-808h2200v808z"/>
- <text class="SVGTextShape"><tspan class="TextParagraph" font-family="Arial, sans-serif" font-size="494" font-weight="400"><tspan x="22579" y="8468" class="TextPosition"><tspan style="white-space:pre">xml-impl</tspan></tspan></tspan></text>
+ <path fill="#9CF" d="M23700 8700h-1100v-808h2200v808z"/>
+ <path fill="none" stroke="#000" d="M23700 8700h-1100v-808h2200v808z"/>
+ <text class="SVGTextShape"><tspan class="TextParagraph" font-family="Arial, sans-serif" font-size="494" font-weight="400"><tspan x="22779" y="8468" class="TextPosition"><tspan style="white-space:pre">xml-impl</tspan></tspan></tspan></text>
</a>
</g>
<g>
@@ -655,9 +655,9 @@
</a>
</g>
<g>
- <path fill="none" d="M21800 8699h1702v807h-1702z"/>
- <path fill="none" stroke="#000" d="m23500 8700-1339 633"/>
- <path d="m22107 9228 8-39-315 315 443-44-33-17-32-25-28-30-22-37-15-40-7-42z"/>
+ <path fill="none" d="M21800 8699h1902v807h-1902z"/>
+ <path fill="none" stroke="#000" d="m23700 8700-1532 648"/>
+ <path d="m22118 9241 10-38-328 301 444-25-32-19-31-26-26-32-21-37-14-41-4-42z"/>
</g>
<g>
<path fill="none" d="M23455 8699h302v7203h-302z"/>
@@ -719,5 +719,18 @@
<text class="SVGTextShape"><tspan class="TextParagraph" font-family="Arial, sans-serif" font-size="494" font-weight="400"><tspan x="1710" y="4367" class="TextPosition"><tspan style="white-space:pre">jline</tspan></tspan></tspan></text>
</a>
</g>
+ <g>
+ <path fill="none" d="M23999 9089h2403v812h-2403z"/>
+ <a target="_parent" xlink:href="https://github.com/FasterXML/woodstox">
+ <path fill="#FF9" d="M25200 9899h-1200v-809h2400v809z"/>
+ <path fill="none" stroke="#000" d="M25200 9899h-1200v-809h2400v809z"/>
+ <text class="SVGTextShape"><tspan class="TextParagraph" font-family="Arial, sans-serif" font-size="494" font-weight="400"><tspan x="24152" y="9666" class="TextPosition"><tspan style="white-space:pre">woodstox</tspan></tspan></tspan></text>
+ </a>
+ </g>
+ <g>
+ <path fill="none" d="M23700 8699h1502v433h-1502z"/>
+ <path fill="none" stroke="#000" d="m23701 8700 1113 290"/>
+ <path d="m24787 9106-30 24 443-39-368-251 15 35 8 39 2 42-7 42-14 40-22 37z"/>
+ </g>
</g>
</svg>
diff --git a/src/site/xdoc/maven-deps.odg b/src/site/xdoc/maven-deps.odg
index 0953968714..402e7b20c2 100644
Binary files a/src/site/xdoc/maven-deps.odg and b/src/site/xdoc/maven-deps.odg differ