This is an automated email from the ASF dual-hosted git repository.

andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git

commit 1543554ba74a7016e321b749a6ced2345dd6721c
Author: Andy Seaborne <[email protected]>
AuthorDate: Sat Jan 3 20:33:49 2026 +0000

    GH-3682: Move jena-querybuilder
---
 {jena-extras/jena-querybuilder => jena-querybuilder}/README.md          | 0
 {jena-extras/jena-querybuilder => jena-querybuilder}/pom.xml            | 0
 .../java/org/apache/jena/arq/querybuilder/AbstractQueryBuilder.java     | 0
 .../src/main/java/org/apache/jena/arq/querybuilder/AskBuilder.java      | 0
 .../main/java/org/apache/jena/arq/querybuilder/ConstructBuilder.java    | 0
 .../src/main/java/org/apache/jena/arq/querybuilder/Converters.java      | 0
 .../src/main/java/org/apache/jena/arq/querybuilder/DescribeBuilder.java | 0
 .../src/main/java/org/apache/jena/arq/querybuilder/ExprFactory.java     | 0
 .../src/main/java/org/apache/jena/arq/querybuilder/Order.java           | 0
 .../src/main/java/org/apache/jena/arq/querybuilder/SelectBuilder.java   | 0
 .../src/main/java/org/apache/jena/arq/querybuilder/UpdateBuilder.java   | 0
 .../src/main/java/org/apache/jena/arq/querybuilder/WhereBuilder.java    | 0
 .../java/org/apache/jena/arq/querybuilder/clauses/ConstructClause.java  | 0
 .../java/org/apache/jena/arq/querybuilder/clauses/DatasetClause.java    | 0
 .../java/org/apache/jena/arq/querybuilder/clauses/PrologClause.java     | 0
 .../java/org/apache/jena/arq/querybuilder/clauses/SelectClause.java     | 0
 .../apache/jena/arq/querybuilder/clauses/SolutionModifierClause.java    | 0
 .../java/org/apache/jena/arq/querybuilder/clauses/ValuesClause.java     | 0
 .../main/java/org/apache/jena/arq/querybuilder/clauses/WhereClause.java | 0
 .../java/org/apache/jena/arq/querybuilder/clauses/package-info.java     | 0
 .../org/apache/jena/arq/querybuilder/handlers/AggregationHandler.java   | 0
 .../org/apache/jena/arq/querybuilder/handlers/ConstructHandler.java     | 0
 .../java/org/apache/jena/arq/querybuilder/handlers/DatasetHandler.java  | 0
 .../main/java/org/apache/jena/arq/querybuilder/handlers/Handler.java    | 0
 .../java/org/apache/jena/arq/querybuilder/handlers/HandlerBlock.java    | 0
 .../java/org/apache/jena/arq/querybuilder/handlers/PrologHandler.java   | 0
 .../java/org/apache/jena/arq/querybuilder/handlers/SelectHandler.java   | 0
 .../apache/jena/arq/querybuilder/handlers/SolutionModifierHandler.java  | 0
 .../java/org/apache/jena/arq/querybuilder/handlers/ValuesHandler.java   | 0
 .../java/org/apache/jena/arq/querybuilder/handlers/WhereHandler.java    | 0
 .../java/org/apache/jena/arq/querybuilder/handlers/package-info.java    | 0
 .../src/main/java/org/apache/jena/arq/querybuilder/package-info.java    | 0
 .../org/apache/jena/arq/querybuilder/rewriters/AbstractRewriter.java    | 0
 .../org/apache/jena/arq/querybuilder/rewriters/BuildElementVisitor.java | 0
 .../org/apache/jena/arq/querybuilder/rewriters/ElementRewriter.java     | 0
 .../java/org/apache/jena/arq/querybuilder/rewriters/ExprRewriter.java   | 0
 .../org/apache/jena/arq/querybuilder/rewriters/NodeValueRewriter.java   | 0
 .../java/org/apache/jena/arq/querybuilder/rewriters/OpRewriter.java     | 0
 .../java/org/apache/jena/arq/querybuilder/rewriters/PathRewriter.java   | 0
 .../java/org/apache/jena/arq/querybuilder/rewriters/package-info.java   | 0
 .../jena/arq/querybuilder/updatebuilder/CollectionQuadHolder.java       | 0
 .../org/apache/jena/arq/querybuilder/updatebuilder/ModelQuadHolder.java | 0
 .../org/apache/jena/arq/querybuilder/updatebuilder/PrefixHandler.java   | 0
 .../org/apache/jena/arq/querybuilder/updatebuilder/QBQuadHolder.java    | 0
 .../jena/arq/querybuilder/updatebuilder/QuadCollectionHolder.java       | 0
 .../java/org/apache/jena/arq/querybuilder/updatebuilder/QuadHolder.java | 0
 .../apache/jena/arq/querybuilder/updatebuilder/QuadIteratorBuilder.java | 0
 .../apache/jena/arq/querybuilder/updatebuilder/SingleQuadHolder.java    | 0
 .../org/apache/jena/arq/querybuilder/updatebuilder/WhereQuadHolder.java | 0
 .../java/org/apache/jena/arq/querybuilder/AbstractQueryBuilderTest.java | 0
 .../java/org/apache/jena/arq/querybuilder/AbstractRegexpBasedTest.java  | 0
 .../src/test/java/org/apache/jena/arq/querybuilder/AskBuilderTest.java  | 0
 .../java/org/apache/jena/arq/querybuilder/ConstructBuilderTest.java     | 0
 .../src/test/java/org/apache/jena/arq/querybuilder/ConvertersTest.java  | 0
 .../src/test/java/org/apache/jena/arq/querybuilder/ExprFactoryTest.java | 0
 .../test/java/org/apache/jena/arq/querybuilder/SelectBuilderTest.java   | 0
 .../java/org/apache/jena/arq/querybuilder/TestAbstractQueryBuilder.java | 0
 .../org/apache/jena/arq/querybuilder/UpdateBuilderExampleTests.java     | 0
 .../test/java/org/apache/jena/arq/querybuilder/UpdateBuilderTest.java   | 0
 .../test/java/org/apache/jena/arq/querybuilder/WhereBuilderTest.java    | 0
 .../src/test/java/org/apache/jena/arq/querybuilder/WhereValidator.java  | 0
 .../org/apache/jena/arq/querybuilder/handlers/AbstractHandlerTest.java  | 0
 .../org/apache/jena/arq/querybuilder/handlers/ConstructHandlerTest.java | 0
 .../org/apache/jena/arq/querybuilder/handlers/DatasetHandlerTest.java   | 0
 .../org/apache/jena/arq/querybuilder/handlers/PrologHandlerTest.java    | 0
 .../org/apache/jena/arq/querybuilder/handlers/SelectHandlerTest.java    | 0
 .../jena/arq/querybuilder/handlers/SolutionModifierHandlerTest.java     | 0
 .../org/apache/jena/arq/querybuilder/handlers/ValuesHandlerTest.java    | 0
 .../org/apache/jena/arq/querybuilder/handlers/WhereHandlerTest.java     | 0
 .../apache/jena/arq/querybuilder/rewriters/NodeValueRewriterTest.java   | 0
 .../jena/arq/querybuilder/updatebuilder/CollectionQuadHolderTest.java   | 0
 .../apache/jena/arq/querybuilder/updatebuilder/ModelQuadHolderTest.java | 0
 .../apache/jena/arq/querybuilder/updatebuilder/QBQuadHolderTest.java    | 0
 .../jena/arq/querybuilder/updatebuilder/SingleQuadHolderTest.java       | 0
 .../apache/jena/arq/querybuilder/updatebuilder/WhereQuadHolderTest.java | 0
 pom.xml                                                                 | 2 +-
 76 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/jena-extras/jena-querybuilder/README.md 
