Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 946f5a1

Browse files
committedJun 18, 2024·
Use the latest expath-tools dependencies which gives us Saxon 12
1 parent 568c12e commit 946f5a1

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed
 

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ $ mvn clean package
3131

3232
| http-client-saxon Version | Saxon Versions |
3333
|---------------------------|----------------|
34+
| 1.5.0+ | 12.0+ |
3435
| 1.4.0+ | 10.3+ |
3536
| 1.3.0 | 9.9+ |
3637
| <= 1.2.4 | 9.7+ |

‎http-client-parent/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.expath</groupId>
77
<artifactId>expath-parent</artifactId>
8-
<version>1.6.2</version>
8+
<version>1.8.1</version>
99
<relativePath />
1010
</parent>
1111

@@ -40,7 +40,7 @@
4040
<dependency>
4141
<groupId>org.expath.tools</groupId>
4242
<artifactId>tools-java</artifactId>
43-
<version>0.7.0</version>
43+
<version>0.8.0</version>
4444
</dependency>
4545
<dependency>
4646
<groupId>org.apache.httpcomponents</groupId>

‎http-client-saxon/pom.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<dependency>
3131
<groupId>org.expath.tools</groupId>
3232
<artifactId>tools-saxon</artifactId>
33-
<version>0.7.1</version>
33+
<version>0.8.0</version>
3434
</dependency>
3535
<dependency>
3636
<groupId>${project.groupId}</groupId>
@@ -40,7 +40,7 @@
4040
<dependency>
4141
<groupId>org.expath.packaging</groupId>
4242
<artifactId>pkg-saxon</artifactId>
43-
<version>1.6.1</version>
43+
<version>2.1.0</version>
4444
</dependency>
4545
<dependency>
4646
<groupId>net.sf.saxon</groupId>
@@ -109,8 +109,6 @@
109109
<plugin>
110110
<groupId>org.apache.maven.plugins</groupId>
111111
<artifactId>maven-resources-plugin</artifactId>
112-
<version>3.3.1</version>
113-
114112
<executions>
115113
<execution>
116114
<id>copy-examples</id>

‎http-client-saxon/src/main/java/org/expath/httpclient/saxon/SaxonResult.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,12 +127,12 @@ public void add(HttpResponse response)
127127
public SequenceIterator newIterator()
128128
{
129129
Item[] array = myItems.toArray(new Item[0]);
130-
return new ArrayIterator(array);
130+
return new ArrayIterator.Of(array);
131131
}
132132

133133
public Sequence newSequence()
134134
{
135-
return new SequenceExtent(myItems);
135+
return SequenceExtent.makeSequenceExtent(myItems);
136136
}
137137

138138
private final List<Item> myItems;

‎http-client-saxon/src/main/java/org/expath/httpclient/saxon/SendRequestFunction.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import net.sf.saxon.expr.StaticProperty;
1414
import net.sf.saxon.lib.ExtensionFunctionCall;
1515
import net.sf.saxon.om.NamePool;
16+
import net.sf.saxon.om.NamespaceUri;
1617
import net.sf.saxon.om.StructuredQName;
1718
import net.sf.saxon.pattern.NameTest;
1819
import net.sf.saxon.pattern.NodeKindTest;
@@ -86,7 +87,7 @@ public SequenceType[] getArgumentTypes()
8687
final SequenceType stype1;
8788
if (myConfig != null) {
8889
final NamePool pool = myConfig.getNamePool();
89-
final ItemType itype = new NameTest(Type.ELEMENT, HttpConstants.HTTP_CLIENT_NS_URI, "request", pool);
90+
final ItemType itype = new NameTest(Type.ELEMENT, NamespaceUri.of(HttpConstants.HTTP_CLIENT_NS_URI), "request", pool);
9091
stype1 = SequenceType.makeSequenceType(itype, StaticProperty.EXACTLY_ONE);
9192
} else {
9293
stype1 = SequenceType.makeSequenceType(NodeKindTest.ELEMENT, StaticProperty.EXACTLY_ONE);

0 commit comments

Comments
 (0)
Please sign in to comment.