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 21:38:50 UTC

[maven-doxia-sitetools] branch master updated (98e801f -> d35ce8a)

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

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


    from 98e801f  [DOXIASITETOOLS-190] Generate (X)HTML5 by default
     new f2e5bce  [DOXIASITETOOLS-199] Upgrade Velocity/Plexus Velocity to 1.7/1.2
     new 96bbe67  [DOXIASITETOOLS-200] Upgrade Xalan to 2.7.2
     new e9614ca  [DOXIASITETOOLS-201] Upgrade XML APIs to 2.0.2
     new 12cec43  [DOXIASITETOOLS-202] Upgrade Plexus Interpolation to 1.25
     new ec76b6d  [DOXIASITETOOLS-203] Upgrade maven-plugin-testing-harness to 1.1
     new 6823f8b  [DOXIASITETOOLS-204] Upgrade Commons Lang to 3.8.1
     new 1136fcd  [DOXIASITETOOLS-205] Upgrade Plexus I18N to 1.0-beta-10
     new fe11d95  [DOXIASITETOOLS-206] Upgrade Extra Enforces Rules to 1.2
     new 8e50d3f  Remove dependency version already set in parent
     new d35ce8a  [DOXIASITETOOLS-197] Upgrade Mockito Core to 2.28.2

The 10 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:
 doxia-doc-renderer/pom.xml      | 21 +++------------------
 doxia-integration-tools/pom.xml |  6 ++----
 doxia-site-renderer/pom.xml     |  6 ++----
 pom.xml                         | 15 +++++++++++++--
 4 files changed, 20 insertions(+), 28 deletions(-)


[maven-doxia-sitetools] 03/10: [DOXIASITETOOLS-201] Upgrade XML APIs to 2.0.2

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

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

commit e9614ca516b90b72c7763e55c0b7d1bcc55665dc
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Thu Jun 6 23:27:56 2019 +0200

    [DOXIASITETOOLS-201] Upgrade XML APIs to 2.0.2
---
 doxia-doc-renderer/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doxia-doc-renderer/pom.xml b/doxia-doc-renderer/pom.xml
index 021c35b..7ba40d8 100644
--- a/doxia-doc-renderer/pom.xml
+++ b/doxia-doc-renderer/pom.xml
@@ -126,7 +126,7 @@ under the License.
     <dependency>
       <groupId>xml-apis</groupId>
       <artifactId>xml-apis</artifactId>
-      <version>1.3.04</version>
+      <version>2.0.2</version>
     </dependency>
   </dependencies>
 


[maven-doxia-sitetools] 07/10: [DOXIASITETOOLS-205] Upgrade Plexus I18N to 1.0-beta-10

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

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

commit 1136fcdfc03a8b736fff75ca4fd2e88ed5883e6d
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Thu Jun 6 23:31:33 2019 +0200

    [DOXIASITETOOLS-205] Upgrade Plexus I18N to 1.0-beta-10
---
 doxia-integration-tools/pom.xml | 1 -
 pom.xml                         | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/doxia-integration-tools/pom.xml b/doxia-integration-tools/pom.xml
index 5d975c5..de2f8de 100644
--- a/doxia-integration-tools/pom.xml
+++ b/doxia-integration-tools/pom.xml
@@ -100,7 +100,6 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-i18n</artifactId>
-      <version>1.0-beta-7</version>
       <exclusions>
         <exclusion>
           <groupId>org.codehaus.plexus</groupId>
diff --git a/pom.xml b/pom.xml
index 832aa0d..9104181 100644
--- a/pom.xml
+++ b/pom.xml
@@ -157,7 +157,7 @@ under the License.
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-i18n</artifactId>
-        <version>1.0-beta-7</version>
+        <version>1.0-beta-10</version>
         <exclusions>
           <exclusion>
             <groupId>org.codehaus.plexus</groupId>


[maven-doxia-sitetools] 09/10: Remove dependency version already set in parent

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

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