b/jena-querybuilder/README.md
similarity index 100%
rename from jena-extras/jena-querybuilder/README.md
rename to jena-querybuilder/README.md
diff --git a/jena-extras/jena-querybuilder/pom.xml b/jena-querybuilder/pom.xml
similarity index 100%
rename from jena-extras/jena-querybuilder/pom.xml
rename to jena-querybuilder/pom.xml
diff --git 
a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/AbstractQueryBuilder.java
 
b/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/AbstractQueryBuilder.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/AbstractQueryBuilder.java
rename to 
jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/AbstractQueryBuilder.java
diff --git 
a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/AskBuilder.java
 
b/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/AskBuilder.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/AskBuilder.java
rename to 
jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/AskBuilder.java
diff --git 
a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/ConstructBuilder.java
 
b/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/ConstructBuilder.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/ConstructBuilder.java
rename to 
jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/ConstructBuilder.java
diff --git 
a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/Converters.java
 
b/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/Converters.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/Converters.java
rename to 
jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/Converters.java
diff --git 
a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/DescribeBuilder.java
 
b/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/DescribeBuilder.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/DescribeBuilder.java
rename to 
jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/DescribeBuilder.java
diff --git 
a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/ExprFactory.java
 
b/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/ExprFactory.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/ExprFactory.java
rename to 
jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/ExprFactory.java
diff --git 
a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/Order.java
 b/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/Order.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/Order.java
