Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resolve preferentially against the JAR file #139

Merged
merged 3 commits into from Sep 14, 2019
Merged

Resolve preferentially against the JAR file #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b58f440
Resolve preferentially against the jar file
ndw Sep 14, 2019
60afbc2
Use the most recent XML Resolver, 1.0.4
ndw Sep 14, 2019
67de7e4
Version 2.3.16 released
ndw Sep 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Expand Up @@ -57,7 +57,7 @@ dependencies {
compile (
[group: 'net.sf.saxon', name: 'Saxon-HE', version: saxonVersion],
[group: 'org.relaxng', name: 'jing', version: '20181222' ],
[group: 'org.xmlresolver', name: 'xmlresolver', version: '1.0.3'],
[group: 'org.xmlresolver', name: 'xmlresolver', version: '1.0.4'],
[group: 'com.xmlcalabash', name: 'xmlcalabash', version: xmlCalabashVersion],
[group: 'com.xmlcalabash', name: 'xmlcalabash1-gradle', version: '1.3.5'],

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
@@ -1,4 +1,4 @@
version=2.3.15
version=2.3.16
saxonVersion=9.9.1-4
xmlCalabashVersion=1.1.27-99
resourcesVersion=2.0.0
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/docbook/XSLT20.java
View file
Open in desktop
Expand Up @@ -347,10 +347,10 @@ private class DocBookResolver extends Resolver {

@Override
public Source resolve(String href, String base) throws TransformerException {
// We go last
Source src = nextResolver.resolve(href, base);
// We go first
Source src = resolver.resolve(href, base);
if (src == null) {
return resolver.resolve(href, base);
return nextResolver.resolve(href, base);
} else {
return src;
}
Expand Down