Skip to content

Commit e475526

Browse files
committed
Merge branch 'includeDefaultNSinXSL' into dev
2 parents 2348f77 + c8babb4 commit e475526

2 files changed

Lines changed: 16 additions & 10 deletions

File tree

pom.xml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
<plugin>
5757
<groupId>org.codehaus.mojo</groupId>
5858
<artifactId>cobertura-maven-plugin</artifactId>
59+
<version>2.7</version>
5960
<configuration>
6061
<check>
6162
<haltOnFailure>false</haltOnFailure>
@@ -95,6 +96,7 @@
9596
<plugin>
9697
<groupId>com.mycila.maven-license-plugin</groupId>
9798
<artifactId>maven-license-plugin</artifactId>
99+
<version>1.10.b1</version>
98100
<configuration>
99101
<header>src/main/resources/header.txt</header>
100102
</configuration>
@@ -198,13 +200,14 @@
198200
</configuration>
199201
</plugin>
200202
<plugin>
201-
<groupId>org.apache.maven.plugins</groupId>
202-
<artifactId>maven-surefire-plugin</artifactId>
203-
<configuration>
204-
<forkCount>3</forkCount>
205-
<reuseForks>true</reuseForks>
206-
<argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine>
207-
</configuration>
203+
<groupId>org.apache.maven.plugins</groupId>
204+
<artifactId>maven-surefire-plugin</artifactId>
205+
<version>2.12.4</version>
206+
<configuration>
207+
<forkCount>3</forkCount>
208+
<reuseForks>true</reuseForks>
209+
<argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine>
210+
</configuration>
208211
</plugin>
209212
</plugins>
210213
</build>

src/main/java/org/xmlcml/norma/util/TransformerWrapper.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
import javax.xml.transform.stream.StreamResult;
1717
import javax.xml.transform.stream.StreamSource;
1818

19+
import net.sf.saxon.TransformerFactoryImpl;
20+
import net.sf.saxon.Configuration;
21+
import net.sf.saxon.lib.FeatureKeys;
1922
import nu.xom.Document;
2023
import nu.xom.Element;
2124

@@ -61,9 +64,9 @@ public Transformer createTransformer(File stylesheet) throws Exception {
6164
}
6265

6366
public Transformer createTransformer(org.w3c.dom.Document xslStylesheet) throws Exception {
64-
System.setProperty(JAVAX_XML_TRANSFORM_TRANSFORMER_FACTORY,
65-
NET_SF_SAXON_TRANSFORMER_FACTORY_IMPL);
66-
TransformerFactory tfactory = TransformerFactory.newInstance();
67+
Configuration config = new Configuration();
68+
config.setConfigurationProperty(FeatureKeys.SUPPRESS_XSLT_NAMESPACE_CHECK, "true");
69+
TransformerFactory tfactory = new TransformerFactoryImpl(config);
6770
DOMSource domSource = new DOMSource(xslStylesheet);
6871
javaxTransformer = tfactory.newTransformer(domSource);
6972
return javaxTransformer;

0 commit comments

Comments
 (0)