rename to 
jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/Order.java
diff --git 
a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/SelectBuilder.java
 
b/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/SelectBuilder.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/SelectBuilder.java
rename to 
jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/SelectBuilder.java
diff --git 
a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/UpdateBuilder.java
 
b/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/UpdateBuilder.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/UpdateBuilder.java
rename to 
jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/UpdateBuilder.java
diff --git 
a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/WhereBuilder.java
 
b/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/WhereBuilder.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/WhereBuilder.java
rename to 
jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/WhereBuilder.java
diff --git 
a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/ConstructClause.java
 
b/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/ConstructClause.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/ConstructClause.java
rename to 
jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/ConstructClause.java
diff --git 
a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/DatasetClause.java
 
b/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/DatasetClause.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/DatasetClause.java
rename to 
jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/DatasetClause.java
diff --git 
a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/PrologClause.java
 
b/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/PrologClause.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/PrologClause.java
rename to 
jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/PrologClause.java
diff --git 
a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/SelectClause.java
 
b/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/SelectClause.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/SelectClause.java
rename to 
jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/SelectClause.java
diff --git 
a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/SolutionModifierClause.java
 
b/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/SolutionModifierClause.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/SolutionModifierClause.java
rename to 
jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/SolutionModifierClause.java
diff --git 
a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/ValuesClause.java
 
b/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/ValuesClause.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/ValuesClause.java
rename to 
jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/ValuesClause.java
diff --git 
a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/WhereClause.java
 
b/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/WhereClause.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/WhereClause.java
rename to 
jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/WhereClause.java
diff --git 
a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/package-info.java
 
b/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/package-info.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/package-info.java
rename to 
jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/package-info.java
diff --git 
a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/AggregationHandler.java
 
b/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/AggregationHandler.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/AggregationHandler.java
rename to 
jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/AggregationHandler.java
diff --git 
a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/ConstructHandler.java
 
b/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/ConstructHandler.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/ConstructHandler.java
rename to 
jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/ConstructHandler.java
diff --git 
a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/DatasetHandler.java
 
b/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/DatasetHandler.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/DatasetHandler.java
rename to 
jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/DatasetHandler.java
diff --git 
a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/Handler.java
 
b/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/Handler.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/Handler.java
rename to 
jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/Handler.java
diff --git 
a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/HandlerBlock.java
 
b/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/HandlerBlock.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/HandlerBlock.java
rename to 
jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/HandlerBlock.java
diff --git 
a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/PrologHandler.java
 
b/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/PrologHandler.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/PrologHandler.java
rename to 
jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/PrologHandler.java
diff --git 
a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/SelectHandler.java
 
b/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/SelectHandler.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/SelectHandler.java
rename to 
jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/SelectHandler.java
diff --git 
a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandler.java
 
b/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandler.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandler.java
rename to 
jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandler.java
diff --git 
a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/ValuesHandler.java
 
b/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/ValuesHandler.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/ValuesHandler.java
rename to 
jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/ValuesHandler.java
diff --git 
a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/WhereHandler.java
 
b/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/WhereHandler.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/WhereHandler.java
rename to 
jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/WhereHandler.java
diff --git 
a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/package-info.java
 
b/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/package-info.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/package-info.java
rename to 
jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/package-info.java
diff --git 
a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/package-info.java
 
b/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/package-info.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/package-info.java
rename to 
jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/package-info.java
diff --git 
a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/AbstractRewriter.java
 
