Skip to content

Commit a0160db

Browse files
slawekjaranowskislawekjaranowski
committed
Simplify docs configuration
Currently, we have a standard parent in docs modules, so we do not need to override already defined items
1 parent ae7bfb1 commit a0160db

6 files changed

Lines changed: 17 additions & 80 deletions

File tree

‎docs/maven-extensions/src/site/site.xml‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,13 @@ under the License.
2121

2222
<site xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2323
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd">
24+
25+
<!-- we need to provide url for edit as scm in docs point to root -->
26+
<edit>https://github.com/apache/maven-parent/tree/${project.scm.tag}/docs/maven-extensions</edit>
27+
2428
<body>
2529
<breadcrumbs>
26-
<item name="Maven" href="https://maven.apache.org/pom/maven/index.html" />
2730
<item name="Extensions" href="https://maven.apache.org/pom/maven/maven-extensions/index.html" />
2831
</breadcrumbs>
29-
30-
<menu name="Maven Parent POMs">
31-
<item name="Maven" href="../index.html" />
32-
<item name="Plugins" href="../maven-plugins/index.html" />
33-
<item name="Extensions" href="index.html" />
34-
<item name="Shared Components" href="../maven-shared-components/index.html" />
35-
<item name="Skins" href="../maven-skins/index.html" />
36-
</menu>
37-
3832
</body>
3933
</site>

‎docs/maven-plugins/src/site/site.xml‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,12 @@ under the License.
2222
<site xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2323
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd">
2424

25+
<!-- we need to provide url for edit as scm in docs point to root -->
26+
<edit>https://github.com/apache/maven-parent/tree/${project.scm.tag}/docs/maven-plugins</edit>
27+
2528
<body>
2629
<breadcrumbs>
27-
<item name="Maven" href="https://maven.apache.org/pom/maven/index.html" />
2830
<item name="Plugins" href="https://maven.apache.org/pom/maven/maven-plugins/index.html" />
2931
</breadcrumbs>
30-
31-
<menu name="Maven Parent POMs">
32-
<item name="Maven" href="../index.html" />
33-
<item name="Plugins" href="index.html" />
34-
<item name="Extensions" href="../maven-extensions/index.html" />
35-
<item name="Shared Components" href="../maven-shared-components/index.html" />
36-
<item name="Skins" href="../maven-skins/index.html" />
37-
</menu>
38-
3932
</body>
4033
</site>

‎docs/maven-shared-components/src/site/site.xml‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,12 @@ under the License.
2222
<site xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2323
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd">
2424

25+
<!-- we need to provide url for edit as scm in docs point to root -->
26+
<edit>https://github.com/apache/maven-parent/tree/${project.scm.tag}/docs/maven-shared-components</edit>
27+
2528
<body>
2629
<breadcrumbs>
27-
<item name="Maven" href="https://maven.apache.org/pom/maven/index.html" />
2830
<item name="Shared Components" href="https://maven.apache.org/pom/maven/maven-shared-components/index.html" />
2931
</breadcrumbs>
30-
31-
<menu name="Maven Parent POMs">
32-
<item name="Maven" href="../index.html" />
33-
<item name="Plugins" href="../maven-plugins/index.html" />
34-
<item name="Extensions" href="../maven-extensions/index.html" />
35-
<item name="Shared Components" href="index.html" />
36-
<item name="Skins" href="../maven-skins/index.html" />
37-
</menu>
38-
3932
</body>
4033
</site>

‎docs/maven-skins/src/site/site.xml‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,12 @@ under the License.
2222
<site xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2323
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd">
2424

25+
<!-- we need to provide url for edit as scm in docs point to root -->
26+
<edit>https://github.com/apache/maven-parent/tree/${project.scm.tag}/docs/maven-skins</edit>
27+
2528
<body>
2629
<breadcrumbs>
27-
<item name="Maven" href="https://maven.apache.org/pom/maven/index.html" />
2830
<item name="Skins" href="https://maven.apache.org/pom/maven/maven-skins/index.html" />
2931
</breadcrumbs>
30-
31-
<menu name="Maven Parent POMs">
32-
<item name="Maven" href="../index.html" />
33-
<item name="Plugins" href="../maven-plugins/index.html" />
34-
<item name="Extensions" href="../maven-extensions/index.html" />
35-
<item name="Shared Components" href="../maven-shared-components/index.html" />
36-
<item name="Skins" href="index.html" />
37-
</menu>
38-
3932
</body>
4033
</site>

‎docs/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ under the License.
4242

4343
<scm>
4444
<tag>master</tag>
45-
<url>https://github.com/apache/maven-parent/tree/${project.scm.tag}/</url>
45+
<url>https://github.com/apache/maven-parent/tree/${project.scm.tag}</url>
4646
</scm>
4747

4848
<issueManagement>

‎docs/src/site/site.xml‎

Lines changed: 3 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -22,48 +22,12 @@ under the License.
2222
<site xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2323
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd">
2424

25-
<!-- Start copy/paste of src/site/site.xml: inheritance does not work here because of src/site-docs hack -->
26-
<bannerLeft href="https://www.apache.org/">
27-
<image src="https://maven.apache.org/images/apache-maven-project.png"/>
28-
</bannerLeft>
29-
30-
<bannerRight href="https://maven.apache.org/">
31-
<image src="https://maven.apache.org/images/maven-logo-black-on-white.png"/>
32-
</bannerRight>
33-
34-
<skin>
35-
<groupId>org.apache.maven.skins</groupId>
36-
<artifactId>maven-fluido-skin</artifactId>
37-
<version>${version.maven-fluido-skin}</version>
38-
</skin>
39-
40-
<edit>${project.scm.url}</edit>
41-
42-
<custom>
43-
<matomo>
44-
<siteId>3</siteId>
45-
<url>https://analytics.apache.org/</url>
46-
<options>
47-
<disableCookies/>
48-
<trackPageView/>
49-
<enableLinkTracking/>
50-
</options>
51-
</matomo>
52-
<fluidoSkin>
53-
<sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
54-
<anchorJs />
55-
</fluidoSkin>
56-
</custom>
57-
58-
<publishDate position="right" />
59-
<version position="right" />
60-
<!-- End copy/paste of src/site/site.xml -->
25+
<!-- we need to provide url for edit as scm in docs point to root -->
26+
<edit>https://github.com/apache/maven-parent/tree/${project.scm.tag}/docs</edit>
6127

6228
<body>
6329

6430
<breadcrumbs>
65-
<item name="Apache" href="https://www.apache.org/" />
66-
<item name="Maven" href="https://maven.apache.org/index.html" />
6731
<item name="Parent POMs" href="https://maven.apache.org/pom/index.html" />
6832
<item name="Maven" href="https://maven.apache.org/pom/maven/index.html" />
6933
</breadcrumbs>
@@ -75,7 +39,7 @@ under the License.
7539
<item name="Download" href="download.html"/>
7640
</menu>
7741

78-
<menu name="Maven Parent POMs">
42+
<menu name="Maven Parent POMs" inherit="top">
7943
<item name="Maven" href="index.html"/>
8044
<item name="Plugins" href="maven-plugins/index.html"/>
8145
<item name="Extensions" href="maven-extensions/index.html"/>

0 commit comments

Comments
 (0)