You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2015/11/21 22:14:03 UTC
svn commit: r1715575 - in /webservices/axiom/branches/DOXIA-492: pom.xml
testing/xml-truth/src/site/markdown/index.md.vm
testing/xml-truth/src/test/java/org/apache/axiom/truth/xml/XMLSubjectTest.java
Author: veithen
Date: Sat Nov 21 21:14:03 2015
New Revision: 1715575
URL: http://svn.apache.org/viewvc?rev=1715575&view=rev
Log:
Use DOXIA-492 to support snippets in Markdown.
Modified:
webservices/axiom/branches/DOXIA-492/pom.xml
webservices/axiom/branches/DOXIA-492/testing/xml-truth/src/site/markdown/index.md.vm
webservices/axiom/branches/DOXIA-492/testing/xml-truth/src/test/java/org/apache/axiom/truth/xml/XMLSubjectTest.java
Modified: webservices/axiom/branches/DOXIA-492/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/DOXIA-492/pom.xml?rev=1715575&r1=1715574&r2=1715575&view=diff
==============================================================================
--- webservices/axiom/branches/DOXIA-492/pom.xml (original)
+++ webservices/axiom/branches/DOXIA-492/pom.xml Sat Nov 21 21:14:03 2015
@@ -277,6 +277,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>
@@ -626,10 +636,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>
@@ -996,9 +1002,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/branches/DOXIA-492/testing/xml-truth/src/site/markdown/index.md.vm
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/DOXIA-492/testing/xml-truth/src/site/markdown/index.md.vm?rev=1715575&r1=1715574&r2=1715575&view=diff
==============================================================================
--- webservices/axiom/branches/DOXIA-492/testing/xml-truth/src/site/markdown/index.md.vm (original)
+++ webservices/axiom/branches/DOXIA-492/testing/xml-truth/src/site/markdown/index.md.vm Sat Nov 21 21:14:03 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=src/test/java/org/apache/axiom/truth/xml/XMLSubjectTest.java} -->
Modified: webservices/axiom/branches/DOXIA-492/testing/xml-truth/src/test/java/org/apache/axiom/truth/xml/XMLSubjectTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/DOXIA-492/testing/xml-truth/src/test/java/org/apache/axiom/truth/xml/XMLSubjectTest.java?rev=1715575&r1=1715574&r2=1715575&view=diff
==============================================================================
--- webservices/axiom/branches/DOXIA-492/testing/xml-truth/src/test/java/org/apache/axiom/truth/xml/XMLSubjectTest.java (original)
+++ webservices/axiom/branches/DOXIA-492/testing/xml-truth/src/test/java/org/apache/axiom/truth/xml/XMLSubjectTest.java Sat Nov 21 21:14:03 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