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:19:14 UTC
[maven-doxia-sitetools] branch dependency-updates updated (2f997e1
-> e57c5cf)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch dependency-updates
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git.
discard 2f997e1 Update all possible dependencies
add b6bcc5c Merge pull request #1 from apache/master
add 99541e4 Merge pull request #2 from apache/master
add a4ee623 [DOXIASITETOOLS-197] Upgrade mockito-core to 2.22.0
add b567fa1 [DOXIASITETOOLS-198] Upgrade htmlunit to 2.24
add 98e801f [DOXIASITETOOLS-190] Generate (X)HTML5 by default
new e57c5cf Update all possible dependencies
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 (2f997e1)
\
N -- N -- N refs/heads/dependency-updates (e57c5cf)
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:
doxia-doc-renderer/pom.xml | 15 ----
doxia-integration-tools/pom.xml | 2 -
doxia-site-renderer/pom.xml | 8 ++-
.../doxia/siterenderer/sink/SiteRendererSink.java | 14 ++--
.../siterenderer/resources/default-site-macros.vm | 10 +--
.../doxia/siterenderer/resources/default-site.vm | 2 +-
.../maven/doxia/siterenderer/AbstractVerifier.java | 1 +
.../maven/doxia/siterenderer/AptVerifier.java | 43 +++++------
.../doxia/siterenderer/AttributesVerifier.java | 30 ++++----
.../siterenderer/DefaultSiteRendererTest.java | 8 ++-
.../maven/doxia/siterenderer/EntitiesVerifier.java | 44 ++++++------
.../maven/doxia/siterenderer/FaqVerifier.java | 20 +++---
.../maven/doxia/siterenderer/HeadVerifier.java | 6 +-
.../doxia/siterenderer/JavascriptVerifier.java | 7 +-
.../maven/doxia/siterenderer/MiscVerifier.java | 4 +-
.../doxia/siterenderer/MultipleBlockVerifier.java | 6 +-
.../doxia/siterenderer/NestedItemsVerifier.java | 33 +++++----
.../doxia/siterenderer/XhtmlEntityResolver.java | 83 ----------------------
pom.xml | 16 +++++
19 files changed, 135 insertions(+), 217 deletions(-)
delete mode 100644 doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/XhtmlEntityResolver.java
[maven-doxia-sitetools] 01/01: Update all possible dependencies
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch dependency-updates
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git
commit e57c5cf136d5386b245192fa26bc5b6414ccfa13
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Jun 3 22:47:25 2019 +0200
Update all possible dependencies
---
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(-)
diff --git a/doxia-doc-renderer/pom.xml b/doxia-doc-renderer/pom.xml
index d89056e..7ba40d8 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,25 +115,18 @@ 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 -->
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
- <version>2.7.0</version>
+ <version>2.7.2</version>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
- <version>1.3.04</version>
+ <version>2.0.2</version>
</dependency>
</dependencies>
diff --git a/doxia-integration-tools/pom.xml b/doxia-integration-tools/pom.xml
index 0d2ed50..03c7b29 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>
@@ -119,20 +118,19 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interpolation</artifactId>
- <version>1.14</version>
+ <version>1.25</version>
</dependency>
<!-- test -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
<scope>test</scope>
</dependency>
<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>
diff --git a/doxia-site-renderer/pom.xml b/doxia-site-renderer/pom.xml
index c099db0..e3ba477 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>
@@ -141,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 -->
@@ -171,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>
diff --git a/pom.xml b/pom.xml
index 413ff3a..c2f126b 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>
@@ -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>
@@ -304,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>