b/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/AbstractRewriter.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/AbstractRewriter.java
rename to 
jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/AbstractRewriter.java
diff --git 
a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/BuildElementVisitor.java
 
b/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/BuildElementVisitor.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/BuildElementVisitor.java
rename to 
jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/BuildElementVisitor.java
diff --git 
a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/ElementRewriter.java
 
b/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/ElementRewriter.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/ElementRewriter.java
rename to 
jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/ElementRewriter.java
diff --git 
a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/ExprRewriter.java
 
b/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/ExprRewriter.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/ExprRewriter.java
rename to 
jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/ExprRewriter.java
diff --git 
a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/NodeValueRewriter.java
 
b/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/NodeValueRewriter.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/NodeValueRewriter.java
rename to 
jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/NodeValueRewriter.java
diff --git 
a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/OpRewriter.java
 
b/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/OpRewriter.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/OpRewriter.java
rename to 
jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/OpRewriter.java
diff --git 
a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/PathRewriter.java
 
b/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/PathRewriter.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/PathRewriter.java
rename to 
jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/PathRewriter.java
diff --git 
a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/package-info.java
 
b/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/package-info.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/package-info.java
rename to 
jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/package-info.java
diff --git 
a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/CollectionQuadHolder.java
 
b/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/CollectionQuadHolder.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/CollectionQuadHolder.java
rename to 
jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/CollectionQuadHolder.java
diff --git 
a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/ModelQuadHolder.java
 
b/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/ModelQuadHolder.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/ModelQuadHolder.java
rename to 
jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/ModelQuadHolder.java
diff --git 
a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/PrefixHandler.java
 
b/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/PrefixHandler.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/PrefixHandler.java
rename to 
jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/PrefixHandler.java
diff --git 
a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/QBQuadHolder.java
 
b/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/QBQuadHolder.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/QBQuadHolder.java
rename to 
jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/QBQuadHolder.java
diff --git 
a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/QuadCollectionHolder.java
 
b/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/QuadCollectionHolder.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/QuadCollectionHolder.java
rename to 
jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/QuadCollectionHolder.java
diff --git 
a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/QuadHolder.java
 
b/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/QuadHolder.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/QuadHolder.java
rename to 
jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/QuadHolder.java
diff --git 
a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/QuadIteratorBuilder.java
 
b/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/QuadIteratorBuilder.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/QuadIteratorBuilder.java
rename to 
jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/QuadIteratorBuilder.java
diff --git 
a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/SingleQuadHolder.java
 
b/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/SingleQuadHolder.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/SingleQuadHolder.java
rename to 
jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/SingleQuadHolder.java
diff --git 
a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/WhereQuadHolder.java
 
b/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/WhereQuadHolder.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/WhereQuadHolder.java
rename to 
jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/WhereQuadHolder.java
diff --git 
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/AbstractQueryBuilderTest.java
 
b/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/AbstractQueryBuilderTest.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/AbstractQueryBuilderTest.java
rename to 
jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/AbstractQueryBuilderTest.java
diff --git 
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/AbstractRegexpBasedTest.java
 
b/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/AbstractRegexpBasedTest.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/AbstractRegexpBasedTest.java
rename to 
jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/AbstractRegexpBasedTest.java
diff --git 
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/AskBuilderTest.java
 
b/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/AskBuilderTest.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/AskBuilderTest.java
rename to 
jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/AskBuilderTest.java
diff --git 
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/ConstructBuilderTest.java
 
b/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/ConstructBuilderTest.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/ConstructBuilderTest.java
rename to 
jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/ConstructBuilderTest.java
diff --git 
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/ConvertersTest.java
 
b/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/ConvertersTest.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/ConvertersTest.java
rename to 
jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/ConvertersTest.java
diff --git 
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/ExprFactoryTest.java
 
b/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/ExprFactoryTest.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/ExprFactoryTest.java
rename to 
jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/ExprFactoryTest.java
diff --git 
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/SelectBuilderTest.java
 
b/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/SelectBuilderTest.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/SelectBuilderTest.java
rename to 
jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/SelectBuilderTest.java
diff --git 
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/TestAbstractQueryBuilder.java
 
