Author: veithen
Date: Wed Nov 25 20:11:59 2015
New Revision: 1716530
URL: http://svn.apache.org/viewvc?rev=1716530&view=rev
Log:
Use DOXIA-492 to support snippets in Markdown.
Modified:
webservices/axiom/trunk/ (props changed)
webservices/axiom/trunk/pom.xml
webservices/axiom/trunk/testing/xml-truth/src/site/markdown/index.md.vm
webservices/axiom/trunk/testing/xml-truth/src/test/java/org/apache/axiom/truth/xml/XMLSubjectTest.java
Propchange: webservices/axiom/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 25 20:11:59 2015
@@ -7,6 +7,7 @@
/webservices/axiom/branches/CHECK_PARENT_BUG:1338398-1338886
/webservices/axiom/branches/CLONE:1337822-1339011
/webservices/axiom/branches/CLONE_NODE:1346607-1353106
+/webservices/axiom/branches/DOXIA-492:1715574-1716528
/webservices/axiom/branches/JAXB2_DS:1366463-1367737
/webservices/axiom/branches/attrs-aspects:1685218-1686663
/webservices/axiom/branches/namespaceURIInterning:1293148-1293587
Modified: webservices/axiom/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/pom.xml?rev=1716530&r1=1716529&r2=1716530&view=diff
==============================================================================
--- webservices/axiom/trunk/pom.xml (original)
+++ webservices/axiom/trunk/pom.xml Wed Nov 25 20:11:59 2015
@@ -278,6 +278,16 @@
</releases>
</repository>
</repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </pluginRepository>
+ </pluginRepositories>
<dependencyManagement>
<dependencies>
@@ -627,10 +637,6 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.4</version>
- </plugin>
- <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-5</version>
</plugin>
@@ -997,9 +1003,24 @@
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
+ <!-- DOXIA-492 -->
+ <version>3.4.1-SNAPSHOT</version>
<configuration>
<skip>${skipSite}</skip>
</configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-core</artifactId>
+ <version>1.7-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>xercesImpl</artifactId>
+ <groupId>xerces</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Modified:
webservices/axiom/trunk/testing/xml-truth/src/site/markdown/index.md.vm
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/xml-truth/src/site/markdown/index.md.vm?rev=1716530&r1=1716529&r2=1716530&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/xml-truth/src/site/markdown/index.md.vm
(original)
+++ webservices/axiom/trunk/testing/xml-truth/src/site/markdown/index.md.vm Wed
Nov 25 20:11:59 2015
@@ -49,8 +49,4 @@ By default, comparison is strict. E.g. t
To control how the comparison is performed, use the relevant methods on the
[`XMLSubject`](apidocs/org/apache/axiom/truth/xml/XMLSubject.html) object
returned by `that()`:
- assertAbout(xml())
- .that("<p:a xmlns:p='urn:ns'/>")
- .ignoringNamespacePrefixes()
- .ignoringNamespaceDeclarations()
- .hasSameContentAs("<a xmlns='urn:ns'/>");
+<!--
MACRO{snippet|id=sample|file=${project.basedir}/src/test/java/org/apache/axiom/truth/xml/XMLSubjectTest.java}
-->
Modified:
webservices/axiom/trunk/testing/xml-truth/src/test/java/org/apache/axiom/truth/xml/XMLSubjectTest.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/xml-truth/src/test/java/org/apache/axiom/truth/xml/XMLSubjectTest.java?rev=1716530&r1=1716529&r2=1716530&view=diff
==============================================================================
---
webservices/axiom/trunk/testing/xml-truth/src/test/java/org/apache/axiom/truth/xml/XMLSubjectTest.java
(original)
+++
webservices/axiom/trunk/testing/xml-truth/src/test/java/org/apache/axiom/truth/xml/XMLSubjectTest.java
Wed Nov 25 20:11:59 2015
@@ -42,11 +42,13 @@ public class XMLSubjectTest {
@Test
public void testIgnoringNamespaceDeclarationsAndPrefixes() {
+ // START SNIPPET: sample
assertAbout(xml())
.that("<p:a xmlns:p='urn:ns'/>")
.ignoringNamespacePrefixes()
.ignoringNamespaceDeclarations()
.hasSameContentAs("<a xmlns='urn:ns'/>");
+ // END SNIPPET: sample
}
@Test
