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/05/25 19:53:30 UTC
[maven-site-plugin] branch MSITE-846 updated (0d08fa5 -> 50e3c07)
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 0d08fa5 [MSITE-846] Maven Failsafe Plugin version range causes tests failures
add c51d7b5 remove info about old version (#19)
add 45d6256 Bump junit from 4.8.1 to 4.13
add af15e83 uodate test dependencies (#17)
add 4350177 Only reference current version (#18)
add bf68470 assume Maven 3 as default (#20)
add bf16d0c added README
add 85539be added ASF GitHub config
add 5add279 fixed broken links (MPIR 3)
add 32efb1d README improvement
add 47df7e2 reworked examples structure
add be63b94 code vs verbatim
add c116008 added m-site-p 3.9.0
add 9abf63c added Developer Overview
add 01273ba highlight server url
add 4a813a9 add .checkstyle to .gitignore
add 0550bf2 Merge pull request #22 from apache/ignore
add 0dfdcb2 remove unused code
add 0f2afec Merge pull request #23 from apache/utils
add 0a6f830 update apache commons lang and IO
add c987958 Merge pull request #25 from apache/test
add d8845db [MSITE-845] Drop Maven 2 support
new 50e3c07 [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 (0d08fa5)
\
N -- N -- N refs/heads/MSITE-846 (50e3c07)
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:
.asf.yaml | 26 ++
.gitignore | 1 +
README.md | 99 ++++++
pom.xml | 8 +-
src/it/projects/MSITE-265/pom.xml | 2 +-
src/it/projects/MSITE-265/verify.bsh | 4 +-
src/it/projects/MSITE-609/pom.xml | 2 +-
src/it/projects/MSITE-609/verify.bsh | 4 +-
src/it/projects/it-plugin-test/pom.xml | 9 +-
src/it/projects/new-configuration/pom.xml | 2 +-
src/it/projects/site-attach-descriptor/pom.xml | 2 +-
src/it/projects/site-deploy/pom.xml | 2 +-
src/it/projects/site-deploy/verify.bsh | 4 +-
src/it/projects/site-jar/pom.xml | 2 +-
.../maven/plugins/site/AbstractSiteMojo.java | 9 -
.../plugins/site/deploy/AbstractDeployMojo.java | 149 +--------
.../site/render/AbstractSiteRenderingMojo.java | 45 +--
.../apache/maven/plugins/site/run/SiteRunMojo.java | 6 +-
src/site/apt/developer-overview.odg | Bin 33881 -> 19037 bytes
.../apt/examples/adding-deploy-protocol.apt.vm | 4 +-
src/site/apt/examples/creating-content.apt.vm | 4 +-
src/site/apt/examples/moduleexcludes.apt.vm | 4 +-
.../examples/site-deploy-to-sourceforge.net.apt | 24 +-
src/site/apt/examples/templatefile.apt.vm | 4 +-
src/site/apt/history.apt | 12 +-
src/site/apt/index.apt.vm | 39 ++-
src/site/apt/maven-3.apt.vm | 361 ---------------------
src/site/resources/developer-overview.png | Bin 0 -> 90277 bytes
src/site/site.xml | 21 +-
.../plugins/site/deploy/AuthAsyncProxyServlet.java | 6 -
.../site/deploy/SimpleDavServerHandler.java | 5 -
.../plugins/site/stubs/SiteMavenProjectStub.java | 1 -
32 files changed, 243 insertions(+), 618 deletions(-)
create mode 100644 .asf.yaml
create mode 100644 README.md
delete mode 100644 src/site/apt/maven-3.apt.vm
create mode 100644 src/site/resources/developer-overview.png
[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 50e3c070baab87ab45c5c1b63d5256c6b935c12e
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 08760d5..e177324 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-03-06T20:49:49Z</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>