commit 8e50d3fd33bae731d572638e3c6e5c229b6d750e
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Thu Jun 6 23:33:04 2019 +0200

    Remove dependency version already set in parent
---
 doxia-integration-tools/pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doxia-integration-tools/pom.xml b/doxia-integration-tools/pom.xml
index de2f8de..03c7b29 100644
--- a/doxia-integration-tools/pom.xml
+++ b/doxia-integration-tools/pom.xml
@@ -125,7 +125,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>


[maven-doxia-sitetools] 02/10: [DOXIASITETOOLS-200] Upgrade Xalan to 2.7.2

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

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

commit 96bbe67276cc866ce46d4d397c761df72e4caec4
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Thu Jun 6 23:27:12 2019 +0200

    [DOXIASITETOOLS-200] Upgrade Xalan to 2.7.2
---
 doxia-doc-renderer/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doxia-doc-renderer/pom.xml b/doxia-doc-renderer/pom.xml
index c3a773f..021c35b 100644
--- a/doxia-doc-renderer/pom.xml
+++ b/doxia-doc-renderer/pom.xml
@@ -121,7 +121,7 @@ under the License.
     <dependency>
       <groupId>xalan</groupId>
       <artifactId>xalan</artifactId>
-      <version>2.7.0</version>
+      <version>2.7.2</version>
     </dependency>
     <dependency>
       <groupId>xml-apis</groupId>


[maven-doxia-sitetools] 10/10: [DOXIASITETOOLS-197] Upgrade Mockito Core to 2.28.2

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

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

commit d35ce8a0b6764a1a712c8fa797908354b5112852
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Thu Jun 6 23:34:44 2019 +0200

    [DOXIASITETOOLS-197] Upgrade Mockito Core to 2.28.2
---
 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 2c6d984..e3ba477 100644
--- a/doxia-site-renderer/pom.xml
+++ b/doxia-site-renderer/pom.xml
@@ -169,7 +169,7 @@ under the License.
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>2.22.0</version>
+      <version>2.28.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>


[maven-doxia-sitetools] 08/10: [DOXIASITETOOLS-206] Upgrade Extra Enforces Rules to 1.2

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

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

commit fe11d95f64a518d0db875cff186b06503ed13257
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Thu Jun 6 23:32:12 2019 +0200

    [DOXIASITETOOLS-206] Upgrade Extra Enforces Rules to 1.2
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9104181..c2f126b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -315,7 +315,7 @@ under the License.
           <dependency>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>extra-enforcer-rules</artifactId>
-            <version>1.0-beta-6</version>
+            <version>1.2</version>
             <scope>compile</scope>
           </dependency>
         </dependencies>


[maven-doxia-sitetools] 05/10: [DOXIASITETOOLS-203] Upgrade maven-plugin-testing-harness to 1.1

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

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

commit ec76b6df0605c083d1524a04091f843a39bcedc9
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Thu Jun 6 23:29:47 2019 +0200

    [DOXIASITETOOLS-203] Upgrade maven-plugin-testing-harness to 1.1
---
 doxia-integration-tools/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doxia-integration-tools/pom.xml b/doxia-integration-tools/pom.xml
index 4738792..5d975c5 100644
--- a/doxia-integration-tools/pom.xml
+++ b/doxia-integration-tools/pom.xml
@@ -132,7 +132,7 @@
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
       <artifactId>maven-plugin-testing-harness</artifactId>
-      <version>1.0</version>
+      <version>1.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>


[maven-doxia-sitetools] 06/10: [DOXIASITETOOLS-204] Upgrade Commons Lang to 3.8.1

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

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

commit 6823f8b508ade815460eab465e8f95ccd304fcf4
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Thu Jun 6 23:30:46 2019 +0200

    [DOXIASITETOOLS-204] Upgrade Commons Lang to 3.8.1
---
 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 188553b..2c6d984 100644
