Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Bump Maven Site Plugin AND Maven Fluido Skin #525

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bump Maven Site Plugin AND Maven Fluido Skin #525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 0 additions & 6 deletions content/site.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,6 @@ under the License.
name="Maven">
<version position="none" />

<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
<version>${fluidoVersion}</version><!-- modify pom.xml property if necessary -->
</skin>

<edit>${project.scm.url}</edit>

<body>
Expand Down
4 changes: 2 additions & 2 deletions content/xdoc/errors/404.xml.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ under the License.
<title>Page Not Found</title>
<base href="https://maven.apache.org/errors" />
<!-- need to import styles by hand since the generated html has them relative and before the base tag -->
<link rel="stylesheet" href="https://maven.apache.org/css/apache-maven-fluido-${fluidoVersion}.min.css" />
<link rel="stylesheet" href="https://maven.apache.org/css/apache-maven-fluido-${context.get("version.maven-fluido-skin")}.min.css" />
<link rel="stylesheet" href="https://maven.apache.org/css/site.css" />
<link rel="stylesheet" href="https://maven.apache.org/css/print.css" media="print" />
<script type="text/javascript" src="https://maven.apache.org/js/apache-maven-fluido-${fluidoVersion}.min.js" />
<script type="text/javascript" src="https://maven.apache.org/js/apache-maven-fluido-${context.get("version.maven-fluido-skin")}.min.js" />
</head>

<body>
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@
<versions3x>3.9.9,3.9.8,3.9.7,3.9.6,3.9.5,3.9.4,3.9.3,3.9.2,3.9.1,3.9.0,3.8.8,3.8.7,3.8.6,3.8.5,3.8.4,3.8.3,3.8.2,3.8.1,3.6.3,3.6.2,3.6.1,3.6.0,3.5.4,3.5.3,3.5.2,3.5.0,3.5.0-beta-1,3.5.0-alpha-1,3.3.9,3.3.3,3.3.1,3.2.5,3.2.3,3.2.2,3.2.1,3.1.1,3.1.0,3.1.0-alpha-1,3.0.5,3.0.4,3.0.3,3.0.2,3.0.1,3.0,3.0-beta-3,3.0-beta-2,3.0-beta-1,3.0-alpha-7,3.0-alpha-6,3.0-alpha-5,3.0-alpha-4,3.0-alpha-3</versions3x>
<version4x>4.0.0-beta-3,4.0.0-alpha-13,4.0.0-alpha-12,4.0.0-alpha-10,4.0.0-alpha-9,4.0.0-alpha-8,4.0.0-alpha-7,4.0.0-alpha-5,4.0.0-alpha-4,4.0.0-alpha-3,4.0.0-alpha-2</version4x>
<site.output>${project.build.directory}/site</site.output>
<!-- used by src/xdoc/errors/404.xml.vm -->
<fluidoVersion>2.0.0-M6</fluidoVersion>
<javaVersion>8</javaVersion>
<siteDirectory>${project.basedir}/content</siteDirectory>
<!-- used by src/xdoc/errors/404.xml.vm as well -->
<version.maven-fluido-skin>2.0.0-M10</version.maven-fluido-skin>
</properties>

<dependencies>
Expand Down Expand Up @@ -115,7 +115,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>4.0.0-M8</version>
<version>3.20.0</version>
<configuration>
<siteDirectory>${siteDirectory}</siteDirectory>
<!-- don't deploy site with maven-site-plugin -->
Expand Down