Skip to content

Upgrade maven-site-plugin and site.xml #288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ pom.xml.versionsBackup
pom.xml.next
release.properties
.idea/
*.iml
*.iml
./src/site/markdown/README.md
31 changes: 29 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ under the License.
<detectJavaApiLink>false</detectJavaApiLink>
<subpackages>org.scoverage.plugin</subpackages>
<links>
<link>https://docs.oracle.com/javase/11/docs/api/</link>
<link>https://docs.oracle.com/en/java/javase/11/docs/api/</link>
<link>https://maven.apache.org/ref/${maven.version}/apidocs/</link>
<link>https://maven.apache.org/shared-archives/maven-reporting-api-${maven-reporting-api.version}/apidocs/</link>
<link>https://maven.apache.org/doxia/components/doxia-archives/doxia-${doxia.version}/apidocs/</link>
Expand Down Expand Up @@ -364,7 +364,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.12.1</version>
<version>3.20.0</version>
</plugin>

<plugin>
Expand Down Expand Up @@ -507,6 +507,33 @@ under the License.
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<!-- Copy the readme file to the site source files so that a page is generated from it. -->
<id>copy-readme</id>
<phase>pre-site</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${basedir}/src/site/markdown</outputDirectory>
<resources>
<resource>
<directory>${basedir}</directory>
<includes>
<include>README.md</include>
</includes>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>

</plugins>
</build>

Expand Down
3 changes: 0 additions & 3 deletions src/site/markdown/index.md

This file was deleted.

19 changes: 9 additions & 10 deletions src/site/site.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--
Copyright 2014-2024 Grzegorz Slowikowski (gslowikowski at gmail dot com)

Expand All @@ -17,17 +15,20 @@ specific language governing permissions and limitations
under the License.
-->

<project xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
<site xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"
name="SCoverage Maven Plugin">

<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
<version>1.5</version>
<version>2.0.0-M10</version>
</skin>

<bannerLeft name="SCoverage Maven Plugin"/>

<bannerRight>
<name>avatar</name>
<src>images/my-avatar-80.png</src>
<image src="images/my-avatar-80.png"/>
</bannerRight>

<custom>
Expand All @@ -46,14 +47,12 @@ under the License.
</head>

<menu name="Overview">
<item name="Introduction" href="index.html"/>
<item name="Introduction" href="README.html"/>
<item name="Goals" href="plugin-info.html"/>
<item name="JavaDocs" href="apidocs/index.html"/>
</menu>

<menu ref="reports"/>
</body>

<googleAnalyticsAccountId>${googleAnalyticsAccountId}</googleAnalyticsAccountId>

</project>
</site>