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 2019/06/06 10:00:05 UTC

[maven-doxia-sitetools] branch DOXIASITETOOLS-197 created (now a4ee623)

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

michaelo pushed a change to branch DOXIASITETOOLS-197
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git.


      at a4ee623  [DOXIASITETOOLS-197] Upgrade mockito-core to 2.22.0

This branch includes the following new commits:

     new b6bcc5c  Merge pull request #1 from apache/master
     new 99541e4  Merge pull request #2 from apache/master
     new a4ee623  [DOXIASITETOOLS-197] Upgrade mockito-core to 2.22.0

The 3 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.



[maven-doxia-sitetools] 01/03: Merge pull request #1 from apache/master

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

michaelo pushed a commit to branch DOXIASITETOOLS-197
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git

commit b6bcc5c810d9036ce7a2927135c84401bd4f609f
Merge: 2a37343 e8ee85e
Author: minfrin <mi...@users.noreply.github.com>
AuthorDate: Thu Oct 25 19:16:01 2018 +0200

    Merge pull request #1 from apache/master
    
    Merge from master

 .../inheritance/DefaultDecorationModelInheritanceAssembler.java     | 2 +-
 doxia-integration-tools/src/site/xdoc/download.xml.vm               | 6 +++---
 pom.xml                                                             | 6 +++---
 src/site/xdoc/download.xml.vm                                       | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)


[maven-doxia-sitetools] 03/03: [DOXIASITETOOLS-197] Upgrade mockito-core to 2.22.0

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

michaelo pushed a commit to branch DOXIASITETOOLS-197
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git

commit a4ee6232583f91ec59ec4f565dfee30b3db7b718
Author: minfrin <mi...@users.noreply.github.com>
AuthorDate: Wed Jun 5 23:11:52 2019 +0200

    [DOXIASITETOOLS-197] Upgrade mockito-core to 2.22.0
    
    This closes #7
---
 doxia-site-renderer/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doxia-site-renderer/pom.xml b/doxia-site-renderer/pom.xml
index 362411b..68a9678 100644
--- a/doxia-site-renderer/pom.xml
+++ b/doxia-site-renderer/pom.xml
@@ -167,7 +167,7 @@ under the License.
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>1.10.19</version>
+      <version>2.22.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>


[maven-doxia-sitetools] 02/03: Merge pull request #2 from apache/master

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

michaelo pushed a commit to branch DOXIASITETOOLS-197
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git

commit 99541e42ac8528e380fa50ca7d929a526ce4627d
Merge: b6bcc5c fb7eae9
Author: minfrin <mi...@users.noreply.github.com>
AuthorDate: Wed Jun 5 21:55:58 2019 +0100

    Merge pull request #2 from apache/master
    
    Merge from master

 doxia-decoration-model/pom.xml                     |   2 +-
 doxia-doc-renderer/pom.xml                         |   2 +-
 doxia-integration-tools/pom.xml                    |   3 +-
 doxia-site-renderer/pom.xml                        |   5 ++--
 .../maven/doxia/siterenderer/FaqVerifier.java      |   2 +-
 doxia-skin-model/pom.xml                           |   2 +-
 pom.xml                                            |  11 +++++--
 src/site/resources/images/doxia-sitetools-deps.png | Bin 31677 -> 55078 bytes
 src/site/xdoc/doxia-sitetools-deps.odg             | Bin 18659 -> 14097 bytes
 src/site/xdoc/index.xml                            |  32 ++++++++++++---------
 10 files changed, 34 insertions(+), 25 deletions(-)