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 2021/04/03 18:58:12 UTC

[maven-site-plugin] branch jenkins updated (37fa835 -> 9024383)

This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a change to branch jenkins
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git.


 discard 37fa835  test failing build 3.1 + Java 7
     add af42899  update link to old documentation #20
     add ef39845  fix script injection example in docs
     add baba99a  [DOXIA-616] Fix site integration tests
     add db969cf  [MSITE-870] mark Maven-exported dependencies as scope provided
     add c74f769  trivial change
     add 52a5eba  fixed issue description example
     add c03f624  [MSITE-871] Upgrade Maven Javadoc Plugin in integration tests (#39)
     new 9024383  test failing build 3.1 + Java 7

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   (37fa835)
            \
             N -- N -- N   refs/heads/jenkins (9024383)

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:
 README.md                                          |  4 +-
 pom.xml                                            |  8 +++
 src/it/projects/MSITE-484/pom.xml                  |  2 +-
 src/it/projects/MSITE-497/pom.xml                  |  3 +-
 src/it/projects/MSITE-506/pom.xml                  |  2 +-
 .../projects/MSITE-512/parent-usage-test/pom.xml   |  2 +-
 src/it/projects/MSITE-665/pom.xml                  |  2 +-
 .../maven/plugins/site/it/CustomVelocityTool.java  |  4 +-
 .../doxia-formats/src/site/apt/apt-macro.apt       |  6 +-
 .../projects/doxia-formats/src/site/apt/index.apt  |  4 +-
 .../src/site/apt/velocity-context.apt.vm           |  4 +-
 .../src/site/apt/velocity-include-parse.apt.vm     |  2 +
 .../src/site/confluence/confluence.confluence      |  2 +
 .../doxia-formats/src/site/docbook/docbook.xml     |  2 +-
 .../doxia-formats/src/site/fml/faq-macro.fml       |  6 +-
 src/it/projects/doxia-formats/src/site/fml/faq.fml |  2 +-
 .../src/site/markdown/markdown-macro.md            |  6 +-
 .../doxia-formats/src/site/markdown/markdown.md    | 22 ++------
 .../src/site/markdown/markdown2-macro.markdown     | 35 ------------
 .../src/site/markdown/markdown2.markdown           | 11 ++--
 .../doxia-formats/src/site/twiki/twiki.twiki       |  4 +-
 .../doxia-formats/src/site/xdoc/xdoc-macro.xml     |  5 +-
 .../projects/doxia-formats/src/site/xdoc/xdoc.xml  |  2 +
 .../doxia-formats/src/site/xhtml/xhtml-macro.xhtml |  6 +-
 .../doxia-formats/src/site/xhtml/xhtml.xhtml       |  2 +
 src/it/projects/doxia-formats/verify.groovy        | 65 +++++++++++++++-------
 src/site/apt/examples/sitedescriptor.apt           |  2 +-
 src/site/apt/history.apt                           |  2 +-
 28 files changed, 106 insertions(+), 111 deletions(-)
 delete mode 100644 src/it/projects/doxia-formats/src/site/markdown/markdown2-macro.markdown

[maven-site-plugin] 01/01: test failing build 3.1 + Java 7

Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch jenkins
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git

commit 9024383ff63759b4756b8c8bb45cc1daae089b48
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Tue May 26 15:55:01 2020 +0200

    test failing build 3.1 + Java 7
---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 5a994fd..fe7b678 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,4 +17,4 @@
  * under the License.
  */
 
-asfMavenTlpPlgnBuild(jdk:['7','8','11','12'], maven:['3.0.x', '3.2.x', '3.3.x', '3.5.x'])
+asfMavenTlpPlgnBuild(jdk:['7'], maven:[ '3.1.x'])