You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2024/08/27 19:41:18 UTC
(maven-site) branch bump-site-and-fluido-version updated (eecb6c9e -> a005e6a4)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch bump-site-and-fluido-version
in repository https://gitbox.apache.org/repos/asf/maven-site.git
omit eecb6c9e Upgrade to Maven Site Plugin 4.0.0-M15 and Maven Fluido Skin 2.0.0-M9
add 2158f00d Escape properties to prevent evaluation
add 4b4a59b0 Bump org.apache.maven.plugins:maven-enforcer-plugin from 3.4.1 to 3.5.0
add cc2faef3 --- updated-dependencies: - dependency-name: org.codehaus.mojo:build-helper-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ...
add cba63154 Bump org.jsoup:jsoup from 1.15.3 to 1.17.2
add 8c6cfaa8 Parents POMs 33/43 released
add 1d865c05 Bump parent to next snapshot
add 5968c4a5 Upgrade surefire/failsafe/surefire-report plugin to 3.3.1
add 8a79c4bf fix typo: went from 42 to 44 instead of 43
add ce0ba2dc Updated release information - maven-site-plugin 4.0.0-M16 - maven-javadoc-plugin 3.8.0 - maven-pmd-plugin 3.24.0 - maven-project-info-reports-plugin 3.6.2 - maven-release-plugin 3.1.1
add c20cd187 Add cache xsd for 1.2.0 release
add 92a39605 fix sisu documentation urls
add 61a49749 Update index.apt
add f94fe917 Correct the Javadoc links in maven-3-lifecycle-extensions (#552)
add 46604145 Maven 3.9.9 Release Notes (#554)
add 85f965be maven-jarsigner 3.1.0 released
add 572c6e40 Update history.md.vm
add 76592c28 Update index.apt
add 9b2d0a91 Bump org.codehaus.mojo:exec-maven-plugin from 3.3.0 to 3.4.1
add 5a7e7db7 add license boilerplate
add 4b2b39cf plugins released
new a005e6a4 Upgrade to Maven Site Plugin 3.20.0 and Maven Fluido Skin 2.0.0-M10
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 (eecb6c9e)
\
N -- N -- N refs/heads/bump-site-and-fluido-version (a005e6a4)
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:
.../examples/maven-3-lifecycle-extensions.apt.vm | 6 +-
content/apt/plugins/index.apt | 36 +++---
content/apt/pom.apt.vm | 16 +--
content/apt/pom/index.apt.vm | 12 +-
content/apt/shared/index.apt | 2 +-
.../docs/{3.9.6 => 3.9.9}/release-notes.md | 21 +--
content/markdown/docs/history.md.vm | 3 +-
content/markdown/maven-jsr330.md | 2 +-
content/resources/xsd/build-cache-build-1.0.0.xsd | 1 -
...build-1.0.0.xsd => build-cache-build-1.2.0.xsd} | 20 +--
content/resources/xsd/build-cache-config-1.0.0.xsd | 1 -
...nfig-1.0.0.xsd => build-cache-config-1.2.0.xsd} | 142 +++++++++++++++++----
content/resources/xsd/build-cache-diff-1.0.0.xsd | 1 -
...e-diff-1.0.0.xsd => build-cache-diff-1.2.0.xsd} | 9 +-
content/resources/xsd/build-cache-report-1.0.0.xsd | 1 -
...port-1.0.0.xsd => build-cache-report-1.2.0.xsd} | 7 +-
pom.xml | 22 ++--
17 files changed, 196 insertions(+), 106 deletions(-)
copy content/markdown/docs/{3.9.6 => 3.9.9}/release-notes.md (88%)
copy content/resources/xsd/{build-cache-build-1.0.0.xsd => build-cache-build-1.2.0.xsd} (92%)
copy content/resources/xsd/{build-cache-config-1.0.0.xsd => build-cache-config-1.2.0.xsd} (77%)
copy content/resources/xsd/{build-cache-diff-1.0.0.xsd => build-cache-diff-1.2.0.xsd} (91%)
copy content/resources/xsd/{build-cache-report-1.0.0.xsd => build-cache-report-1.2.0.xsd} (93%)
(maven-site) 01/01: Upgrade to Maven Site Plugin 3.20.0 and Maven Fluido Skin 2.0.0-M10
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch bump-site-and-fluido-version
in repository https://gitbox.apache.org/repos/asf/maven-site.git
commit a005e6a45b3883beec2ee3e0b88030b099cb2f91
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Wed Jul 3 14:27:47 2024 +0200
Upgrade to Maven Site Plugin 3.20.0 and Maven Fluido Skin 2.0.0-M10
This closes #525
---
content/site.xml | 6 ------
content/xdoc/errors/404.xml.vm | 4 ++--
pom.xml | 6 +++---
3 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/content/site.xml b/content/site.xml
index 18cffc8f..ae5bbb91 100644
--- a/content/site.xml
+++ b/content/site.xml
@@ -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>
diff --git a/content/xdoc/errors/404.xml.vm b/content/xdoc/errors/404.xml.vm
index dc9a4e21..52a1c51d 100644
--- a/content/xdoc/errors/404.xml.vm
+++ b/content/xdoc/errors/404.xml.vm
@@ -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>
diff --git a/pom.xml b/pom.xml
index 367fdd10..55eb012a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
@@ -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 -->