You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2026/01/05 11:20:58 UTC
(jena) branch main updated (60d6f3e19b -> 0bffdbcff0)
This is an automated email from the ASF dual-hosted git repository.
andy pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
from 60d6f3e19b Update NOTICE files for 2026
new 19b6cff2ef Build jena-geosparql before jena-fuseki2
new 367f69d709 GH-3682: Remove the jena-extras maven module
new 1fddafd387 GH-3682: Move jena-serviceenhancer
new 1543554ba7 GH-3682: Move jena-querybuilder
new 0bffdbcff0 GH-3682: Move jena-rdfcommons
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../jena-commonsrdf => jena-commonsrdf}/README.md | 0
.../jena-commonsrdf => jena-commonsrdf}/pom.xml | 2 +-
.../jena/commonsrdf/ConversionException.java | 0
.../org/apache/jena/commonsrdf/JenaCommonsRDF.java | 0
.../java/org/apache/jena/commonsrdf/JenaRDF.java | 0
.../apache/jena/commonsrdf/impl/JCR_BlankNode.java | 0
.../apache/jena/commonsrdf/impl/JCR_Dataset.java | 0
.../apache/jena/commonsrdf/impl/JCR_Factory.java | 0
.../org/apache/jena/commonsrdf/impl/JCR_Graph.java | 0
.../org/apache/jena/commonsrdf/impl/JCR_IRI.java | 0
.../apache/jena/commonsrdf/impl/JCR_Literal.java | 0
.../org/apache/jena/commonsrdf/impl/JCR_Quad.java | 0
.../org/apache/jena/commonsrdf/impl/JCR_Term.java | 0
.../apache/jena/commonsrdf/impl/JCR_Triple.java | 0
.../apache/jena/commonsrdf/impl/JenaDataset.java | 0
.../org/apache/jena/commonsrdf/impl/JenaGraph.java | 0
.../org/apache/jena/commonsrdf/impl/JenaNode.java | 0
.../org/apache/jena/commonsrdf/impl/JenaQuad.java | 0
.../apache/jena/commonsrdf/impl/JenaTriple.java | 0
.../org/apache/jena/commonsrdf/impl/ToDataset.java | 0
.../org/apache/jena/commonsrdf/impl/ToGraph.java | 0
.../services/org.apache.commons.rdf.api.RDF | 0
.../apache/jena/commonsrdf/TS_JenaCommonsRDF.java | 0
.../apache/jena/commonsrdf/TestBlankNodeJena.java | 0
.../apache/jena/commonsrdf/TestDatasetJena.java | 0
.../org/apache/jena/commonsrdf/TestGraphJena.java | 0
.../org/apache/jena/commonsrdf/TestJenaSimple.java | 0
.../jena/commonsrdf/TestRDFTermFactoryJena.java | 0
.../commonsrdf/TestServiceLoaderCommonsRDF.java | 0
.../examples/Ex_JenaGraphToCommonsRDFGraph.java | 0
.../examples/Ex_ParseIntoCommonsRDFGraph.java | 0
.../src/test/resources/log4j2-test.properties | 0
jena-extras/pom.xml | 38 ----------------------
.../README.md | 0
.../pom.xml | 2 +-
.../arq/querybuilder/AbstractQueryBuilder.java | 0
.../apache/jena/arq/querybuilder/AskBuilder.java | 0
.../jena/arq/querybuilder/ConstructBuilder.java | 0
.../apache/jena/arq/querybuilder/Converters.java | 0
.../jena/arq/querybuilder/DescribeBuilder.java | 0
.../apache/jena/arq/querybuilder/ExprFactory.java | 0
.../org/apache/jena/arq/querybuilder/Order.java | 0
.../jena/arq/querybuilder/SelectBuilder.java | 0
.../jena/arq/querybuilder/UpdateBuilder.java | 0
.../apache/jena/arq/querybuilder/WhereBuilder.java | 0
.../arq/querybuilder/clauses/ConstructClause.java | 0
.../arq/querybuilder/clauses/DatasetClause.java | 0
.../arq/querybuilder/clauses/PrologClause.java | 0
.../arq/querybuilder/clauses/SelectClause.java | 0
.../clauses/SolutionModifierClause.java | 0
.../arq/querybuilder/clauses/ValuesClause.java | 0
.../jena/arq/querybuilder/clauses/WhereClause.java | 0
.../arq/querybuilder/clauses/package-info.java | 0
.../querybuilder/handlers/AggregationHandler.java | 0
.../querybuilder/handlers/ConstructHandler.java | 0
.../arq/querybuilder/handlers/DatasetHandler.java | 0
.../jena/arq/querybuilder/handlers/Handler.java | 0
.../arq/querybuilder/handlers/HandlerBlock.java | 0
.../arq/querybuilder/handlers/PrologHandler.java | 0
.../arq/querybuilder/handlers/SelectHandler.java | 0
.../handlers/SolutionModifierHandler.java | 0
.../arq/querybuilder/handlers/ValuesHandler.java | 0
.../arq/querybuilder/handlers/WhereHandler.java | 0
.../arq/querybuilder/handlers/package-info.java | 0
.../apache/jena/arq/querybuilder/package-info.java | 0
.../querybuilder/rewriters/AbstractRewriter.java | 0
.../rewriters/BuildElementVisitor.java | 0
.../querybuilder/rewriters/ElementRewriter.java | 0
.../arq/querybuilder/rewriters/ExprRewriter.java | 0
.../querybuilder/rewriters/NodeValueRewriter.java | 0
.../arq/querybuilder/rewriters/OpRewriter.java | 0
.../arq/querybuilder/rewriters/PathRewriter.java | 0
.../arq/querybuilder/rewriters/package-info.java | 0
.../updatebuilder/CollectionQuadHolder.java | 0
.../updatebuilder/ModelQuadHolder.java | 0
.../querybuilder/updatebuilder/PrefixHandler.java | 0
.../querybuilder/updatebuilder/QBQuadHolder.java | 0
.../updatebuilder/QuadCollectionHolder.java | 0
.../arq/querybuilder/updatebuilder/QuadHolder.java | 0
.../updatebuilder/QuadIteratorBuilder.java | 0
.../updatebuilder/SingleQuadHolder.java | 0
.../updatebuilder/WhereQuadHolder.java | 0
.../arq/querybuilder/AbstractQueryBuilderTest.java | 0
.../arq/querybuilder/AbstractRegexpBasedTest.java | 0
.../jena/arq/querybuilder/AskBuilderTest.java | 0
.../arq/querybuilder/ConstructBuilderTest.java | 0
.../jena/arq/querybuilder/ConvertersTest.java | 0
.../jena/arq/querybuilder/ExprFactoryTest.java | 0
.../jena/arq/querybuilder/SelectBuilderTest.java | 0
.../arq/querybuilder/TestAbstractQueryBuilder.java | 0
.../querybuilder/UpdateBuilderExampleTests.java | 0
.../jena/arq/querybuilder/UpdateBuilderTest.java | 0
.../jena/arq/querybuilder/WhereBuilderTest.java | 0
.../jena/arq/querybuilder/WhereValidator.java | 0
.../querybuilder/handlers/AbstractHandlerTest.java | 0
.../handlers/ConstructHandlerTest.java | 0
.../querybuilder/handlers/DatasetHandlerTest.java | 0
.../querybuilder/handlers/PrologHandlerTest.java | 0
.../querybuilder/handlers/SelectHandlerTest.java | 0
.../handlers/SolutionModifierHandlerTest.java | 0
.../querybuilder/handlers/ValuesHandlerTest.java | 0
.../querybuilder/handlers/WhereHandlerTest.java | 0
.../rewriters/NodeValueRewriterTest.java | 0
.../updatebuilder/CollectionQuadHolderTest.java | 0
.../updatebuilder/ModelQuadHolderTest.java | 0
.../updatebuilder/QBQuadHolderTest.java | 0
.../updatebuilder/SingleQuadHolderTest.java | 0
.../updatebuilder/WhereQuadHolderTest.java | 0
.../README.md | 0
.../pom.xml | 2 +-
.../algebra/TransformSE_EffectiveOptions.java | 0
.../enhancer/algebra/TransformSE_JoinStrategy.java | 0
.../algebra/TransformSE_OptimizeSelfJoin.java | 0
.../assembler/DatasetAssemblerServiceEnhancer.java | 0
.../enhancer/assembler/ServiceEnhancerVocab.java | 0
.../enhancer/claimingcache/AsyncClaimingCache.java | 0
.../claimingcache/AsyncClaimingCacheImplGuava.java | 0
.../sparql/service/enhancer/claimingcache/Ref.java | 0
.../enhancer/claimingcache/RefDelegate.java | 0
.../enhancer/claimingcache/RefDelegateBase.java | 0
.../service/enhancer/claimingcache/RefFuture.java | 0
.../enhancer/claimingcache/RefFutureImpl.java | 0
.../service/enhancer/claimingcache/RefImpl.java | 0
.../enhancer/example/ServiceCachingExamples.java | 0
.../enhancer/example/ServicePluginExamples.java | 0
.../sparql/service/enhancer/function/cacheRm.java | 0
.../jena/sparql/service/enhancer/impl/Batch.java | 0
.../sparql/service/enhancer/impl/BatchImpl.java | 0
.../enhancer/impl/BatchQueryRewriteResult.java | 0
.../service/enhancer/impl/BatchQueryRewriter.java | 0
.../enhancer/impl/BatchQueryRewriterBuilder.java | 0
.../jena/sparql/service/enhancer/impl/Batcher.java | 0
.../sparql/service/enhancer/impl/CacheMode.java | 0
.../enhancer/impl/CacheProviderRegistry.java | 0
.../impl/ChainingServiceExecutorBulkCache.java | 0
...ChainingServiceExecutorBulkServiceEnhancer.java | 0
.../sparql/service/enhancer/impl/Estimate.java | 0
.../sparql/service/enhancer/impl/GroupedBatch.java | 0
.../service/enhancer/impl/GroupedBatchImpl.java | 0
.../enhancer/impl/IteratorFactoryWithBuffer.java | 0
.../service/enhancer/impl/OpServiceExecutor.java | 0
.../enhancer/impl/OpServiceExecutorImpl.java | 0
.../service/enhancer/impl/OpServiceInfo.java | 0
.../service/enhancer/impl/PartitionRequest.java | 0
.../enhancer/impl/QueryIterServiceBulk.java | 0
.../enhancer/impl/QueryIterWrapperCache.java | 0
.../service/enhancer/impl/RequestExecutor.java | 0
.../service/enhancer/impl/ServiceCacheKey.java | 0
.../enhancer/impl/ServiceCacheKeyFactory.java | 0
.../service/enhancer/impl/ServiceCacheValue.java | 0
.../sparql/service/enhancer/impl/ServiceOpts.java | 0
.../enhancer/impl/ServiceResponseCache.java | 0
.../enhancer/impl/ServiceResultSizeCache.java | 0
.../sparql/service/enhancer/impl/SliceKey.java | 0
.../enhancer/impl/util/AutoCloseableBase.java | 0
.../util/AutoCloseableWithLeakDetectionBase.java | 0
.../service/enhancer/impl/util/BindingUtils.java | 0
.../enhancer/impl/util/CollectionUtils.java | 0
.../enhancer/impl/util/DynamicDatasetUtils.java | 0
.../service/enhancer/impl/util/FinallyRunAll.java | 0
.../enhancer/impl/util/GraphUtilsExtra.java | 0
.../service/enhancer/impl/util/IteratorUtils.java | 0
.../service/enhancer/impl/util/LockUtils.java | 0
.../service/enhancer/impl/util/NodeUtilsExtra.java | 0
.../service/enhancer/impl/util/PageUtils.java | 0
.../enhancer/impl/util/PeekIteratorLazy.java | 0
.../enhancer/impl/util/PropFuncArgUtils.java | 0
.../service/enhancer/impl/util/QueryIterDefer.java | 0
.../enhancer/impl/util/QueryIterSlottedBase.java | 0
.../service/enhancer/impl/util/RangeUtils.java | 0
.../enhancer/impl/util/SinglePrefetchIterator.java | 0
.../enhancer/impl/util/StackTraceUtils.java | 0
.../enhancer/impl/util/ThrowingRunnable.java | 0
.../service/enhancer/impl/util/VarScopeUtils.java | 0
.../service/enhancer/impl/util/VarUtilsExtra.java | 0
.../enhancer/init/ServiceEnhancerConstants.java | 0
.../service/enhancer/init/ServiceEnhancerInit.java | 0
.../sparql/service/enhancer/pfunction/cacheLs.java | 0
.../service/enhancer/slice/api/ArrayOps.java | 0
.../service/enhancer/slice/api/ChannelBase.java | 0
.../service/enhancer/slice/api/Disposable.java | 0
.../service/enhancer/slice/api/HasArrayOps.java | 0
.../slice/api/IteratorOverReadableChannel.java | 0
.../service/enhancer/slice/api/PageHelper.java | 0
.../enhancer/slice/api/ReadableChannel.java | 0
.../enhancer/slice/api/ReadableChannelBase.java | 0
.../api/ReadableChannelOverSliceAccessor.java | 0
.../slice/api/ReadableChannelWithLimit.java | 0
.../sparql/service/enhancer/slice/api/Slice.java | 0
.../service/enhancer/slice/api/SliceAccessor.java | 0
.../enhancer/slice/api/SliceMetaDataBasic.java | 0
.../service/enhancer/slice/api/SliceWithPages.java | 0
.../enhancer/slice/impl/ArrayOpsObject.java | 0
.../service/enhancer/slice/impl/ArrayReadable.java | 0
.../service/enhancer/slice/impl/ArrayWritable.java | 0
.../sparql/service/enhancer/slice/impl/Buffer.java | 0
.../service/enhancer/slice/impl/BufferLike.java | 0
.../enhancer/slice/impl/BufferOverArray.java | 0
.../service/enhancer/slice/impl/BufferView.java | 0
.../service/enhancer/slice/impl/RangeBuffer.java | 0
.../enhancer/slice/impl/RangeBufferImpl.java | 0
.../enhancer/slice/impl/ReadOverGapException.java | 0
.../enhancer/slice/impl/SliceAccessorImpl.java | 0
.../service/enhancer/slice/impl/SliceBase.java | 0
.../enhancer/slice/impl/SliceInMemoryCache.java | 0
.../enhancer/slice/impl/SliceMetaDataImpl.java | 0
.../slice/impl/SliceMetaDataWithPages.java | 0
.../slice/impl/SliceMetaDataWithPagesImpl.java | 0
.../org.apache.jena.sys.JenaSubsystemLifecycle | 0
.../TestServiceEnhancerDatasetAssembler.java | 0
...AbstractTestServiceEnhancerResultSetLimits.java | 0
.../TestServiceEnhancerBatchQueryRewriter.java | 0
.../enhancer/impl/TestServiceEnhancerBatcher.java | 0
.../impl/TestServiceEnhancerCachedVsUncached.java | 0
.../enhancer/impl/TestServiceEnhancerMisc.java | 0
...estServiceEnhancerResultSetLimitsWithCache.java | 0
...ServiceEnhancerResultSetLimitsWithoutCache.java | 0
.../src/test/resources/log4j2-test.properties | 0
.../src/test/resources/semweb.wikidata.sample.ttl | 0
pom.xml | 15 ++++++---
220 files changed, 13 insertions(+), 46 deletions(-)
rename {jena-extras/jena-commonsrdf => jena-commonsrdf}/README.md (100%)
rename {jena-extras/jena-commonsrdf => jena-commonsrdf}/pom.xml (98%)
rename {jena-extras/jena-commonsrdf => jena-commonsrdf}/src/main/java/org/apache/jena/commonsrdf/ConversionException.java (100%)
rename {jena-extras/jena-commonsrdf => jena-commonsrdf}/src/main/java/org/apache/jena/commonsrdf/JenaCommonsRDF.java (100%)
rename {jena-extras/jena-commonsrdf => jena-commonsrdf}/src/main/java/org/apache/jena/commonsrdf/JenaRDF.java (100%)
rename {jena-extras/jena-commonsrdf => jena-commonsrdf}/src/main/java/org/apache/jena/commonsrdf/impl/JCR_BlankNode.java (100%)
rename {jena-extras/jena-commonsrdf => jena-commonsrdf}/src/main/java/org/apache/jena/commonsrdf/impl/JCR_Dataset.java (100%)
rename {jena-extras/jena-commonsrdf => jena-commonsrdf}/src/main/java/org/apache/jena/commonsrdf/impl/JCR_Factory.java (100%)
rename {jena-extras/jena-commonsrdf => jena-commonsrdf}/src/main/java/org/apache/jena/commonsrdf/impl/JCR_Graph.java (100%)
rename {jena-extras/jena-commonsrdf => jena-commonsrdf}/src/main/java/org/apache/jena/commonsrdf/impl/JCR_IRI.java (100%)
rename {jena-extras/jena-commonsrdf => jena-commonsrdf}/src/main/java/org/apache/jena/commonsrdf/impl/JCR_Literal.java (100%)
rename {jena-extras/jena-commonsrdf => jena-commonsrdf}/src/main/java/org/apache/jena/commonsrdf/impl/JCR_Quad.java (100%)
rename {jena-extras/jena-commonsrdf => jena-commonsrdf}/src/main/java/org/apache/jena/commonsrdf/impl/JCR_Term.java (100%)
rename {jena-extras/jena-commonsrdf => jena-commonsrdf}/src/main/java/org/apache/jena/commonsrdf/impl/JCR_Triple.java (100%)
rename {jena-extras/jena-commonsrdf => jena-commonsrdf}/src/main/java/org/apache/jena/commonsrdf/impl/JenaDataset.java (100%)
rename {jena-extras/jena-commonsrdf => jena-commonsrdf}/src/main/java/org/apache/jena/commonsrdf/impl/JenaGraph.java (100%)
rename {jena-extras/jena-commonsrdf => jena-commonsrdf}/src/main/java/org/apache/jena/commonsrdf/impl/JenaNode.java (100%)
rename {jena-extras/jena-commonsrdf => jena-commonsrdf}/src/main/java/org/apache/jena/commonsrdf/impl/JenaQuad.java (100%)
rename {jena-extras/jena-commonsrdf => jena-commonsrdf}/src/main/java/org/apache/jena/commonsrdf/impl/JenaTriple.java (100%)
rename {jena-extras/jena-commonsrdf => jena-commonsrdf}/src/main/java/org/apache/jena/commonsrdf/impl/ToDataset.java (100%)
rename {jena-extras/jena-commonsrdf => jena-commonsrdf}/src/main/java/org/apache/jena/commonsrdf/impl/ToGraph.java (100%)
rename {jena-extras/jena-commonsrdf => jena-commonsrdf}/src/main/resources/META-INF/services/org.apache.commons.rdf.api.RDF (100%)
rename {jena-extras/jena-commonsrdf => jena-commonsrdf}/src/test/java/org/apache/jena/commonsrdf/TS_JenaCommonsRDF.java (100%)
rename {jena-extras/jena-commonsrdf => jena-commonsrdf}/src/test/java/org/apache/jena/commonsrdf/TestBlankNodeJena.java (100%)
rename {jena-extras/jena-commonsrdf => jena-commonsrdf}/src/test/java/org/apache/jena/commonsrdf/TestDatasetJena.java (100%)
rename {jena-extras/jena-commonsrdf => jena-commonsrdf}/src/test/java/org/apache/jena/commonsrdf/TestGraphJena.java (100%)
rename {jena-extras/jena-commonsrdf => jena-commonsrdf}/src/test/java/org/apache/jena/commonsrdf/TestJenaSimple.java (100%)
rename {jena-extras/jena-commonsrdf => jena-commonsrdf}/src/test/java/org/apache/jena/commonsrdf/TestRDFTermFactoryJena.java (100%)
rename {jena-extras/jena-commonsrdf => jena-commonsrdf}/src/test/java/org/apache/jena/commonsrdf/TestServiceLoaderCommonsRDF.java (100%)
rename {jena-extras/jena-commonsrdf => jena-commonsrdf}/src/test/java/org/apache/jena/commonsrdf/examples/Ex_JenaGraphToCommonsRDFGraph.java (100%)
rename {jena-extras/jena-commonsrdf => jena-commonsrdf}/src/test/java/org/apache/jena/commonsrdf/examples/Ex_ParseIntoCommonsRDFGraph.java (100%)
rename {jena-extras/jena-commonsrdf => jena-commonsrdf}/src/test/resources/log4j2-test.properties (100%)
delete mode 100644 jena-extras/pom.xml
rename {jena-extras/jena-querybuilder => jena-querybuilder}/README.md (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/pom.xml (98%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/main/java/org/apache/jena/arq/querybuilder/AbstractQueryBuilder.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/main/java/org/apache/jena/arq/querybuilder/AskBuilder.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/main/java/org/apache/jena/arq/querybuilder/ConstructBuilder.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/main/java/org/apache/jena/arq/querybuilder/Converters.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/main/java/org/apache/jena/arq/querybuilder/DescribeBuilder.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/main/java/org/apache/jena/arq/querybuilder/ExprFactory.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/main/java/org/apache/jena/arq/querybuilder/Order.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/main/java/org/apache/jena/arq/querybuilder/SelectBuilder.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/main/java/org/apache/jena/arq/querybuilder/UpdateBuilder.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/main/java/org/apache/jena/arq/querybuilder/WhereBuilder.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/main/java/org/apache/jena/arq/querybuilder/clauses/ConstructClause.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/main/java/org/apache/jena/arq/querybuilder/clauses/DatasetClause.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/main/java/org/apache/jena/arq/querybuilder/clauses/PrologClause.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/main/java/org/apache/jena/arq/querybuilder/clauses/SelectClause.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/main/java/org/apache/jena/arq/querybuilder/clauses/SolutionModifierClause.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/main/java/org/apache/jena/arq/querybuilder/clauses/ValuesClause.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/main/java/org/apache/jena/arq/querybuilder/clauses/WhereClause.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/main/java/org/apache/jena/arq/querybuilder/clauses/package-info.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/main/java/org/apache/jena/arq/querybuilder/handlers/AggregationHandler.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/main/java/org/apache/jena/arq/querybuilder/handlers/ConstructHandler.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/main/java/org/apache/jena/arq/querybuilder/handlers/DatasetHandler.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/main/java/org/apache/jena/arq/querybuilder/handlers/Handler.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/main/java/org/apache/jena/arq/querybuilder/handlers/HandlerBlock.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/main/java/org/apache/jena/arq/querybuilder/handlers/PrologHandler.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/main/java/org/apache/jena/arq/querybuilder/handlers/SelectHandler.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/main/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandler.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/main/java/org/apache/jena/arq/querybuilder/handlers/ValuesHandler.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/main/java/org/apache/jena/arq/querybuilder/handlers/WhereHandler.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/main/java/org/apache/jena/arq/querybuilder/handlers/package-info.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/main/java/org/apache/jena/arq/querybuilder/package-info.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/main/java/org/apache/jena/arq/querybuilder/rewriters/AbstractRewriter.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/main/java/org/apache/jena/arq/querybuilder/rewriters/BuildElementVisitor.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/main/java/org/apache/jena/arq/querybuilder/rewriters/ElementRewriter.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/main/java/org/apache/jena/arq/querybuilder/rewriters/ExprRewriter.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/main/java/org/apache/jena/arq/querybuilder/rewriters/NodeValueRewriter.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/main/java/org/apache/jena/arq/querybuilder/rewriters/OpRewriter.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/main/java/org/apache/jena/arq/querybuilder/rewriters/PathRewriter.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/main/java/org/apache/jena/arq/querybuilder/rewriters/package-info.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/CollectionQuadHolder.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/ModelQuadHolder.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/PrefixHandler.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/QBQuadHolder.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/QuadCollectionHolder.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/QuadHolder.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/QuadIteratorBuilder.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/SingleQuadHolder.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/WhereQuadHolder.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/test/java/org/apache/jena/arq/querybuilder/AbstractQueryBuilderTest.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/test/java/org/apache/jena/arq/querybuilder/AbstractRegexpBasedTest.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/test/java/org/apache/jena/arq/querybuilder/AskBuilderTest.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/test/java/org/apache/jena/arq/querybuilder/ConstructBuilderTest.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/test/java/org/apache/jena/arq/querybuilder/ConvertersTest.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/test/java/org/apache/jena/arq/querybuilder/ExprFactoryTest.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/test/java/org/apache/jena/arq/querybuilder/SelectBuilderTest.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/test/java/org/apache/jena/arq/querybuilder/TestAbstractQueryBuilder.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/test/java/org/apache/jena/arq/querybuilder/UpdateBuilderExampleTests.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/test/java/org/apache/jena/arq/querybuilder/UpdateBuilderTest.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/test/java/org/apache/jena/arq/querybuilder/WhereBuilderTest.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/test/java/org/apache/jena/arq/querybuilder/WhereValidator.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/test/java/org/apache/jena/arq/querybuilder/handlers/AbstractHandlerTest.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/test/java/org/apache/jena/arq/querybuilder/handlers/ConstructHandlerTest.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/test/java/org/apache/jena/arq/querybuilder/handlers/DatasetHandlerTest.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/test/java/org/apache/jena/arq/querybuilder/handlers/PrologHandlerTest.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/test/java/org/apache/jena/arq/querybuilder/handlers/SelectHandlerTest.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/test/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandlerTest.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/test/java/org/apache/jena/arq/querybuilder/handlers/ValuesHandlerTest.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/test/java/org/apache/jena/arq/querybuilder/handlers/WhereHandlerTest.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/test/java/org/apache/jena/arq/querybuilder/rewriters/NodeValueRewriterTest.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/test/java/org/apache/jena/arq/querybuilder/updatebuilder/CollectionQuadHolderTest.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/test/java/org/apache/jena/arq/querybuilder/updatebuilder/ModelQuadHolderTest.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/test/java/org/apache/jena/arq/querybuilder/updatebuilder/QBQuadHolderTest.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/test/java/org/apache/jena/arq/querybuilder/updatebuilder/SingleQuadHolderTest.java (100%)
rename {jena-extras/jena-querybuilder => jena-querybuilder}/src/test/java/org/apache/jena/arq/querybuilder/updatebuilder/WhereQuadHolderTest.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/README.md (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/pom.xml (99%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/algebra/TransformSE_EffectiveOptions.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/algebra/TransformSE_JoinStrategy.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/algebra/TransformSE_OptimizeSelfJoin.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/assembler/DatasetAssemblerServiceEnhancer.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/assembler/ServiceEnhancerVocab.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/claimingcache/AsyncClaimingCache.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/claimingcache/AsyncClaimingCacheImplGuava.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/claimingcache/Ref.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/claimingcache/RefDelegate.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/claimingcache/RefDelegateBase.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/claimingcache/RefFuture.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/claimingcache/RefFutureImpl.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/claimingcache/RefImpl.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/example/ServiceCachingExamples.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/example/ServicePluginExamples.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/function/cacheRm.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/Batch.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/BatchImpl.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/BatchQueryRewriteResult.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/BatchQueryRewriter.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/BatchQueryRewriterBuilder.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/Batcher.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/CacheMode.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/CacheProviderRegistry.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/ChainingServiceExecutorBulkCache.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/ChainingServiceExecutorBulkServiceEnhancer.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/Estimate.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/GroupedBatch.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/GroupedBatchImpl.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/IteratorFactoryWithBuffer.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/OpServiceExecutor.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/OpServiceExecutorImpl.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/OpServiceInfo.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/PartitionRequest.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/QueryIterServiceBulk.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/QueryIterWrapperCache.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/RequestExecutor.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/ServiceCacheKey.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/ServiceCacheKeyFactory.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/ServiceCacheValue.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/ServiceOpts.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/ServiceResponseCache.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/ServiceResultSizeCache.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/SliceKey.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/AutoCloseableBase.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/AutoCloseableWithLeakDetectionBase.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/BindingUtils.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/CollectionUtils.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/DynamicDatasetUtils.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/FinallyRunAll.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/GraphUtilsExtra.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/IteratorUtils.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/LockUtils.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/NodeUtilsExtra.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/PageUtils.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/PeekIteratorLazy.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/PropFuncArgUtils.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/QueryIterDefer.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/QueryIterSlottedBase.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/RangeUtils.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/SinglePrefetchIterator.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/StackTraceUtils.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/ThrowingRunnable.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/VarScopeUtils.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/VarUtilsExtra.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/init/ServiceEnhancerConstants.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/init/ServiceEnhancerInit.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/pfunction/cacheLs.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/ArrayOps.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/ChannelBase.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/Disposable.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/HasArrayOps.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/IteratorOverReadableChannel.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/PageHelper.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/ReadableChannel.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/ReadableChannelBase.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/ReadableChannelOverSliceAccessor.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/ReadableChannelWithLimit.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/Slice.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/SliceAccessor.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/SliceMetaDataBasic.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/SliceWithPages.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/ArrayOpsObject.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/ArrayReadable.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/ArrayWritable.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/Buffer.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/BufferLike.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/BufferOverArray.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/BufferView.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/RangeBuffer.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/RangeBufferImpl.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/ReadOverGapException.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/SliceAccessorImpl.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/SliceBase.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/SliceInMemoryCache.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/SliceMetaDataImpl.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/SliceMetaDataWithPages.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/SliceMetaDataWithPagesImpl.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/main/resources/META-INF/services/org.apache.jena.sys.JenaSubsystemLifecycle (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/test/java/org/apache/jena/sparql/service/enhancer/assembler/TestServiceEnhancerDatasetAssembler.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/test/java/org/apache/jena/sparql/service/enhancer/impl/AbstractTestServiceEnhancerResultSetLimits.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/test/java/org/apache/jena/sparql/service/enhancer/impl/TestServiceEnhancerBatchQueryRewriter.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/test/java/org/apache/jena/sparql/service/enhancer/impl/TestServiceEnhancerBatcher.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/test/java/org/apache/jena/sparql/service/enhancer/impl/TestServiceEnhancerCachedVsUncached.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/test/java/org/apache/jena/sparql/service/enhancer/impl/TestServiceEnhancerMisc.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/test/java/org/apache/jena/sparql/service/enhancer/impl/TestServiceEnhancerResultSetLimitsWithCache.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/test/java/org/apache/jena/sparql/service/enhancer/impl/TestServiceEnhancerResultSetLimitsWithoutCache.java (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/test/resources/log4j2-test.properties (100%)
rename {jena-extras/jena-serviceenhancer => jena-serviceenhancer}/src/test/resources/semweb.wikidata.sample.ttl (100%)
(jena) 02/05: GH-3682: Remove the jena-extras maven module
Posted by an...@apache.org.
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 367f69d709f42e9ed1899c079802ce938f4716b5
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Sat Jan 3 19:50:16 2026 +0000
GH-3682: Remove the jena-extras maven module
---
jena-extras/jena-commonsrdf/pom.xml | 2 +-
jena-extras/jena-querybuilder/pom.xml | 2 +-
jena-extras/jena-serviceenhancer/pom.xml | 2 +-
jena-extras/pom.xml | 38 --------------------------------
pom.xml | 10 +++++----
5 files changed, 9 insertions(+), 45 deletions(-)
diff --git a/jena-extras/jena-commonsrdf/pom.xml b/jena-extras/jena-commonsrdf/pom.xml
index 58998aa1c2..40819958a9 100644
--- a/jena-extras/jena-commonsrdf/pom.xml
+++ b/jena-extras/jena-commonsrdf/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.jena</groupId>
- <artifactId>jena-extras</artifactId>
+ <artifactId>jena</artifactId>
<version>6.0.0-SNAPSHOT</version>
</parent>
diff --git a/jena-extras/jena-querybuilder/pom.xml b/jena-extras/jena-querybuilder/pom.xml
index dda1cc395d..772973466b 100644
--- a/jena-extras/jena-querybuilder/pom.xml
+++ b/jena-extras/jena-querybuilder/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.jena</groupId>
- <artifactId>jena-extras</artifactId>
+ <artifactId>jena</artifactId>
<version>6.0.0-SNAPSHOT</version>
</parent>
diff --git a/jena-extras/jena-serviceenhancer/pom.xml b/jena-extras/jena-serviceenhancer/pom.xml
index fa77a16cb2..fde398abbc 100644
--- a/jena-extras/jena-serviceenhancer/pom.xml
+++ b/jena-extras/jena-serviceenhancer/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.jena</groupId>
- <artifactId>jena-extras</artifactId>
+ <artifactId>jena</artifactId>
<version>6.0.0-SNAPSHOT</version>
</parent>
diff --git a/jena-extras/pom.xml b/jena-extras/pom.xml
deleted file mode 100644
index 75e3354751..0000000000
--- a/jena-extras/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jena-extras</artifactId>
- <version>6.0.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>Apache Jena - Extras</name>
-
- <parent>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena</artifactId>
- <version>6.0.0-SNAPSHOT</version>
- </parent>
-
- <modules>
- <module>jena-querybuilder</module>
- <module>jena-commonsrdf</module>
- <module>jena-serviceenhancer</module>
- </modules>
-
-</project>
diff --git a/pom.xml b/pom.xml
index 712c3d9bd6..93e88ffa18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -244,8 +244,8 @@
<profile>
<!--
- This is the complete profile, it builds everything including slow
- building modules and the distribution packages.
+ This is the complete profile, it builds everything including
+ any building modules, javadoc and the distribution packages.
-->
<id>complete</id>
<activation>
@@ -297,8 +297,10 @@
<!-- Binary distribution -->
<module>apache-jena</module>
- <!-- Other -->
- <module>jena-extras</module>
+ <module>jena-extras/jena-commonsrdf</module>
+ <module>jena-extras/jena-querybuilder</module>
+ <module>jena-extras/jena-serviceenhancer</module>
+
<module>jena-examples</module>
<module>jena-bom</module>
(jena) 03/05: GH-3682: Move jena-serviceenhancer
Posted by an...@apache.org.
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 1fddafd3870a1e27c9420a2d96dc53a16e825575
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Sat Jan 3 20:17:00 2026 +0000
GH-3682: Move jena-serviceenhancer
---
{jena-extras/jena-serviceenhancer => jena-serviceenhancer}/README.md | 0
{jena-extras/jena-serviceenhancer => jena-serviceenhancer}/pom.xml | 0
.../sparql/service/enhancer/algebra/TransformSE_EffectiveOptions.java | 0
.../jena/sparql/service/enhancer/algebra/TransformSE_JoinStrategy.java | 0
.../sparql/service/enhancer/algebra/TransformSE_OptimizeSelfJoin.java | 0
.../service/enhancer/assembler/DatasetAssemblerServiceEnhancer.java | 0
.../jena/sparql/service/enhancer/assembler/ServiceEnhancerVocab.java | 0
.../jena/sparql/service/enhancer/claimingcache/AsyncClaimingCache.java | 0
.../service/enhancer/claimingcache/AsyncClaimingCacheImplGuava.java | 0
.../org/apache/jena/sparql/service/enhancer/claimingcache/Ref.java | 0
.../apache/jena/sparql/service/enhancer/claimingcache/RefDelegate.java | 0
.../jena/sparql/service/enhancer/claimingcache/RefDelegateBase.java | 0
.../apache/jena/sparql/service/enhancer/claimingcache/RefFuture.java | 0
.../jena/sparql/service/enhancer/claimingcache/RefFutureImpl.java | 0
.../org/apache/jena/sparql/service/enhancer/claimingcache/RefImpl.java | 0
.../jena/sparql/service/enhancer/example/ServiceCachingExamples.java | 0
.../jena/sparql/service/enhancer/example/ServicePluginExamples.java | 0
.../java/org/apache/jena/sparql/service/enhancer/function/cacheRm.java | 0
.../main/java/org/apache/jena/sparql/service/enhancer/impl/Batch.java | 0
.../java/org/apache/jena/sparql/service/enhancer/impl/BatchImpl.java | 0
.../jena/sparql/service/enhancer/impl/BatchQueryRewriteResult.java | 0
.../apache/jena/sparql/service/enhancer/impl/BatchQueryRewriter.java | 0
.../jena/sparql/service/enhancer/impl/BatchQueryRewriterBuilder.java | 0
.../java/org/apache/jena/sparql/service/enhancer/impl/Batcher.java | 0
.../java/org/apache/jena/sparql/service/enhancer/impl/CacheMode.java | 0
.../jena/sparql/service/enhancer/impl/CacheProviderRegistry.java | 0
.../sparql/service/enhancer/impl/ChainingServiceExecutorBulkCache.java | 0
.../enhancer/impl/ChainingServiceExecutorBulkServiceEnhancer.java | 0
.../java/org/apache/jena/sparql/service/enhancer/impl/Estimate.java | 0
.../org/apache/jena/sparql/service/enhancer/impl/GroupedBatch.java | 0
.../org/apache/jena/sparql/service/enhancer/impl/GroupedBatchImpl.java | 0
.../jena/sparql/service/enhancer/impl/IteratorFactoryWithBuffer.java | 0
.../apache/jena/sparql/service/enhancer/impl/OpServiceExecutor.java | 0
.../jena/sparql/service/enhancer/impl/OpServiceExecutorImpl.java | 0
.../org/apache/jena/sparql/service/enhancer/impl/OpServiceInfo.java | 0
.../org/apache/jena/sparql/service/enhancer/impl/PartitionRequest.java | 0
.../apache/jena/sparql/service/enhancer/impl/QueryIterServiceBulk.java | 0
.../jena/sparql/service/enhancer/impl/QueryIterWrapperCache.java | 0
.../org/apache/jena/sparql/service/enhancer/impl/RequestExecutor.java | 0
.../org/apache/jena/sparql/service/enhancer/impl/ServiceCacheKey.java | 0
.../jena/sparql/service/enhancer/impl/ServiceCacheKeyFactory.java | 0
.../apache/jena/sparql/service/enhancer/impl/ServiceCacheValue.java | 0
.../java/org/apache/jena/sparql/service/enhancer/impl/ServiceOpts.java | 0
.../apache/jena/sparql/service/enhancer/impl/ServiceResponseCache.java | 0
.../jena/sparql/service/enhancer/impl/ServiceResultSizeCache.java | 0
.../java/org/apache/jena/sparql/service/enhancer/impl/SliceKey.java | 0
.../jena/sparql/service/enhancer/impl/util/AutoCloseableBase.java | 0
.../service/enhancer/impl/util/AutoCloseableWithLeakDetectionBase.java | 0
.../apache/jena/sparql/service/enhancer/impl/util/BindingUtils.java | 0
.../apache/jena/sparql/service/enhancer/impl/util/CollectionUtils.java | 0
.../jena/sparql/service/enhancer/impl/util/DynamicDatasetUtils.java | 0
.../apache/jena/sparql/service/enhancer/impl/util/FinallyRunAll.java | 0
.../apache/jena/sparql/service/enhancer/impl/util/GraphUtilsExtra.java | 0
.../apache/jena/sparql/service/enhancer/impl/util/IteratorUtils.java | 0
.../org/apache/jena/sparql/service/enhancer/impl/util/LockUtils.java | 0
.../apache/jena/sparql/service/enhancer/impl/util/NodeUtilsExtra.java | 0
.../org/apache/jena/sparql/service/enhancer/impl/util/PageUtils.java | 0
.../jena/sparql/service/enhancer/impl/util/PeekIteratorLazy.java | 0
.../jena/sparql/service/enhancer/impl/util/PropFuncArgUtils.java | 0
.../apache/jena/sparql/service/enhancer/impl/util/QueryIterDefer.java | 0
.../jena/sparql/service/enhancer/impl/util/QueryIterSlottedBase.java | 0
.../org/apache/jena/sparql/service/enhancer/impl/util/RangeUtils.java | 0
.../jena/sparql/service/enhancer/impl/util/SinglePrefetchIterator.java | 0
.../apache/jena/sparql/service/enhancer/impl/util/StackTraceUtils.java | 0
.../jena/sparql/service/enhancer/impl/util/ThrowingRunnable.java | 0
.../apache/jena/sparql/service/enhancer/impl/util/VarScopeUtils.java | 0
.../apache/jena/sparql/service/enhancer/impl/util/VarUtilsExtra.java | 0
.../jena/sparql/service/enhancer/init/ServiceEnhancerConstants.java | 0
.../apache/jena/sparql/service/enhancer/init/ServiceEnhancerInit.java | 0
.../org/apache/jena/sparql/service/enhancer/pfunction/cacheLs.java | 0
.../org/apache/jena/sparql/service/enhancer/slice/api/ArrayOps.java | 0
.../org/apache/jena/sparql/service/enhancer/slice/api/ChannelBase.java | 0
.../org/apache/jena/sparql/service/enhancer/slice/api/Disposable.java | 0
.../org/apache/jena/sparql/service/enhancer/slice/api/HasArrayOps.java | 0
.../sparql/service/enhancer/slice/api/IteratorOverReadableChannel.java | 0
.../org/apache/jena/sparql/service/enhancer/slice/api/PageHelper.java | 0
.../apache/jena/sparql/service/enhancer/slice/api/ReadableChannel.java | 0
.../jena/sparql/service/enhancer/slice/api/ReadableChannelBase.java | 0
.../service/enhancer/slice/api/ReadableChannelOverSliceAccessor.java | 0
.../sparql/service/enhancer/slice/api/ReadableChannelWithLimit.java | 0
.../java/org/apache/jena/sparql/service/enhancer/slice/api/Slice.java | 0
.../apache/jena/sparql/service/enhancer/slice/api/SliceAccessor.java | 0
.../jena/sparql/service/enhancer/slice/api/SliceMetaDataBasic.java | 0
.../apache/jena/sparql/service/enhancer/slice/api/SliceWithPages.java | 0
.../apache/jena/sparql/service/enhancer/slice/impl/ArrayOpsObject.java | 0
.../apache/jena/sparql/service/enhancer/slice/impl/ArrayReadable.java | 0
.../apache/jena/sparql/service/enhancer/slice/impl/ArrayWritable.java | 0
.../org/apache/jena/sparql/service/enhancer/slice/impl/Buffer.java | 0
.../org/apache/jena/sparql/service/enhancer/slice/impl/BufferLike.java | 0
.../jena/sparql/service/enhancer/slice/impl/BufferOverArray.java | 0
.../org/apache/jena/sparql/service/enhancer/slice/impl/BufferView.java | 0
.../apache/jena/sparql/service/enhancer/slice/impl/RangeBuffer.java | 0
.../jena/sparql/service/enhancer/slice/impl/RangeBufferImpl.java | 0
.../jena/sparql/service/enhancer/slice/impl/ReadOverGapException.java | 0
.../jena/sparql/service/enhancer/slice/impl/SliceAccessorImpl.java | 0
.../org/apache/jena/sparql/service/enhancer/slice/impl/SliceBase.java | 0
.../jena/sparql/service/enhancer/slice/impl/SliceInMemoryCache.java | 0
.../jena/sparql/service/enhancer/slice/impl/SliceMetaDataImpl.java | 0
.../sparql/service/enhancer/slice/impl/SliceMetaDataWithPages.java | 0
.../sparql/service/enhancer/slice/impl/SliceMetaDataWithPagesImpl.java | 0
.../META-INF/services/org.apache.jena.sys.JenaSubsystemLifecycle | 0
.../enhancer/assembler/TestServiceEnhancerDatasetAssembler.java | 0
.../enhancer/impl/AbstractTestServiceEnhancerResultSetLimits.java | 0
.../service/enhancer/impl/TestServiceEnhancerBatchQueryRewriter.java | 0
.../jena/sparql/service/enhancer/impl/TestServiceEnhancerBatcher.java | 0
.../service/enhancer/impl/TestServiceEnhancerCachedVsUncached.java | 0
.../jena/sparql/service/enhancer/impl/TestServiceEnhancerMisc.java | 0
.../enhancer/impl/TestServiceEnhancerResultSetLimitsWithCache.java | 0
.../enhancer/impl/TestServiceEnhancerResultSetLimitsWithoutCache.java | 0
.../src/test/resources/log4j2-test.properties | 0
.../src/test/resources/semweb.wikidata.sample.ttl | 0
pom.xml | 3 ++-
112 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/jena-extras/jena-serviceenhancer/README.md b/jena-serviceenhancer/README.md
similarity index 100%
rename from jena-extras/jena-serviceenhancer/README.md
rename to jena-serviceenhancer/README.md
diff --git a/jena-extras/jena-serviceenhancer/pom.xml b/jena-serviceenhancer/pom.xml
similarity index 100%
rename from jena-extras/jena-serviceenhancer/pom.xml
rename to jena-serviceenhancer/pom.xml
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/algebra/TransformSE_EffectiveOptions.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/algebra/TransformSE_EffectiveOptions.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/algebra/TransformSE_EffectiveOptions.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/algebra/TransformSE_EffectiveOptions.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/algebra/TransformSE_JoinStrategy.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/algebra/TransformSE_JoinStrategy.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/algebra/TransformSE_JoinStrategy.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/algebra/TransformSE_JoinStrategy.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/algebra/TransformSE_OptimizeSelfJoin.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/algebra/TransformSE_OptimizeSelfJoin.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/algebra/TransformSE_OptimizeSelfJoin.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/algebra/TransformSE_OptimizeSelfJoin.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/assembler/DatasetAssemblerServiceEnhancer.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/assembler/DatasetAssemblerServiceEnhancer.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/assembler/DatasetAssemblerServiceEnhancer.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/assembler/DatasetAssemblerServiceEnhancer.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/assembler/ServiceEnhancerVocab.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/assembler/ServiceEnhancerVocab.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/assembler/ServiceEnhancerVocab.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/assembler/ServiceEnhancerVocab.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/claimingcache/AsyncClaimingCache.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/claimingcache/AsyncClaimingCache.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/claimingcache/AsyncClaimingCache.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/claimingcache/AsyncClaimingCache.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/claimingcache/AsyncClaimingCacheImplGuava.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/claimingcache/AsyncClaimingCacheImplGuava.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/claimingcache/AsyncClaimingCacheImplGuava.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/claimingcache/AsyncClaimingCacheImplGuava.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/claimingcache/Ref.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/claimingcache/Ref.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/claimingcache/Ref.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/claimingcache/Ref.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/claimingcache/RefDelegate.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/claimingcache/RefDelegate.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/claimingcache/RefDelegate.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/claimingcache/RefDelegate.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/claimingcache/RefDelegateBase.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/claimingcache/RefDelegateBase.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/claimingcache/RefDelegateBase.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/claimingcache/RefDelegateBase.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/claimingcache/RefFuture.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/claimingcache/RefFuture.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/claimingcache/RefFuture.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/claimingcache/RefFuture.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/claimingcache/RefFutureImpl.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/claimingcache/RefFutureImpl.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/claimingcache/RefFutureImpl.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/claimingcache/RefFutureImpl.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/claimingcache/RefImpl.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/claimingcache/RefImpl.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/claimingcache/RefImpl.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/claimingcache/RefImpl.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/example/ServiceCachingExamples.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/example/ServiceCachingExamples.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/example/ServiceCachingExamples.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/example/ServiceCachingExamples.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/example/ServicePluginExamples.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/example/ServicePluginExamples.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/example/ServicePluginExamples.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/example/ServicePluginExamples.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/function/cacheRm.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/function/cacheRm.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/function/cacheRm.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/function/cacheRm.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/Batch.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/Batch.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/Batch.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/Batch.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/BatchImpl.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/BatchImpl.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/BatchImpl.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/BatchImpl.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/BatchQueryRewriteResult.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/BatchQueryRewriteResult.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/BatchQueryRewriteResult.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/BatchQueryRewriteResult.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/BatchQueryRewriter.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/BatchQueryRewriter.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/BatchQueryRewriter.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/BatchQueryRewriter.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/BatchQueryRewriterBuilder.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/BatchQueryRewriterBuilder.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/BatchQueryRewriterBuilder.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/BatchQueryRewriterBuilder.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/Batcher.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/Batcher.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/Batcher.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/Batcher.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/CacheMode.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/CacheMode.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/CacheMode.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/CacheMode.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/CacheProviderRegistry.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/CacheProviderRegistry.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/CacheProviderRegistry.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/CacheProviderRegistry.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/ChainingServiceExecutorBulkCache.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/ChainingServiceExecutorBulkCache.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/ChainingServiceExecutorBulkCache.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/ChainingServiceExecutorBulkCache.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/ChainingServiceExecutorBulkServiceEnhancer.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/ChainingServiceExecutorBulkServiceEnhancer.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/ChainingServiceExecutorBulkServiceEnhancer.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/ChainingServiceExecutorBulkServiceEnhancer.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/Estimate.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/Estimate.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/Estimate.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/Estimate.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/GroupedBatch.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/GroupedBatch.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/GroupedBatch.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/GroupedBatch.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/GroupedBatchImpl.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/GroupedBatchImpl.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/GroupedBatchImpl.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/GroupedBatchImpl.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/IteratorFactoryWithBuffer.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/IteratorFactoryWithBuffer.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/IteratorFactoryWithBuffer.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/IteratorFactoryWithBuffer.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/OpServiceExecutor.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/OpServiceExecutor.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/OpServiceExecutor.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/OpServiceExecutor.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/OpServiceExecutorImpl.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/OpServiceExecutorImpl.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/OpServiceExecutorImpl.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/OpServiceExecutorImpl.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/OpServiceInfo.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/OpServiceInfo.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/OpServiceInfo.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/OpServiceInfo.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/PartitionRequest.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/PartitionRequest.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/PartitionRequest.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/PartitionRequest.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/QueryIterServiceBulk.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/QueryIterServiceBulk.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/QueryIterServiceBulk.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/QueryIterServiceBulk.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/QueryIterWrapperCache.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/QueryIterWrapperCache.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/QueryIterWrapperCache.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/QueryIterWrapperCache.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/RequestExecutor.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/RequestExecutor.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/RequestExecutor.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/RequestExecutor.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/ServiceCacheKey.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/ServiceCacheKey.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/ServiceCacheKey.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/ServiceCacheKey.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/ServiceCacheKeyFactory.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/ServiceCacheKeyFactory.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/ServiceCacheKeyFactory.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/ServiceCacheKeyFactory.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/ServiceCacheValue.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/ServiceCacheValue.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/ServiceCacheValue.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/ServiceCacheValue.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/ServiceOpts.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/ServiceOpts.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/ServiceOpts.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/ServiceOpts.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/ServiceResponseCache.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/ServiceResponseCache.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/ServiceResponseCache.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/ServiceResponseCache.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/ServiceResultSizeCache.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/ServiceResultSizeCache.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/ServiceResultSizeCache.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/ServiceResultSizeCache.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/SliceKey.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/SliceKey.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/SliceKey.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/SliceKey.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/AutoCloseableBase.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/AutoCloseableBase.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/AutoCloseableBase.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/AutoCloseableBase.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/AutoCloseableWithLeakDetectionBase.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/AutoCloseableWithLeakDetectionBase.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/AutoCloseableWithLeakDetectionBase.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/AutoCloseableWithLeakDetectionBase.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/BindingUtils.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/BindingUtils.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/BindingUtils.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/BindingUtils.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/CollectionUtils.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/CollectionUtils.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/CollectionUtils.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/CollectionUtils.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/DynamicDatasetUtils.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/DynamicDatasetUtils.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/DynamicDatasetUtils.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/DynamicDatasetUtils.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/FinallyRunAll.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/FinallyRunAll.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/FinallyRunAll.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/FinallyRunAll.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/GraphUtilsExtra.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/GraphUtilsExtra.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/GraphUtilsExtra.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/GraphUtilsExtra.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/IteratorUtils.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/IteratorUtils.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/IteratorUtils.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/IteratorUtils.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/LockUtils.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/LockUtils.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/LockUtils.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/LockUtils.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/NodeUtilsExtra.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/NodeUtilsExtra.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/NodeUtilsExtra.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/NodeUtilsExtra.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/PageUtils.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/PageUtils.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/PageUtils.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/PageUtils.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/PeekIteratorLazy.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/PeekIteratorLazy.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/PeekIteratorLazy.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/PeekIteratorLazy.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/PropFuncArgUtils.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/PropFuncArgUtils.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/PropFuncArgUtils.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/PropFuncArgUtils.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/QueryIterDefer.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/QueryIterDefer.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/QueryIterDefer.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/QueryIterDefer.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/QueryIterSlottedBase.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/QueryIterSlottedBase.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/QueryIterSlottedBase.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/QueryIterSlottedBase.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/RangeUtils.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/RangeUtils.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/RangeUtils.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/RangeUtils.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/SinglePrefetchIterator.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/SinglePrefetchIterator.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/SinglePrefetchIterator.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/SinglePrefetchIterator.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/StackTraceUtils.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/StackTraceUtils.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/StackTraceUtils.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/StackTraceUtils.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/ThrowingRunnable.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/ThrowingRunnable.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/ThrowingRunnable.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/ThrowingRunnable.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/VarScopeUtils.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/VarScopeUtils.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/VarScopeUtils.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/VarScopeUtils.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/VarUtilsExtra.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/VarUtilsExtra.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/VarUtilsExtra.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/impl/util/VarUtilsExtra.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/init/ServiceEnhancerConstants.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/init/ServiceEnhancerConstants.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/init/ServiceEnhancerConstants.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/init/ServiceEnhancerConstants.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/init/ServiceEnhancerInit.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/init/ServiceEnhancerInit.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/init/ServiceEnhancerInit.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/init/ServiceEnhancerInit.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/pfunction/cacheLs.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/pfunction/cacheLs.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/pfunction/cacheLs.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/pfunction/cacheLs.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/ArrayOps.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/ArrayOps.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/ArrayOps.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/ArrayOps.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/ChannelBase.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/ChannelBase.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/ChannelBase.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/ChannelBase.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/Disposable.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/Disposable.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/Disposable.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/Disposable.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/HasArrayOps.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/HasArrayOps.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/HasArrayOps.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/HasArrayOps.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/IteratorOverReadableChannel.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/IteratorOverReadableChannel.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/IteratorOverReadableChannel.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/IteratorOverReadableChannel.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/PageHelper.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/PageHelper.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/PageHelper.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/PageHelper.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/ReadableChannel.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/ReadableChannel.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/ReadableChannel.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/ReadableChannel.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/ReadableChannelBase.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/ReadableChannelBase.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/ReadableChannelBase.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/ReadableChannelBase.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/ReadableChannelOverSliceAccessor.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/ReadableChannelOverSliceAccessor.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/ReadableChannelOverSliceAccessor.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/ReadableChannelOverSliceAccessor.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/ReadableChannelWithLimit.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/ReadableChannelWithLimit.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/ReadableChannelWithLimit.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/ReadableChannelWithLimit.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/Slice.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/Slice.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/Slice.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/Slice.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/SliceAccessor.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/SliceAccessor.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/SliceAccessor.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/SliceAccessor.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/SliceMetaDataBasic.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/SliceMetaDataBasic.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/SliceMetaDataBasic.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/SliceMetaDataBasic.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/SliceWithPages.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/SliceWithPages.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/SliceWithPages.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/api/SliceWithPages.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/ArrayOpsObject.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/ArrayOpsObject.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/ArrayOpsObject.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/ArrayOpsObject.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/ArrayReadable.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/ArrayReadable.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/ArrayReadable.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/ArrayReadable.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/ArrayWritable.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/ArrayWritable.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/ArrayWritable.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/ArrayWritable.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/Buffer.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/Buffer.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/Buffer.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/Buffer.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/BufferLike.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/BufferLike.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/BufferLike.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/BufferLike.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/BufferOverArray.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/BufferOverArray.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/BufferOverArray.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/BufferOverArray.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/BufferView.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/BufferView.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/BufferView.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/BufferView.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/RangeBuffer.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/RangeBuffer.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/RangeBuffer.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/RangeBuffer.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/RangeBufferImpl.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/RangeBufferImpl.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/RangeBufferImpl.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/RangeBufferImpl.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/ReadOverGapException.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/ReadOverGapException.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/ReadOverGapException.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/ReadOverGapException.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/SliceAccessorImpl.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/SliceAccessorImpl.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/SliceAccessorImpl.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/SliceAccessorImpl.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/SliceBase.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/SliceBase.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/SliceBase.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/SliceBase.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/SliceInMemoryCache.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/SliceInMemoryCache.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/SliceInMemoryCache.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/SliceInMemoryCache.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/SliceMetaDataImpl.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/SliceMetaDataImpl.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/SliceMetaDataImpl.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/SliceMetaDataImpl.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/SliceMetaDataWithPages.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/SliceMetaDataWithPages.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/SliceMetaDataWithPages.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/SliceMetaDataWithPages.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/SliceMetaDataWithPagesImpl.java b/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/SliceMetaDataWithPagesImpl.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/SliceMetaDataWithPagesImpl.java
rename to jena-serviceenhancer/src/main/java/org/apache/jena/sparql/service/enhancer/slice/impl/SliceMetaDataWithPagesImpl.java
diff --git a/jena-extras/jena-serviceenhancer/src/main/resources/META-INF/services/org.apache.jena.sys.JenaSubsystemLifecycle b/jena-serviceenhancer/src/main/resources/META-INF/services/org.apache.jena.sys.JenaSubsystemLifecycle
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/main/resources/META-INF/services/org.apache.jena.sys.JenaSubsystemLifecycle
rename to jena-serviceenhancer/src/main/resources/META-INF/services/org.apache.jena.sys.JenaSubsystemLifecycle
diff --git a/jena-extras/jena-serviceenhancer/src/test/java/org/apache/jena/sparql/service/enhancer/assembler/TestServiceEnhancerDatasetAssembler.java b/jena-serviceenhancer/src/test/java/org/apache/jena/sparql/service/enhancer/assembler/TestServiceEnhancerDatasetAssembler.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/test/java/org/apache/jena/sparql/service/enhancer/assembler/TestServiceEnhancerDatasetAssembler.java
rename to jena-serviceenhancer/src/test/java/org/apache/jena/sparql/service/enhancer/assembler/TestServiceEnhancerDatasetAssembler.java
diff --git a/jena-extras/jena-serviceenhancer/src/test/java/org/apache/jena/sparql/service/enhancer/impl/AbstractTestServiceEnhancerResultSetLimits.java b/jena-serviceenhancer/src/test/java/org/apache/jena/sparql/service/enhancer/impl/AbstractTestServiceEnhancerResultSetLimits.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/test/java/org/apache/jena/sparql/service/enhancer/impl/AbstractTestServiceEnhancerResultSetLimits.java
rename to jena-serviceenhancer/src/test/java/org/apache/jena/sparql/service/enhancer/impl/AbstractTestServiceEnhancerResultSetLimits.java
diff --git a/jena-extras/jena-serviceenhancer/src/test/java/org/apache/jena/sparql/service/enhancer/impl/TestServiceEnhancerBatchQueryRewriter.java b/jena-serviceenhancer/src/test/java/org/apache/jena/sparql/service/enhancer/impl/TestServiceEnhancerBatchQueryRewriter.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/test/java/org/apache/jena/sparql/service/enhancer/impl/TestServiceEnhancerBatchQueryRewriter.java
rename to jena-serviceenhancer/src/test/java/org/apache/jena/sparql/service/enhancer/impl/TestServiceEnhancerBatchQueryRewriter.java
diff --git a/jena-extras/jena-serviceenhancer/src/test/java/org/apache/jena/sparql/service/enhancer/impl/TestServiceEnhancerBatcher.java b/jena-serviceenhancer/src/test/java/org/apache/jena/sparql/service/enhancer/impl/TestServiceEnhancerBatcher.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/test/java/org/apache/jena/sparql/service/enhancer/impl/TestServiceEnhancerBatcher.java
rename to jena-serviceenhancer/src/test/java/org/apache/jena/sparql/service/enhancer/impl/TestServiceEnhancerBatcher.java
diff --git a/jena-extras/jena-serviceenhancer/src/test/java/org/apache/jena/sparql/service/enhancer/impl/TestServiceEnhancerCachedVsUncached.java b/jena-serviceenhancer/src/test/java/org/apache/jena/sparql/service/enhancer/impl/TestServiceEnhancerCachedVsUncached.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/test/java/org/apache/jena/sparql/service/enhancer/impl/TestServiceEnhancerCachedVsUncached.java
rename to jena-serviceenhancer/src/test/java/org/apache/jena/sparql/service/enhancer/impl/TestServiceEnhancerCachedVsUncached.java
diff --git a/jena-extras/jena-serviceenhancer/src/test/java/org/apache/jena/sparql/service/enhancer/impl/TestServiceEnhancerMisc.java b/jena-serviceenhancer/src/test/java/org/apache/jena/sparql/service/enhancer/impl/TestServiceEnhancerMisc.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/test/java/org/apache/jena/sparql/service/enhancer/impl/TestServiceEnhancerMisc.java
rename to jena-serviceenhancer/src/test/java/org/apache/jena/sparql/service/enhancer/impl/TestServiceEnhancerMisc.java
diff --git a/jena-extras/jena-serviceenhancer/src/test/java/org/apache/jena/sparql/service/enhancer/impl/TestServiceEnhancerResultSetLimitsWithCache.java b/jena-serviceenhancer/src/test/java/org/apache/jena/sparql/service/enhancer/impl/TestServiceEnhancerResultSetLimitsWithCache.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/test/java/org/apache/jena/sparql/service/enhancer/impl/TestServiceEnhancerResultSetLimitsWithCache.java
rename to jena-serviceenhancer/src/test/java/org/apache/jena/sparql/service/enhancer/impl/TestServiceEnhancerResultSetLimitsWithCache.java
diff --git a/jena-extras/jena-serviceenhancer/src/test/java/org/apache/jena/sparql/service/enhancer/impl/TestServiceEnhancerResultSetLimitsWithoutCache.java b/jena-serviceenhancer/src/test/java/org/apache/jena/sparql/service/enhancer/impl/TestServiceEnhancerResultSetLimitsWithoutCache.java
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/test/java/org/apache/jena/sparql/service/enhancer/impl/TestServiceEnhancerResultSetLimitsWithoutCache.java
rename to jena-serviceenhancer/src/test/java/org/apache/jena/sparql/service/enhancer/impl/TestServiceEnhancerResultSetLimitsWithoutCache.java
diff --git a/jena-extras/jena-serviceenhancer/src/test/resources/log4j2-test.properties b/jena-serviceenhancer/src/test/resources/log4j2-test.properties
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/test/resources/log4j2-test.properties
rename to jena-serviceenhancer/src/test/resources/log4j2-test.properties
diff --git a/jena-extras/jena-serviceenhancer/src/test/resources/semweb.wikidata.sample.ttl b/jena-serviceenhancer/src/test/resources/semweb.wikidata.sample.ttl
similarity index 100%
rename from jena-extras/jena-serviceenhancer/src/test/resources/semweb.wikidata.sample.ttl
rename to jena-serviceenhancer/src/test/resources/semweb.wikidata.sample.ttl
diff --git a/pom.xml b/pom.xml
index 93e88ffa18..3d4d7806ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -216,6 +216,7 @@
<module>apache-jena-libs</module>
<module>jena-text</module>
+ <module>jena-serviceenhancer</module>
<module>jena-cmds</module>
<module>jena-geosparql</module>
@@ -275,6 +276,7 @@
<module>apache-jena-libs</module>
<module>jena-text</module>
+ <module>jena-serviceenhancer</module>
<module>jena-cmds</module>
<module>jena-geosparql</module>
@@ -299,7 +301,6 @@
<module>jena-extras/jena-commonsrdf</module>
<module>jena-extras/jena-querybuilder</module>
- <module>jena-extras/jena-serviceenhancer</module>
<module>jena-examples</module>
(jena) 04/05: GH-3682: Move jena-querybuilder
Posted by an...@apache.org.
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 <an...@apache.org>
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>
(jena) 01/05: Build jena-geosparql before jena-fuseki2
Posted by an...@apache.org.
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 19b6cff2ef9c9d4a74bb27e92bd9a2bbfb838c37
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Sat Jan 3 19:56:37 2026 +0000
Build jena-geosparql before jena-fuseki2
---
pom.xml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 3f0de92607..712c3d9bd6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -277,9 +277,11 @@
<module>jena-text</module>
<module>jena-cmds</module>
+ <module>jena-geosparql</module>
+
<module>jena-fuseki2</module>
- <module>jena-geosparql</module>
+ <!-- The original, standalone jena-fuseki-geosparql -->
<module>jena-fuseki2/jena-fuseki-geosparql</module>
<!--
(jena) 05/05: GH-3682: Move jena-rdfcommons
Posted by an...@apache.org.
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 0bffdbcff05bb8c2ff87a04c525ac0b238885ba2
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Sat Jan 3 21:03:46 2026 +0000
GH-3682: Move jena-rdfcommons
---
{jena-extras/jena-commonsrdf => jena-commonsrdf}/README.md | 0
{jena-extras/jena-commonsrdf => jena-commonsrdf}/pom.xml | 0
.../src/main/java/org/apache/jena/commonsrdf/ConversionException.java | 0
.../src/main/java/org/apache/jena/commonsrdf/JenaCommonsRDF.java | 0
.../src/main/java/org/apache/jena/commonsrdf/JenaRDF.java | 0
.../src/main/java/org/apache/jena/commonsrdf/impl/JCR_BlankNode.java | 0
.../src/main/java/org/apache/jena/commonsrdf/impl/JCR_Dataset.java | 0
.../src/main/java/org/apache/jena/commonsrdf/impl/JCR_Factory.java | 0
.../src/main/java/org/apache/jena/commonsrdf/impl/JCR_Graph.java | 0
.../src/main/java/org/apache/jena/commonsrdf/impl/JCR_IRI.java | 0
.../src/main/java/org/apache/jena/commonsrdf/impl/JCR_Literal.java | 0
.../src/main/java/org/apache/jena/commonsrdf/impl/JCR_Quad.java | 0
.../src/main/java/org/apache/jena/commonsrdf/impl/JCR_Term.java | 0
.../src/main/java/org/apache/jena/commonsrdf/impl/JCR_Triple.java | 0
.../src/main/java/org/apache/jena/commonsrdf/impl/JenaDataset.java | 0
.../src/main/java/org/apache/jena/commonsrdf/impl/JenaGraph.java | 0
.../src/main/java/org/apache/jena/commonsrdf/impl/JenaNode.java | 0
.../src/main/java/org/apache/jena/commonsrdf/impl/JenaQuad.java | 0
.../src/main/java/org/apache/jena/commonsrdf/impl/JenaTriple.java | 0
.../src/main/java/org/apache/jena/commonsrdf/impl/ToDataset.java | 0
.../src/main/java/org/apache/jena/commonsrdf/impl/ToGraph.java | 0
.../src/main/resources/META-INF/services/org.apache.commons.rdf.api.RDF | 0
.../src/test/java/org/apache/jena/commonsrdf/TS_JenaCommonsRDF.java | 0
.../src/test/java/org/apache/jena/commonsrdf/TestBlankNodeJena.java | 0
.../src/test/java/org/apache/jena/commonsrdf/TestDatasetJena.java | 0
.../src/test/java/org/apache/jena/commonsrdf/TestGraphJena.java | 0
.../src/test/java/org/apache/jena/commonsrdf/TestJenaSimple.java | 0
.../test/java/org/apache/jena/commonsrdf/TestRDFTermFactoryJena.java | 0
.../java/org/apache/jena/commonsrdf/TestServiceLoaderCommonsRDF.java | 0
.../apache/jena/commonsrdf/examples/Ex_JenaGraphToCommonsRDFGraph.java | 0
.../apache/jena/commonsrdf/examples/Ex_ParseIntoCommonsRDFGraph.java | 0
.../src/test/resources/log4j2-test.properties | 0
pom.xml | 2 +-
33 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/jena-extras/jena-commonsrdf/README.md b/jena-commonsrdf/README.md
similarity index 100%
rename from jena-extras/jena-commonsrdf/README.md
rename to jena-commonsrdf/README.md
diff --git a/jena-extras/jena-commonsrdf/pom.xml b/jena-commonsrdf/pom.xml
similarity index 100%
rename from jena-extras/jena-commonsrdf/pom.xml
rename to jena-commonsrdf/pom.xml
diff --git a/jena-extras/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/ConversionException.java b/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/ConversionException.java
similarity index 100%
rename from jena-extras/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/ConversionException.java
rename to jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/ConversionException.java
diff --git a/jena-extras/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/JenaCommonsRDF.java b/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/JenaCommonsRDF.java
similarity index 100%
rename from jena-extras/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/JenaCommonsRDF.java
rename to jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/JenaCommonsRDF.java
diff --git a/jena-extras/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/JenaRDF.java b/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/JenaRDF.java
similarity index 100%
rename from jena-extras/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/JenaRDF.java
rename to jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/JenaRDF.java
diff --git a/jena-extras/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JCR_BlankNode.java b/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JCR_BlankNode.java
similarity index 100%
rename from jena-extras/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JCR_BlankNode.java
rename to jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JCR_BlankNode.java
diff --git a/jena-extras/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JCR_Dataset.java b/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JCR_Dataset.java
similarity index 100%
rename from jena-extras/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JCR_Dataset.java
rename to jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JCR_Dataset.java
diff --git a/jena-extras/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JCR_Factory.java b/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JCR_Factory.java
similarity index 100%
rename from jena-extras/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JCR_Factory.java
rename to jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JCR_Factory.java
diff --git a/jena-extras/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JCR_Graph.java b/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JCR_Graph.java
similarity index 100%
rename from jena-extras/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JCR_Graph.java
rename to jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JCR_Graph.java
diff --git a/jena-extras/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JCR_IRI.java b/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JCR_IRI.java
similarity index 100%
rename from jena-extras/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JCR_IRI.java
rename to jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JCR_IRI.java
diff --git a/jena-extras/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JCR_Literal.java b/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JCR_Literal.java
similarity index 100%
rename from jena-extras/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JCR_Literal.java
rename to jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JCR_Literal.java
diff --git a/jena-extras/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JCR_Quad.java b/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JCR_Quad.java
similarity index 100%
rename from jena-extras/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JCR_Quad.java
rename to jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JCR_Quad.java
diff --git a/jena-extras/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JCR_Term.java b/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JCR_Term.java
similarity index 100%
rename from jena-extras/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JCR_Term.java
rename to jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JCR_Term.java
diff --git a/jena-extras/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JCR_Triple.java b/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JCR_Triple.java
similarity index 100%
rename from jena-extras/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JCR_Triple.java
rename to jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JCR_Triple.java
diff --git a/jena-extras/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JenaDataset.java b/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JenaDataset.java
similarity index 100%
rename from jena-extras/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JenaDataset.java
rename to jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JenaDataset.java
diff --git a/jena-extras/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JenaGraph.java b/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JenaGraph.java
similarity index 100%
rename from jena-extras/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JenaGraph.java
rename to jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JenaGraph.java
diff --git a/jena-extras/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JenaNode.java b/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JenaNode.java
similarity index 100%
rename from jena-extras/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JenaNode.java
rename to jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JenaNode.java
diff --git a/jena-extras/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JenaQuad.java b/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JenaQuad.java
similarity index 100%
rename from jena-extras/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JenaQuad.java
rename to jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JenaQuad.java
diff --git a/jena-extras/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JenaTriple.java b/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JenaTriple.java
similarity index 100%
rename from jena-extras/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JenaTriple.java
rename to jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/JenaTriple.java
diff --git a/jena-extras/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/ToDataset.java b/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/ToDataset.java
similarity index 100%
rename from jena-extras/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/ToDataset.java
rename to jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/ToDataset.java
diff --git a/jena-extras/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/ToGraph.java b/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/ToGraph.java
similarity index 100%
rename from jena-extras/jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/ToGraph.java
rename to jena-commonsrdf/src/main/java/org/apache/jena/commonsrdf/impl/ToGraph.java
diff --git a/jena-extras/jena-commonsrdf/src/main/resources/META-INF/services/org.apache.commons.rdf.api.RDF b/jena-commonsrdf/src/main/resources/META-INF/services/org.apache.commons.rdf.api.RDF
similarity index 100%
rename from jena-extras/jena-commonsrdf/src/main/resources/META-INF/services/org.apache.commons.rdf.api.RDF
rename to jena-commonsrdf/src/main/resources/META-INF/services/org.apache.commons.rdf.api.RDF
diff --git a/jena-extras/jena-commonsrdf/src/test/java/org/apache/jena/commonsrdf/TS_JenaCommonsRDF.java b/jena-commonsrdf/src/test/java/org/apache/jena/commonsrdf/TS_JenaCommonsRDF.java
similarity index 100%
rename from jena-extras/jena-commonsrdf/src/test/java/org/apache/jena/commonsrdf/TS_JenaCommonsRDF.java
rename to jena-commonsrdf/src/test/java/org/apache/jena/commonsrdf/TS_JenaCommonsRDF.java
diff --git a/jena-extras/jena-commonsrdf/src/test/java/org/apache/jena/commonsrdf/TestBlankNodeJena.java b/jena-commonsrdf/src/test/java/org/apache/jena/commonsrdf/TestBlankNodeJena.java
similarity index 100%
rename from jena-extras/jena-commonsrdf/src/test/java/org/apache/jena/commonsrdf/TestBlankNodeJena.java
rename to jena-commonsrdf/src/test/java/org/apache/jena/commonsrdf/TestBlankNodeJena.java
diff --git a/jena-extras/jena-commonsrdf/src/test/java/org/apache/jena/commonsrdf/TestDatasetJena.java b/jena-commonsrdf/src/test/java/org/apache/jena/commonsrdf/TestDatasetJena.java
similarity index 100%
rename from jena-extras/jena-commonsrdf/src/test/java/org/apache/jena/commonsrdf/TestDatasetJena.java
rename to jena-commonsrdf/src/test/java/org/apache/jena/commonsrdf/TestDatasetJena.java
diff --git a/jena-extras/jena-commonsrdf/src/test/java/org/apache/jena/commonsrdf/TestGraphJena.java b/jena-commonsrdf/src/test/java/org/apache/jena/commonsrdf/TestGraphJena.java
similarity index 100%
rename from jena-extras/jena-commonsrdf/src/test/java/org/apache/jena/commonsrdf/TestGraphJena.java
rename to jena-commonsrdf/src/test/java/org/apache/jena/commonsrdf/TestGraphJena.java
diff --git a/jena-extras/jena-commonsrdf/src/test/java/org/apache/jena/commonsrdf/TestJenaSimple.java b/jena-commonsrdf/src/test/java/org/apache/jena/commonsrdf/TestJenaSimple.java
similarity index 100%
rename from jena-extras/jena-commonsrdf/src/test/java/org/apache/jena/commonsrdf/TestJenaSimple.java
rename to jena-commonsrdf/src/test/java/org/apache/jena/commonsrdf/TestJenaSimple.java
diff --git a/jena-extras/jena-commonsrdf/src/test/java/org/apache/jena/commonsrdf/TestRDFTermFactoryJena.java b/jena-commonsrdf/src/test/java/org/apache/jena/commonsrdf/TestRDFTermFactoryJena.java
similarity index 100%
rename from jena-extras/jena-commonsrdf/src/test/java/org/apache/jena/commonsrdf/TestRDFTermFactoryJena.java
rename to jena-commonsrdf/src/test/java/org/apache/jena/commonsrdf/TestRDFTermFactoryJena.java
diff --git a/jena-extras/jena-commonsrdf/src/test/java/org/apache/jena/commonsrdf/TestServiceLoaderCommonsRDF.java b/jena-commonsrdf/src/test/java/org/apache/jena/commonsrdf/TestServiceLoaderCommonsRDF.java
similarity index 100%
rename from jena-extras/jena-commonsrdf/src/test/java/org/apache/jena/commonsrdf/TestServiceLoaderCommonsRDF.java
rename to jena-commonsrdf/src/test/java/org/apache/jena/commonsrdf/TestServiceLoaderCommonsRDF.java
diff --git a/jena-extras/jena-commonsrdf/src/test/java/org/apache/jena/commonsrdf/examples/Ex_JenaGraphToCommonsRDFGraph.java b/jena-commonsrdf/src/test/java/org/apache/jena/commonsrdf/examples/Ex_JenaGraphToCommonsRDFGraph.java
similarity index 100%
rename from jena-extras/jena-commonsrdf/src/test/java/org/apache/jena/commonsrdf/examples/Ex_JenaGraphToCommonsRDFGraph.java
rename to jena-commonsrdf/src/test/java/org/apache/jena/commonsrdf/examples/Ex_JenaGraphToCommonsRDFGraph.java
diff --git a/jena-extras/jena-commonsrdf/src/test/java/org/apache/jena/commonsrdf/examples/Ex_ParseIntoCommonsRDFGraph.java b/jena-commonsrdf/src/test/java/org/apache/jena/commonsrdf/examples/Ex_ParseIntoCommonsRDFGraph.java
similarity index 100%
rename from jena-extras/jena-commonsrdf/src/test/java/org/apache/jena/commonsrdf/examples/Ex_ParseIntoCommonsRDFGraph.java
rename to jena-commonsrdf/src/test/java/org/apache/jena/commonsrdf/examples/Ex_ParseIntoCommonsRDFGraph.java
diff --git a/jena-extras/jena-commonsrdf/src/test/resources/log4j2-test.properties b/jena-commonsrdf/src/test/resources/log4j2-test.properties
similarity index 100%
rename from jena-extras/jena-commonsrdf/src/test/resources/log4j2-test.properties
rename to jena-commonsrdf/src/test/resources/log4j2-test.properties
diff --git a/pom.xml b/pom.xml
index 47434a7045..6ad43872b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -299,7 +299,7 @@
<!-- Binary distribution -->
<module>apache-jena</module>
- <module>jena-extras/jena-commonsrdf</module>
+ <module>jena-commonsrdf</module>
<module>jena-querybuilder</module>
<module>jena-examples</module>