--- a/doxia-site-renderer/pom.xml
+++ b/doxia-site-renderer/pom.xml
@@ -139,7 +139,7 @@ under the License.
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
-      <version>3.5</version>
+      <version>3.8.1</version>
     </dependency>
 
     <!-- test -->


[maven-doxia-sitetools] 01/10: [DOXIASITETOOLS-199] Upgrade Velocity/Plexus Velocity to 1.7/1.2

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

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

commit f2e5bce02cadc7b4238754800345bfef97446e81
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Thu Jun 6 23:26:22 2019 +0200

    [DOXIASITETOOLS-199] Upgrade Velocity/Plexus Velocity to 1.7/1.2
---
 doxia-doc-renderer/pom.xml  | 17 +----------------
 doxia-site-renderer/pom.xml |  2 --
 pom.xml                     | 11 +++++++++++
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/doxia-doc-renderer/pom.xml b/doxia-doc-renderer/pom.xml
index d89056e..c3a773f 100644
--- a/doxia-doc-renderer/pom.xml
+++ b/doxia-doc-renderer/pom.xml
@@ -102,20 +102,12 @@ under the License.
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-velocity</artifactId>
-      <version>1.1.7</version>
+      <version>1.2</version>
       <exclusions>
         <exclusion>
-          <groupId>commons-collections</groupId>
-          <artifactId>commons-collections</artifactId>
-        </exclusion>
-        <exclusion>
           <groupId>org.codehaus.plexus</groupId>
           <artifactId>plexus-component-api</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>velocity</groupId>
-          <artifactId>velocity</artifactId>
-        </exclusion>
       </exclusions>
     </dependency>
 
@@ -123,13 +115,6 @@ under the License.
     <dependency>
       <groupId>org.apache.velocity</groupId>
       <artifactId>velocity</artifactId>
-      <version>1.5</version>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-lang</groupId>
-          <artifactId>commons-lang</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
 
     <!-- misc -->
diff --git a/doxia-site-renderer/pom.xml b/doxia-site-renderer/pom.xml
index c099db0..188553b 100644
--- a/doxia-site-renderer/pom.xml
+++ b/doxia-site-renderer/pom.xml
@@ -115,7 +115,6 @@ under the License.
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-velocity</artifactId>
-      <version>1.2</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
@@ -126,7 +125,6 @@ under the License.
     <dependency>
       <groupId>org.apache.velocity</groupId>
       <artifactId>velocity</artifactId>
-      <version>1.7</version>
     </dependency>
     <dependency>
       <groupId>org.apache.velocity</groupId>
diff --git a/pom.xml b/pom.xml
index 413ff3a..832aa0d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -167,9 +167,20 @@ under the License.
       </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-velocity</artifactId>
+        <version>1.2</version>
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-utils</artifactId>
         <version>3.0.22</version>
       </dependency>
+      <!-- misc -->
+      <dependency>
+        <groupId>org.apache.velocity</groupId>
+        <artifactId>velocity</artifactId>
+        <version>1.7</version>
+      </dependency>
       <!-- Test -->
       <dependency>
         <groupId>junit</groupId>


[maven-doxia-sitetools] 04/10: [DOXIASITETOOLS-202] Upgrade Plexus Interpolation to 1.25

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

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

commit 12cec436956cd6fa5f6b38803fce7193690347e1
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Thu Jun 6 23:29:07 2019 +0200

    [DOXIASITETOOLS-202] Upgrade Plexus Interpolation to 1.25
---
 doxia-integration-tools/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doxia-integration-tools/pom.xml b/doxia-integration-tools/pom.xml
index 0d2ed50..4738792 100644
--- a/doxia-integration-tools/pom.xml
+++ b/doxia-integration-tools/pom.xml
@@ -119,7 +119,7 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-interpolation</artifactId>
-      <version>1.14</version>
+      <version>1.25</version>
     </dependency>
 
     <!-- test -->