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/02/06 20:46:32 UTC
[maven-doxia] branch DOXIA-595 updated (af78690 -> b73bacb)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch DOXIA-595
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git.
discard af78690 [DOXIA-595] fixed site build on Windows - xdoc
new b73bacb [DOXIA-595] fixed site build on Windows - xdoc
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 (af78690)
\
N -- N -- N refs/heads/DOXIA-595 (b73bacb)
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-modules/doxia-module-fml/pom.xml | 4 ++--
doxia-modules/doxia-module-xdoc/pom.xml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
[maven-doxia] 01/01: [DOXIA-595] fixed site build on Windows - xdoc
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch DOXIA-595
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git
commit b73bacb2fd26f78caf26b64da3ea7eb4851d6910
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Thu Feb 6 21:31:37 2020 +0100
[DOXIA-595] fixed site build on Windows - xdoc
fix deprecated tasks
---
doxia-modules/doxia-module-fml/pom.xml | 4 ++--
doxia-modules/doxia-module-xdoc/pom.xml | 17 ++++-------------
2 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/doxia-modules/doxia-module-fml/pom.xml b/doxia-modules/doxia-module-fml/pom.xml
index 58a3edd..1c5c3f2 100644
--- a/doxia-modules/doxia-module-fml/pom.xml
+++ b/doxia-modules/doxia-module-fml/pom.xml
@@ -87,13 +87,13 @@ under the License.
<execution>
<phase>site</phase>
<configuration>
- <tasks>
+ <target>
<taskdef name="xsddoc" classname="net.sf.xframe.xsddoc.Task" />
<mkdir dir="${project.reporting.outputDirectory}/xsddoc" />
<xsddoc file="${basedir}/src/main/resources/fml-1.0.1.xsd" out="${project.reporting.outputDirectory}/xsddoc" doctitle="Reference of FML 1.0.1 Schema" verbose="true" />
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
diff --git a/doxia-modules/doxia-module-xdoc/pom.xml b/doxia-modules/doxia-module-xdoc/pom.xml
index 98d6ad5..3705f27 100644
--- a/doxia-modules/doxia-module-xdoc/pom.xml
+++ b/doxia-modules/doxia-module-xdoc/pom.xml
@@ -88,22 +88,13 @@ under the License.
<execution>
<phase>site</phase>
<configuration>
- <tasks>
+ <target>
<taskdef name="xsddoc" classname="net.sf.xframe.xsddoc.Task" />
- <condition property="dir" value="${project.reporting.outputDirectory}/xsddoc">
- <matches string="${project.reporting.outputDirectory}" pattern="^${basedir}" />
- </condition>
- <condition property="dir" value="${project.reporting.outputDirectory}/xsddoc">
- <not>
- <isset property="dir" />
- </not>
- </condition>
+ <mkdir dir="${project.reporting.outputDirectory}/xsddoc" />
- <mkdir dir="${dir}" />
-
- <xsddoc file="${basedir}/src/main/resources/xdoc-2.0.xsd" out="${dir}" doctitle="Reference of Schema Xdoc 2.0" verbose="true" />
- </tasks>
+ <xsddoc file="${basedir}/src/main/resources/xdoc-2.0.xsd" out="${project.reporting.outputDirectory}/xsddoc" doctitle="Reference of Schema Xdoc 2.0" verbose="true" />
+ </target>
</configuration>
<goals>
<goal>run</goal>