You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2020/02/27 23:06:47 UTC
[maven-site-plugin] branch MSITE-846 updated (a797506 -> 4d29f84)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MSITE-846
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git.
discard a797506 [MSITE-846] Maven Failsafe Plugin version range causes tests failures
add baa9bfb Switch to preferred test.properties
add e6ecf71 [maven-release-plugin] prepare release maven-site-plugin-3.8.2
add 3022414 [maven-release-plugin] prepare for next development iteration
add e3c3949 [MSITE-848] Update sitedescriptor.apt
add 40d3d32 MSITE-847: Corrected link to prerequisite maven version.
add 9335776 MSITE-847: Corrected link to prerequisite maven version.
add 19be00a MSITE-851 make output jars reproducible like m-source-p
add 89fd158 upgraded Jetty
add 27d65b1 remove plugins versions override
add 4034f73 MSITE-851 fixed IT: jar internal timestamp cause variable local ts
add ae9c132 MSITE-851 avoid IT failure with old JDK 7 caused by plexus-utils upgrade
add 58658d8 [MSITE-853] prepare ITs to check DOXIA-597 and DOXIA-571 fixes
add daa2cf2 [MSITE-855] make build Reproducible
add bd23136 [MSITE-853] upgrade Doxia to 1.9.1
add b2edd6f [MSITE-852] remove Struts dependencies with Doxia Site Renderer to 1.9.2
new 4d29f84 [MSITE-846] Maven Failsafe Plugin version range causes tests failures
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 (a797506)
\
N -- N -- N refs/heads/MSITE-846 (4d29f84)
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:
.gitignore | 1 +
pom.xml | 20 ++++++++++----------
.../{MSITE-159 => MSITE-512}/invoker.properties | 4 +++-
src/it/projects/doxia-formats/pom.xml | 10 ----------
src/it/projects/doxia-formats/src/site/apt/index.apt | 13 +++++++++++++
.../doxia-formats/src/site/markdown/markdown.md | 13 +++++++++++++
src/it/projects/doxia-formats/src/site/site.xml | 8 +++++++-
src/it/projects/doxia-formats/verify.groovy | 4 +++-
src/it/projects/effective-site/invoker.properties | 3 +--
.../test.properties} | 2 +-
src/it/projects/full-reporting/invoker.properties | 5 ++++-
src/it/projects/site-jar/pom.xml | 1 +
src/it/projects/site-jar/verify.bsh | 10 ++++++++++
.../maven/plugins/site/render/SiteJarMojo.java | 16 +++++++++++++++-
src/site/apt/examples/sitedescriptor.apt | 6 ++++--
src/site/apt/index.apt.vm | 2 +-
16 files changed, 87 insertions(+), 31 deletions(-)
copy src/it/projects/{MSITE-159 => MSITE-512}/invoker.properties (79%)
copy src/it/projects/{MSITE-507/invoker.properties => effective-site/test.properties} (96%)
[maven-site-plugin] 01/01: [MSITE-846] Maven Failsafe Plugin
version range causes tests failures
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MSITE-846
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
commit 4d29f8444d5bd30d4eb0042c6025721015a782d4
Author: minfrin <mi...@users.noreply.github.com>
AuthorDate: Sun Jul 7 21:55:02 2019 +0100
[MSITE-846] Maven Failsafe Plugin version range causes tests failures
This closes #11
---
pom.xml | 1 +
src/it/projects/effective-site/pom.xml | 15 +++++++++++++++
2 files changed, 16 insertions(+)
diff --git a/pom.xml b/pom.xml
index b54c4a9..a9d0438 100644
--- a/pom.xml
+++ b/pom.xml
@@ -210,6 +210,7 @@ under the License.
<pmdPluginVersion>3.11.0</pmdPluginVersion>
<projectInfoReportsPluginVersion>2.7</projectInfoReportsPluginVersion>
<surefirePluginVersion>2.22.1</surefirePluginVersion>
+ <failsafePluginVersion>2.22.1</failsafePluginVersion>
<project.build.outputTimestamp>2020-02-14T20:39:59Z</project.build.outputTimestamp>
</properties>
diff --git a/src/it/projects/effective-site/pom.xml b/src/it/projects/effective-site/pom.xml
index f9a9168..cb21363 100644
--- a/src/it/projects/effective-site/pom.xml
+++ b/src/it/projects/effective-site/pom.xml
@@ -43,6 +43,21 @@ under the License.
<artifactId>maven-site-plugin</artifactId>
<version>@project.version@</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>@failsafePluginVersion@</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>@surefirePluginVersion@</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>@javadocPluginVersion@</version>
+ </plugin>
</plugins>
</build>