b/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/TestAbstractQueryBuilder.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/TestAbstractQueryBuilder.java
rename to 
jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/TestAbstractQueryBuilder.java
diff --git 
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/UpdateBuilderExampleTests.java
 
b/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/UpdateBuilderExampleTests.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/UpdateBuilderExampleTests.java
rename to 
jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/UpdateBuilderExampleTests.java
diff --git 
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/UpdateBuilderTest.java
 
b/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/UpdateBuilderTest.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/UpdateBuilderTest.java
rename to 
jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/UpdateBuilderTest.java
diff --git 
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/WhereBuilderTest.java
 
b/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/WhereBuilderTest.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/WhereBuilderTest.java
rename to 
jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/WhereBuilderTest.java
diff --git 
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/WhereValidator.java
 
b/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/WhereValidator.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/WhereValidator.java
rename to 
jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/WhereValidator.java
diff --git 
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/AbstractHandlerTest.java
 
b/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/AbstractHandlerTest.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/AbstractHandlerTest.java
rename to 
jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/AbstractHandlerTest.java
diff --git 
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/ConstructHandlerTest.java
 
b/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/ConstructHandlerTest.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/ConstructHandlerTest.java
rename to 
jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/ConstructHandlerTest.java
diff --git 
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/DatasetHandlerTest.java
 
b/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/DatasetHandlerTest.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/DatasetHandlerTest.java
rename to 
jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/DatasetHandlerTest.java
diff --git 
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/PrologHandlerTest.java
 
b/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/PrologHandlerTest.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/PrologHandlerTest.java
rename to 
jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/PrologHandlerTest.java
diff --git 
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SelectHandlerTest.java
 
b/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SelectHandlerTest.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SelectHandlerTest.java
rename to 
jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SelectHandlerTest.java
diff --git 
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandlerTest.java
 
b/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandlerTest.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandlerTest.java
rename to 
jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandlerTest.java
diff --git 
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/ValuesHandlerTest.java
 
b/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/ValuesHandlerTest.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/ValuesHandlerTest.java
rename to 
jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/ValuesHandlerTest.java
diff --git 
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/WhereHandlerTest.java
 
b/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/WhereHandlerTest.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/WhereHandlerTest.java
rename to 
jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/WhereHandlerTest.java
diff --git 
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/rewriters/NodeValueRewriterTest.java
 
b/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/rewriters/NodeValueRewriterTest.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/rewriters/NodeValueRewriterTest.java
rename to 
jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/rewriters/NodeValueRewriterTest.java
diff --git 
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/updatebuilder/CollectionQuadHolderTest.java
 
b/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/updatebuilder/CollectionQuadHolderTest.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/updatebuilder/CollectionQuadHolderTest.java
rename to 
jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/updatebuilder/CollectionQuadHolderTest.java
diff --git 
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/updatebuilder/ModelQuadHolderTest.java
 
b/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/updatebuilder/ModelQuadHolderTest.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/updatebuilder/ModelQuadHolderTest.java
rename to 
jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/updatebuilder/ModelQuadHolderTest.java
diff --git 
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/updatebuilder/QBQuadHolderTest.java
 
b/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/updatebuilder/QBQuadHolderTest.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/updatebuilder/QBQuadHolderTest.java
rename to 
jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/updatebuilder/QBQuadHolderTest.java
diff --git 
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/updatebuilder/SingleQuadHolderTest.java
 
b/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/updatebuilder/SingleQuadHolderTest.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/updatebuilder/SingleQuadHolderTest.java
rename to 
jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/updatebuilder/SingleQuadHolderTest.java
diff --git 
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/updatebuilder/WhereQuadHolderTest.java
 
b/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/updatebuilder/WhereQuadHolderTest.java
similarity index 100%
rename from 
jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/updatebuilder/WhereQuadHolderTest.java
rename to 
jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/updatebuilder/WhereQuadHolderTest.java
diff --git a/pom.xml b/pom.xml
index 3d4d7806ac..47434a7045 100644
--- a/pom.xml
+++ b/pom.xml
@@ -300,7 +300,7 @@
         <module>apache-jena</module>
 
         <module>jena-extras/jena-commonsrdf</module>
-        <module>jena-extras/jena-querybuilder</module>
+        <module>jena-querybuilder</module>
 
         <module>jena-examples</module>
 


Reply via email to