Skip to content

Commit

Permalink
Use the latest expath-tools dependencies which gives us Saxon 12
Browse files Browse the repository at this point in the history
  • Loading branch information
adamretter committed Jun 18, 2024
1 parent 568c12e commit 946f5a1
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ $ mvn clean package

| http-client-saxon Version | Saxon Versions |
|---------------------------|----------------|
| 1.5.0+ | 12.0+ |
| 1.4.0+ | 10.3+ |
| 1.3.0 | 9.9+ |
| <= 1.2.4 | 9.7+ |
Expand Down
4 changes: 2 additions & 2 deletions http-client-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.expath</groupId>
<artifactId>expath-parent</artifactId>
<version>1.6.2</version>
<version>1.8.1</version>
<relativePath />
</parent>

Expand Down Expand Up @@ -40,7 +40,7 @@
<dependency>
<groupId>org.expath.tools</groupId>
<artifactId>tools-java</artifactId>
<version>0.7.0</version>
<version>0.8.0</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
Expand Down
6 changes: 2 additions & 4 deletions http-client-saxon/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<dependency>
<groupId>org.expath.tools</groupId>
<artifactId>tools-saxon</artifactId>
<version>0.7.1</version>
<version>0.8.0</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Expand All @@ -40,7 +40,7 @@
<dependency>
<groupId>org.expath.packaging</groupId>
<artifactId>pkg-saxon</artifactId>
<version>1.6.1</version>
<version>2.1.0</version>
</dependency>
<dependency>
<groupId>net.sf.saxon</groupId>
Expand Down Expand Up @@ -109,8 +109,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.3.1</version>

<executions>
<execution>
<id>copy-examples</id>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,12 @@ public void add(HttpResponse response)
public SequenceIterator newIterator()
{
Item[] array = myItems.toArray(new Item[0]);
return new ArrayIterator(array);
return new ArrayIterator.Of(array);
}

public Sequence newSequence()
{
return new SequenceExtent(myItems);
return SequenceExtent.makeSequenceExtent(myItems);
}

private final List<Item> myItems;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import net.sf.saxon.expr.StaticProperty;
import net.sf.saxon.lib.ExtensionFunctionCall;
import net.sf.saxon.om.NamePool;
import net.sf.saxon.om.NamespaceUri;
import net.sf.saxon.om.StructuredQName;
import net.sf.saxon.pattern.NameTest;
import net.sf.saxon.pattern.NodeKindTest;
Expand Down Expand Up @@ -86,7 +87,7 @@ public SequenceType[] getArgumentTypes()
final SequenceType stype1;
if (myConfig != null) {
final NamePool pool = myConfig.getNamePool();
final ItemType itype = new NameTest(Type.ELEMENT, HttpConstants.HTTP_CLIENT_NS_URI, "request", pool);
final ItemType itype = new NameTest(Type.ELEMENT, NamespaceUri.of(HttpConstants.HTTP_CLIENT_NS_URI), "request", pool);
stype1 = SequenceType.makeSequenceType(itype, StaticProperty.EXACTLY_ONE);
} else {
stype1 = SequenceType.makeSequenceType(NodeKindTest.ELEMENT, StaticProperty.EXACTLY_ONE);
Expand Down

0 comments on commit 946f5a1

Please sign in to comment.