You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by kw...@apache.org on 2021/02/25 07:46:44 UTC
[jackrabbit-filevault] branch master updated: JCRVLT-450 deprecate
o.a.j.v.util.Text and o.a.j.v.util.SHA1 (#125)
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git
The following commit(s) were added to refs/heads/master by this push:
new 1dc01f1 JCRVLT-450 deprecate o.a.j.v.util.Text and o.a.j.v.util.SHA1 (#125)
1dc01f1 is described below
commit 1dc01f131f42306e8bc6898ba112c8b53475933c
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Thu Feb 25 08:46:39 2021 +0100
JCRVLT-450 deprecate o.a.j.v.util.Text and o.a.j.v.util.SHA1 (#125)
---
vault-cli/pom.xml | 7 +++++++
.../src/main/java/org/apache/jackrabbit/vault/cli/CmdCheckout.java | 2 +-
.../main/java/org/apache/jackrabbit/vault/cli/CmdCheckoutCli.java | 2 +-
.../main/java/org/apache/jackrabbit/vault/cli/CmdExportCli.java | 2 +-
.../src/main/java/org/apache/jackrabbit/vault/cli/CmdPut.java | 2 +-
.../org/apache/jackrabbit/vault/cli/extended/ExtendedOption.java | 2 +-
vault-core/pom.xml | 1 -
.../java/org/apache/jackrabbit/vault/fs/api/MultiPathMapping.java | 2 +-
.../java/org/apache/jackrabbit/vault/fs/config/DefaultMetaInf.java | 2 +-
.../apache/jackrabbit/vault/fs/config/SimpleCredentialsConfig.java | 2 +-
.../java/org/apache/jackrabbit/vault/fs/impl/AggregateImpl.java | 2 +-
.../apache/jackrabbit/vault/fs/impl/SubPackageFilterArchive.java | 2 +-
.../java/org/apache/jackrabbit/vault/fs/impl/TransactionImpl.java | 2 +-
.../java/org/apache/jackrabbit/vault/fs/impl/VaultFileImpl.java | 2 +-
.../apache/jackrabbit/vault/fs/impl/aggregator/FileAggregator.java | 2 +-
.../org/apache/jackrabbit/vault/fs/impl/io/DocViewAnalyzer.java | 2 +-
.../apache/jackrabbit/vault/fs/impl/io/DocViewSAXFormatter.java | 2 +-
.../org/apache/jackrabbit/vault/fs/impl/io/DocViewSAXImporter.java | 2 +-
.../apache/jackrabbit/vault/fs/impl/io/FileArtifactHandler.java | 2 +-
.../java/org/apache/jackrabbit/vault/fs/io/AbstractArchive.java | 2 +-
.../java/org/apache/jackrabbit/vault/fs/io/AbstractExporter.java | 2 +-
.../src/main/java/org/apache/jackrabbit/vault/fs/io/Importer.java | 2 +-
.../main/java/org/apache/jackrabbit/vault/fs/io/JcrArchive.java | 2 +-
.../main/java/org/apache/jackrabbit/vault/fs/io/JcrExporter.java | 2 +-
.../main/java/org/apache/jackrabbit/vault/fs/io/MappedArchive.java | 2 +-
.../main/java/org/apache/jackrabbit/vault/fs/io/MemoryArchive.java | 2 +-
.../main/java/org/apache/jackrabbit/vault/fs/io/ZipArchive.java | 2 +-
.../java/org/apache/jackrabbit/vault/fs/io/ZipStreamArchive.java | 2 +-
.../main/java/org/apache/jackrabbit/vault/packaging/PackageId.java | 2 +-
.../apache/jackrabbit/vault/packaging/ScopedWorkspaceFilter.java | 2 +-
.../main/java/org/apache/jackrabbit/vault/packaging/Version.java | 2 +-
.../jackrabbit/vault/packaging/impl/InstallHookProcessorImpl.java | 2 +-
.../jackrabbit/vault/packaging/impl/JcrPackageDefinitionImpl.java | 2 +-
.../org/apache/jackrabbit/vault/packaging/impl/JcrPackageImpl.java | 2 +-
.../jackrabbit/vault/packaging/impl/PackagePropertiesImpl.java | 2 +-
.../jackrabbit/vault/packaging/impl/SubPackageExportProcessor.java | 2 +-
.../vault/packaging/registry/impl/FSPackageRegistry.java | 2 +-
.../vault/packaging/registry/impl/JcrPackageRegistry.java | 2 +-
.../java/org/apache/jackrabbit/vault/util/DocViewProperty.java | 1 +
.../org/apache/jackrabbit/vault/util/HtmlProgressListener.java | 1 +
.../src/main/java/org/apache/jackrabbit/vault/util/PathUtil.java | 1 +
.../java/org/apache/jackrabbit/vault/util/PlatformNameFormat.java | 1 +
.../java/org/apache/jackrabbit/vault/util/RepositoryCopier.java | 1 +
.../src/main/java/org/apache/jackrabbit/vault/util/SHA1.java | 2 ++
.../src/main/java/org/apache/jackrabbit/vault/util/Text.java | 2 ++
.../src/main/java/org/apache/jackrabbit/vault/util/Tree.java | 1 +
.../org/apache/jackrabbit/vault/fs/api/RepositoryAddressTest.java | 2 +-
.../jackrabbit/vault/packaging/integration/DumpCoverageTests.java | 2 +-
.../vault/packaging/integration/IntegrationTestBase.java | 2 +-
.../jackrabbit/vault/packaging/integration/TestAtomicCounter.java | 2 +-
.../vault/packaging/integration/TestUserContentPackage.java | 2 +-
.../org/apache/jackrabbit/vault/validation/ValidationExecutor.java | 2 +-
.../vault/validation/spi/impl/AdvancedFilterValidator.java | 2 +-
.../validation/spi/impl/nodetype/JcrNodeTypeMetaDataImpl.java | 2 +-
.../vault/validation/spi/impl/nodetype/NodeTypeValidator.java | 2 +-
.../main/java/org/apache/jackrabbit/vault/vlt/actions/Commit.java | 2 +-
.../main/java/org/apache/jackrabbit/vault/vlt/actions/Sync.java | 2 +-
57 files changed, 64 insertions(+), 48 deletions(-)
diff --git a/vault-cli/pom.xml b/vault-cli/pom.xml
index bea3708..7434c55 100644
--- a/vault-cli/pom.xml
+++ b/vault-cli/pom.xml
@@ -154,6 +154,13 @@
<scope>compile</scope>
</dependency>
+ <!-- Jackrabbit Util -->
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-jcr-commons</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
<!-- SLF4j / Log4j -->
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/vault-cli/src/main/java/org/apache/jackrabbit/vault/cli/CmdCheckout.java b/vault-cli/src/main/java/org/apache/jackrabbit/vault/cli/CmdCheckout.java
index ac18f09..52fa0bc 100644
--- a/vault-cli/src/main/java/org/apache/jackrabbit/vault/cli/CmdCheckout.java
+++ b/vault-cli/src/main/java/org/apache/jackrabbit/vault/cli/CmdCheckout.java
@@ -29,7 +29,7 @@ import org.apache.commons.cli2.builder.GroupBuilder;
import org.apache.commons.cli2.option.Command;
import org.apache.jackrabbit.vault.fs.api.RepositoryAddress;
import org.apache.jackrabbit.vault.fs.api.VaultFile;
-import org.apache.jackrabbit.vault.util.Text;
+import org.apache.jackrabbit.util.Text;
import org.apache.jackrabbit.vault.util.console.ExecutionException;
import org.apache.jackrabbit.vault.vlt.VltContext;
import org.apache.jackrabbit.vault.vlt.actions.Checkout;
diff --git a/vault-cli/src/main/java/org/apache/jackrabbit/vault/cli/CmdCheckoutCli.java b/vault-cli/src/main/java/org/apache/jackrabbit/vault/cli/CmdCheckoutCli.java
index e6beccd..d1246fb 100644
--- a/vault-cli/src/main/java/org/apache/jackrabbit/vault/cli/CmdCheckoutCli.java
+++ b/vault-cli/src/main/java/org/apache/jackrabbit/vault/cli/CmdCheckoutCli.java
@@ -28,7 +28,7 @@ import org.apache.commons.cli2.builder.DefaultOptionBuilder;
import org.apache.commons.cli2.builder.GroupBuilder;
import org.apache.commons.cli2.option.Command;
import org.apache.jackrabbit.vault.fs.api.RepositoryAddress;
-import org.apache.jackrabbit.vault.util.Text;
+import org.apache.jackrabbit.util.Text;
import org.apache.jackrabbit.vault.util.console.ExecutionException;
import org.apache.jackrabbit.vault.vlt.VltContext;
import org.apache.jackrabbit.vault.vlt.actions.Checkout;
diff --git a/vault-cli/src/main/java/org/apache/jackrabbit/vault/cli/CmdExportCli.java b/vault-cli/src/main/java/org/apache/jackrabbit/vault/cli/CmdExportCli.java
index e7354ee..8488015 100644
--- a/vault-cli/src/main/java/org/apache/jackrabbit/vault/cli/CmdExportCli.java
+++ b/vault-cli/src/main/java/org/apache/jackrabbit/vault/cli/CmdExportCli.java
@@ -35,7 +35,7 @@ import org.apache.jackrabbit.vault.fs.io.AbstractExporter;
import org.apache.jackrabbit.vault.fs.io.JarExporter;
import org.apache.jackrabbit.vault.fs.io.PlatformExporter;
import org.apache.jackrabbit.vault.util.DefaultProgressListener;
-import org.apache.jackrabbit.vault.util.Text;
+import org.apache.jackrabbit.util.Text;
import org.apache.jackrabbit.vault.vlt.VltContext;
/**
diff --git a/vault-cli/src/main/java/org/apache/jackrabbit/vault/cli/CmdPut.java b/vault-cli/src/main/java/org/apache/jackrabbit/vault/cli/CmdPut.java
index 1622972..e038ace 100644
--- a/vault-cli/src/main/java/org/apache/jackrabbit/vault/cli/CmdPut.java
+++ b/vault-cli/src/main/java/org/apache/jackrabbit/vault/cli/CmdPut.java
@@ -32,7 +32,7 @@ import org.apache.jackrabbit.vault.fs.api.VaultFile;
import org.apache.jackrabbit.vault.fs.api.VaultFsTransaction;
import org.apache.jackrabbit.vault.util.FileInputSource;
import org.apache.jackrabbit.vault.util.PathUtil;
-import org.apache.jackrabbit.vault.util.Text;
+import org.apache.jackrabbit.util.Text;
import org.apache.jackrabbit.vault.util.console.ExecutionException;
/**
diff --git a/vault-cli/src/main/java/org/apache/jackrabbit/vault/cli/extended/ExtendedOption.java b/vault-cli/src/main/java/org/apache/jackrabbit/vault/cli/extended/ExtendedOption.java
index a2b24cf..e8f87f3 100644
--- a/vault-cli/src/main/java/org/apache/jackrabbit/vault/cli/extended/ExtendedOption.java
+++ b/vault-cli/src/main/java/org/apache/jackrabbit/vault/cli/extended/ExtendedOption.java
@@ -19,7 +19,7 @@ package org.apache.jackrabbit.vault.cli.extended;
import org.apache.commons.cli2.Option;
import org.apache.commons.cli2.builder.ArgumentBuilder;
import org.apache.commons.cli2.builder.DefaultOptionBuilder;
-import org.apache.jackrabbit.vault.util.Text;
+import org.apache.jackrabbit.util.Text;
import org.apache.jackrabbit.vault.util.console.CliCommand;
/**
diff --git a/vault-core/pom.xml b/vault-core/pom.xml
index dda48df..f8d0975 100644
--- a/vault-core/pom.xml
+++ b/vault-core/pom.xml
@@ -120,7 +120,6 @@
<artifactId>jackrabbit-spi2dav</artifactId>
<scope>provided</scope>
</dependency>
-
<!-- JCR Stuff -->
<dependency>
<groupId>javax.jcr</groupId>
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/MultiPathMapping.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/MultiPathMapping.java
index 2d87279..6b8fc78 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/MultiPathMapping.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/MultiPathMapping.java
@@ -19,7 +19,7 @@ package org.apache.jackrabbit.vault.fs.api;
import java.util.HashMap;
import java.util.Map;
-import org.apache.jackrabbit.vault.util.Text;
+import org.apache.jackrabbit.util.Text;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/DefaultMetaInf.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/DefaultMetaInf.java
index 537bc00..8cab1b7 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/DefaultMetaInf.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/DefaultMetaInf.java
@@ -46,7 +46,7 @@ import org.apache.jackrabbit.vault.fs.spi.ServiceProviderFactory;
import org.apache.jackrabbit.vault.packaging.PackageProperties;
import org.apache.jackrabbit.vault.packaging.impl.PackagePropertiesImpl;
import org.apache.jackrabbit.vault.util.Constants;
-import org.apache.jackrabbit.vault.util.Text;
+import org.apache.jackrabbit.util.Text;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/SimpleCredentialsConfig.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/SimpleCredentialsConfig.java
index c08bfef..925cdd3 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/SimpleCredentialsConfig.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/config/SimpleCredentialsConfig.java
@@ -28,7 +28,7 @@ import javax.jcr.SimpleCredentials;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
-import org.apache.jackrabbit.vault.util.Text;
+import org.apache.jackrabbit.util.Text;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Element;
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/AggregateImpl.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/AggregateImpl.java
index c7a5a50..6d7c4fe 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/AggregateImpl.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/AggregateImpl.java
@@ -51,7 +51,7 @@ import org.apache.jackrabbit.vault.fs.api.WorkspaceFilter;
import org.apache.jackrabbit.vault.fs.impl.io.AggregateWalkListener;
import org.apache.jackrabbit.vault.util.NodeNameComparator;
import org.apache.jackrabbit.vault.util.PathUtil;
-import org.apache.jackrabbit.vault.util.Text;
+import org.apache.jackrabbit.util.Text;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/SubPackageFilterArchive.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/SubPackageFilterArchive.java
index 367d3c8..6c08709 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/SubPackageFilterArchive.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/SubPackageFilterArchive.java
@@ -26,7 +26,7 @@ import java.util.List;
import org.apache.jackrabbit.vault.fs.api.VaultInputSource;
import org.apache.jackrabbit.vault.fs.config.MetaInf;
import org.apache.jackrabbit.vault.fs.io.Archive;
-import org.apache.jackrabbit.vault.util.Text;
+import org.apache.jackrabbit.util.Text;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/TransactionImpl.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/TransactionImpl.java
index fb7efcf..4d36408 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/TransactionImpl.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/TransactionImpl.java
@@ -50,7 +50,7 @@ import org.apache.jackrabbit.vault.util.Constants;
import org.apache.jackrabbit.vault.util.PathComparator;
import org.apache.jackrabbit.vault.util.PathUtil;
import org.apache.jackrabbit.vault.util.PlatformNameFormat;
-import org.apache.jackrabbit.vault.util.Text;
+import org.apache.jackrabbit.util.Text;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/VaultFileImpl.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/VaultFileImpl.java
index c9456d9..5d6ca15 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/VaultFileImpl.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/VaultFileImpl.java
@@ -32,7 +32,7 @@ import org.apache.jackrabbit.vault.fs.api.DumpContext;
import org.apache.jackrabbit.vault.fs.api.VaultFile;
import org.apache.jackrabbit.vault.fs.api.VaultFileSystem;
import org.apache.jackrabbit.vault.util.PlatformNameFormat;
-import org.apache.jackrabbit.vault.util.Text;
+import org.apache.jackrabbit.util.Text;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/aggregator/FileAggregator.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/aggregator/FileAggregator.java
index 4d2f797..3a7f6c0 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/aggregator/FileAggregator.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/aggregator/FileAggregator.java
@@ -41,7 +41,7 @@ import org.apache.jackrabbit.vault.util.Constants;
import org.apache.jackrabbit.vault.util.JcrConstants;
import org.apache.jackrabbit.vault.util.MimeTypes;
import org.apache.jackrabbit.vault.util.PathUtil;
-import org.apache.jackrabbit.vault.util.Text;
+import org.apache.jackrabbit.util.Text;
/**
* A file aggregate contains nt:file or nt:resource nodes.
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/DocViewAnalyzer.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/DocViewAnalyzer.java
index 21b9c3e..78b3ba5 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/DocViewAnalyzer.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/DocViewAnalyzer.java
@@ -32,7 +32,7 @@ import org.apache.jackrabbit.spi.commons.namespace.NamespaceResolver;
import org.apache.jackrabbit.util.ISO9075;
import org.apache.jackrabbit.vault.fs.io.DocViewAnalyzerListener;
import org.apache.jackrabbit.vault.util.RejectingEntityDefaultHandler;
-import org.apache.jackrabbit.vault.util.Text;
+import org.apache.jackrabbit.util.Text;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xml.sax.Attributes;
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/DocViewSAXFormatter.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/DocViewSAXFormatter.java
index aa0519b..3cb252f 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/DocViewSAXFormatter.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/DocViewSAXFormatter.java
@@ -45,7 +45,7 @@ import org.apache.jackrabbit.vault.fs.api.VaultFsConfig;
import org.apache.jackrabbit.vault.util.DocViewProperty;
import org.apache.jackrabbit.vault.util.ItemNameComparator2;
import org.apache.jackrabbit.vault.util.JcrConstants;
-import org.apache.jackrabbit.vault.util.Text;
+import org.apache.jackrabbit.util.Text;
/**
* The docview sax formatter generates SAX events to a given ContentHandler based on the aggregate tree.
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/DocViewSAXImporter.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/DocViewSAXImporter.java
index c653c26..383ff90 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/DocViewSAXImporter.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/DocViewSAXImporter.java
@@ -69,7 +69,7 @@ import org.apache.jackrabbit.vault.util.DocViewProperty;
import org.apache.jackrabbit.vault.util.JcrConstants;
import org.apache.jackrabbit.vault.util.MimeTypes;
import org.apache.jackrabbit.vault.util.RejectingEntityDefaultHandler;
-import org.apache.jackrabbit.vault.util.Text;
+import org.apache.jackrabbit.util.Text;
import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/FileArtifactHandler.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/FileArtifactHandler.java
index 9b191b3..516b08d 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/FileArtifactHandler.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/FileArtifactHandler.java
@@ -44,7 +44,7 @@ import org.apache.jackrabbit.vault.fs.impl.ArtifactSetImpl;
import org.apache.jackrabbit.vault.util.JcrConstants;
import org.apache.jackrabbit.vault.util.MimeTypes;
import org.apache.jackrabbit.vault.util.PathUtil;
-import org.apache.jackrabbit.vault.util.Text;
+import org.apache.jackrabbit.util.Text;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/AbstractArchive.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/AbstractArchive.java
index 8849fba..7deea69 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/AbstractArchive.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/AbstractArchive.java
@@ -20,7 +20,7 @@ package org.apache.jackrabbit.vault.fs.io;
import java.io.IOException;
import org.apache.jackrabbit.vault.util.Constants;
-import org.apache.jackrabbit.vault.util.Text;
+import org.apache.jackrabbit.util.Text;
/**
* Base class for archives
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/AbstractExporter.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/AbstractExporter.java
index 8fabc9c..6bd4d86 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/AbstractExporter.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/AbstractExporter.java
@@ -51,7 +51,7 @@ import org.apache.jackrabbit.vault.fs.spi.ServiceProviderFactory;
import org.apache.jackrabbit.vault.packaging.PackageId;
import org.apache.jackrabbit.vault.packaging.PackageType;
import org.apache.jackrabbit.vault.util.Constants;
-import org.apache.jackrabbit.vault.util.Text;
+import org.apache.jackrabbit.util.Text;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/Importer.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/Importer.java
index 667ac5b..46b6e30 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/Importer.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/Importer.java
@@ -82,7 +82,7 @@ import org.apache.jackrabbit.vault.packaging.impl.ActivityLog;
import org.apache.jackrabbit.vault.packaging.registry.impl.JcrPackageRegistry;
import org.apache.jackrabbit.vault.util.Constants;
import org.apache.jackrabbit.vault.util.PlatformNameFormat;
-import org.apache.jackrabbit.vault.util.Text;
+import org.apache.jackrabbit.util.Text;
import org.apache.jackrabbit.vault.util.Tree;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/JcrArchive.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/JcrArchive.java
index 7681901..4e9e2e8 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/JcrArchive.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/JcrArchive.java
@@ -39,7 +39,7 @@ import org.apache.jackrabbit.vault.fs.config.MetaInf;
import org.apache.jackrabbit.vault.fs.config.VaultSettings;
import org.apache.jackrabbit.vault.util.Constants;
import org.apache.jackrabbit.vault.util.JcrConstants;
-import org.apache.jackrabbit.vault.util.Text;
+import org.apache.jackrabbit.util.Text;
import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/JcrExporter.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/JcrExporter.java
index bda1343..8e32b88 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/JcrExporter.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/JcrExporter.java
@@ -31,7 +31,7 @@ import org.apache.jackrabbit.vault.fs.api.VaultFile;
import org.apache.jackrabbit.vault.util.JcrConstants;
import org.apache.jackrabbit.vault.util.PathUtil;
import org.apache.jackrabbit.vault.util.PlatformNameFormat;
-import org.apache.jackrabbit.vault.util.Text;
+import org.apache.jackrabbit.util.Text;
/**
* Implements a Vault filesystem exporter that exports Vault files to a JCR
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/MappedArchive.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/MappedArchive.java
index a28be84..6a10e7b 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/MappedArchive.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/MappedArchive.java
@@ -19,7 +19,7 @@ package org.apache.jackrabbit.vault.fs.io;
import org.apache.jackrabbit.vault.fs.api.PathMapping;
import org.apache.jackrabbit.vault.fs.api.VaultInputSource;
import org.apache.jackrabbit.vault.fs.config.MetaInf;
-import org.apache.jackrabbit.vault.util.Text;
+import org.apache.jackrabbit.util.Text;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/MemoryArchive.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/MemoryArchive.java
index b784a83..ad93d9a 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/MemoryArchive.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/MemoryArchive.java
@@ -34,7 +34,7 @@ import org.apache.jackrabbit.vault.fs.config.MetaInf;
import org.apache.jackrabbit.vault.fs.config.VaultSettings;
import org.apache.jackrabbit.vault.util.Constants;
import org.apache.jackrabbit.vault.util.InputStreamPump;
-import org.apache.jackrabbit.vault.util.Text;
+import org.apache.jackrabbit.util.Text;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/ZipArchive.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/ZipArchive.java
index 0dd1da5..22f4390 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/ZipArchive.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/ZipArchive.java
@@ -36,7 +36,7 @@ import org.apache.jackrabbit.vault.fs.config.DefaultMetaInf;
import org.apache.jackrabbit.vault.fs.config.MetaInf;
import org.apache.jackrabbit.vault.fs.config.VaultSettings;
import org.apache.jackrabbit.vault.util.Constants;
-import org.apache.jackrabbit.vault.util.Text;
+import org.apache.jackrabbit.util.Text;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/ZipStreamArchive.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/ZipStreamArchive.java
index 33cecff..3a38ffc 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/ZipStreamArchive.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/ZipStreamArchive.java
@@ -38,7 +38,7 @@ import org.apache.jackrabbit.vault.fs.config.DefaultMetaInf;
import org.apache.jackrabbit.vault.fs.config.MetaInf;
import org.apache.jackrabbit.vault.fs.config.VaultSettings;
import org.apache.jackrabbit.vault.util.Constants;
-import org.apache.jackrabbit.vault.util.Text;
+import org.apache.jackrabbit.util.Text;
import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/PackageId.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/PackageId.java
index 82be4d7..4afd3de 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/PackageId.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/PackageId.java
@@ -18,7 +18,7 @@
package org.apache.jackrabbit.vault.packaging;
import org.apache.jackrabbit.util.XMLChar;
-import org.apache.jackrabbit.vault.util.Text;
+import org.apache.jackrabbit.util.Text;
/**
* {@code PackageId} provides the basic metrics for identifying a package.
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/ScopedWorkspaceFilter.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/ScopedWorkspaceFilter.java
index 58ec605..d372fad 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/ScopedWorkspaceFilter.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/ScopedWorkspaceFilter.java
@@ -37,7 +37,7 @@ import org.apache.jackrabbit.vault.fs.api.ProgressTrackerListener;
import org.apache.jackrabbit.vault.fs.api.WorkspaceFilter;
import org.apache.jackrabbit.vault.fs.config.ConfigurationException;
import org.apache.jackrabbit.vault.fs.config.DefaultWorkspaceFilter;
-import org.apache.jackrabbit.vault.util.Text;
+import org.apache.jackrabbit.util.Text;
import org.w3c.dom.Element;
/**
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/Version.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/Version.java
index a354242..3c094d2 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/Version.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/Version.java
@@ -19,7 +19,7 @@ package org.apache.jackrabbit.vault.packaging;
import java.util.ArrayList;
-import org.apache.jackrabbit.vault.util.Text;
+import org.apache.jackrabbit.util.Text;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/InstallHookProcessorImpl.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/InstallHookProcessorImpl.java
index d4ce02c..9137ec5 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/InstallHookProcessorImpl.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/InstallHookProcessorImpl.java
@@ -39,7 +39,7 @@ import org.apache.jackrabbit.vault.packaging.InstallHookProcessor;
import org.apache.jackrabbit.vault.packaging.PackageException;
import org.apache.jackrabbit.vault.packaging.VaultPackage;
import org.apache.jackrabbit.vault.util.Constants;
-import org.apache.jackrabbit.vault.util.Text;
+import org.apache.jackrabbit.util.Text;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageDefinitionImpl.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageDefinitionImpl.java
index 48a6294..656685f 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageDefinitionImpl.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageDefinitionImpl.java
@@ -58,7 +58,7 @@ import org.apache.jackrabbit.vault.packaging.PackageType;
import org.apache.jackrabbit.vault.packaging.SubPackageHandling;
import org.apache.jackrabbit.vault.packaging.VaultPackage;
import org.apache.jackrabbit.vault.util.Constants;
-import org.apache.jackrabbit.vault.util.Text;
+import org.apache.jackrabbit.util.Text;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageImpl.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageImpl.java
index 96006fb..217a194 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageImpl.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageImpl.java
@@ -74,7 +74,7 @@ import org.apache.jackrabbit.vault.packaging.registry.RegisteredPackage;
import org.apache.jackrabbit.vault.packaging.registry.impl.JcrPackageRegistry;
import org.apache.jackrabbit.vault.packaging.registry.impl.JcrRegisteredPackage;
import org.apache.jackrabbit.vault.util.JcrConstants;
-import org.apache.jackrabbit.vault.util.Text;
+import org.apache.jackrabbit.util.Text;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/PackagePropertiesImpl.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/PackagePropertiesImpl.java
index 33062c1..31c8ef2 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/PackagePropertiesImpl.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/PackagePropertiesImpl.java
@@ -34,7 +34,7 @@ import org.apache.jackrabbit.vault.packaging.PackageProperties;
import org.apache.jackrabbit.vault.packaging.PackageType;
import org.apache.jackrabbit.vault.packaging.SubPackageHandling;
import org.apache.jackrabbit.vault.packaging.VaultPackage;
-import org.apache.jackrabbit.vault.util.Text;
+import org.apache.jackrabbit.util.Text;
import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/SubPackageExportProcessor.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/SubPackageExportProcessor.java
index 591d4f1..9a57b73 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/SubPackageExportProcessor.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/SubPackageExportProcessor.java
@@ -38,7 +38,7 @@ import org.apache.jackrabbit.vault.fs.io.AbstractExporter;
import org.apache.jackrabbit.vault.packaging.ExportPostProcessor;
import org.apache.jackrabbit.vault.packaging.JcrPackage;
import org.apache.jackrabbit.vault.packaging.PackageId;
-import org.apache.jackrabbit.vault.util.Text;
+import org.apache.jackrabbit.util.Text;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSPackageRegistry.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSPackageRegistry.java
index 6fe1bbb..ed1ceb9 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSPackageRegistry.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSPackageRegistry.java
@@ -60,7 +60,7 @@ import org.apache.jackrabbit.vault.packaging.registry.PackageRegistry;
import org.apache.jackrabbit.vault.packaging.registry.RegisteredPackage;
import org.apache.jackrabbit.vault.util.InputStreamPump;
import org.apache.jackrabbit.vault.util.PlatformNameFormat;
-import org.apache.jackrabbit.vault.util.Text;
+import org.apache.jackrabbit.util.Text;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.osgi.framework.BundleContext;
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/JcrPackageRegistry.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/JcrPackageRegistry.java
index 843b20a..671cb54 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/JcrPackageRegistry.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/JcrPackageRegistry.java
@@ -62,7 +62,7 @@ import org.apache.jackrabbit.vault.packaging.registry.PackageRegistry;
import org.apache.jackrabbit.vault.packaging.registry.RegisteredPackage;
import org.apache.jackrabbit.vault.util.InputStreamPump;
import org.apache.jackrabbit.vault.util.JcrConstants;
-import org.apache.jackrabbit.vault.util.Text;
+import org.apache.jackrabbit.util.Text;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/util/DocViewProperty.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/util/DocViewProperty.java
index 75b6f92..eb3162f 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/util/DocViewProperty.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/util/DocViewProperty.java
@@ -35,6 +35,7 @@ import org.apache.jackrabbit.api.ReferenceBinary;
import org.apache.jackrabbit.commons.jackrabbit.SimpleReferenceBinary;
import org.apache.jackrabbit.util.XMLChar;
import org.apache.jackrabbit.value.ValueHelper;
+import org.apache.jackrabbit.util.Text;
/**
* Helper class that represents a (jcr) property in the document view format.
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/util/HtmlProgressListener.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/util/HtmlProgressListener.java
index 04f8ee1..e230718 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/util/HtmlProgressListener.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/util/HtmlProgressListener.java
@@ -21,6 +21,7 @@ import java.io.IOException;
import java.io.Writer;
import org.apache.jackrabbit.vault.fs.api.ProgressTrackerListener;
+import org.apache.jackrabbit.util.Text;
/**
* {@code HtmlProgressTrackerListener} implements a progress tracker listener that writes the progress in HTML.
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/util/PathUtil.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/util/PathUtil.java
index c1421a9..9c851de 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/util/PathUtil.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/util/PathUtil.java
@@ -21,6 +21,7 @@ import java.io.File;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
+import org.apache.jackrabbit.util.Text;
/**
* {@code PathUtil}...
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/util/PlatformNameFormat.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/util/PlatformNameFormat.java
index bf7f3d6..a570690 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/util/PlatformNameFormat.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/util/PlatformNameFormat.java
@@ -17,6 +17,7 @@
package org.apache.jackrabbit.vault.util;
+import org.apache.jackrabbit.util.Text;
/**
* Implements a repository to platform name formatter.
*
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/util/RepositoryCopier.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/util/RepositoryCopier.java
index 159c178..06c8590 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/util/RepositoryCopier.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/util/RepositoryCopier.java
@@ -39,6 +39,7 @@ import javax.jcr.nodetype.NodeType;
import org.apache.jackrabbit.vault.fs.api.ProgressTrackerListener;
import org.apache.jackrabbit.vault.fs.api.RepositoryAddress;
import org.apache.jackrabbit.vault.fs.api.WorkspaceFilter;
+import org.apache.jackrabbit.util.Text;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xml.sax.ContentHandler;
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/util/SHA1.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/util/SHA1.java
index d1ccde9..5314c6f 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/util/SHA1.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/util/SHA1.java
@@ -27,7 +27,9 @@ import org.apache.commons.io.FileUtils;
/**
* SHA1 abstraction
+ * @deprecated Rather use {@link MessageDigest#getInstance(String)}
*/
+@Deprecated
public class SHA1 {
public final static SHA1 NULL = new SHA1(0,0,0,0,0);
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/util/Text.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/util/Text.java
index ab695e0..4b24a47 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/util/Text.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/util/Text.java
@@ -27,7 +27,9 @@ import java.util.Properties;
/**
* This Class provides some text related utilities
+ * @deprecated Use {@link org.apache.jackrabbit.util.Text} instead
*/
+@Deprecated
public class Text {
/**
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/util/Tree.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/util/Tree.java
index faea70b..cc4a1cb 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/util/Tree.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/util/Tree.java
@@ -19,6 +19,7 @@ package org.apache.jackrabbit.vault.util;
import java.util.LinkedHashMap;
import java.util.Map;
+import org.apache.jackrabbit.util.Text;
/**
* {@code Tree}...
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/fs/api/RepositoryAddressTest.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/fs/api/RepositoryAddressTest.java
index aa4c1a9..cd61719 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/fs/api/RepositoryAddressTest.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/fs/api/RepositoryAddressTest.java
@@ -19,7 +19,7 @@ package org.apache.jackrabbit.vault.fs.api;
import javax.jcr.SimpleCredentials;
-import org.apache.jackrabbit.vault.util.Text;
+import org.apache.jackrabbit.util.Text;
import junit.framework.TestCase;
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/DumpCoverageTests.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/DumpCoverageTests.java
index 305b64c..6bfbdb0 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/DumpCoverageTests.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/DumpCoverageTests.java
@@ -32,7 +32,7 @@ import org.apache.jackrabbit.vault.fs.api.PathFilterSet;
import org.apache.jackrabbit.vault.fs.api.ProgressTrackerListener;
import org.apache.jackrabbit.vault.fs.config.ConfigurationException;
import org.apache.jackrabbit.vault.fs.config.DefaultWorkspaceFilter;
-import org.apache.jackrabbit.vault.util.Text;
+import org.apache.jackrabbit.util.Text;
import org.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java
index 35e1130..2eefedb 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java
@@ -98,7 +98,7 @@ import org.apache.jackrabbit.vault.packaging.impl.ActivityLog;
import org.apache.jackrabbit.vault.packaging.impl.JcrPackageManagerImpl;
import org.apache.jackrabbit.vault.packaging.impl.ZipVaultPackage;
import org.apache.jackrabbit.vault.packaging.registry.impl.JcrPackageRegistry;
-import org.apache.jackrabbit.vault.util.Text;
+import org.apache.jackrabbit.util.Text;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestAtomicCounter.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestAtomicCounter.java
index 0bf6e1b..4ac201d 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestAtomicCounter.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestAtomicCounter.java
@@ -44,7 +44,7 @@ import org.apache.jackrabbit.vault.packaging.ExportOptions;
import org.apache.jackrabbit.vault.packaging.JcrPackage;
import org.apache.jackrabbit.vault.packaging.PackageException;
import org.apache.jackrabbit.vault.packaging.VaultPackage;
-import org.apache.jackrabbit.vault.util.Text;
+import org.apache.jackrabbit.util.Text;
import org.junit.Assume;
import org.junit.Test;
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestUserContentPackage.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestUserContentPackage.java
index 63f665c..9874e82 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestUserContentPackage.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestUserContentPackage.java
@@ -43,7 +43,7 @@ import org.apache.jackrabbit.vault.packaging.ExportOptions;
import org.apache.jackrabbit.vault.packaging.JcrPackage;
import org.apache.jackrabbit.vault.packaging.PackageException;
import org.apache.jackrabbit.vault.packaging.VaultPackage;
-import org.apache.jackrabbit.vault.util.Text;
+import org.apache.jackrabbit.util.Text;
import org.junit.Assume;
import org.junit.Test;
diff --git a/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/ValidationExecutor.java b/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/ValidationExecutor.java
index 35254d9..933013a 100644
--- a/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/ValidationExecutor.java
+++ b/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/ValidationExecutor.java
@@ -30,7 +30,7 @@ import java.util.stream.Collectors;
import org.apache.commons.io.FilenameUtils;
import org.apache.jackrabbit.vault.util.Constants;
import org.apache.jackrabbit.vault.util.PlatformNameFormat;
-import org.apache.jackrabbit.vault.util.Text;
+import org.apache.jackrabbit.util.Text;
import org.apache.jackrabbit.vault.validation.impl.util.EnhancedBufferedInputStream;
import org.apache.jackrabbit.vault.validation.impl.util.ResettableInputStream;
import org.apache.jackrabbit.vault.validation.impl.util.ValidatorException;
diff --git a/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/AdvancedFilterValidator.java b/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/AdvancedFilterValidator.java
index 17a208a..1826759 100644
--- a/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/AdvancedFilterValidator.java
+++ b/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/AdvancedFilterValidator.java
@@ -48,7 +48,7 @@ import org.apache.jackrabbit.vault.fs.filter.DefaultPathFilter;
import org.apache.jackrabbit.vault.packaging.PackageInfo;
import org.apache.jackrabbit.vault.util.Constants;
import org.apache.jackrabbit.vault.util.DocViewNode;
-import org.apache.jackrabbit.vault.util.Text;
+import org.apache.jackrabbit.util.Text;
import org.apache.jackrabbit.vault.validation.ValidationViolation;
import org.apache.jackrabbit.vault.validation.impl.util.ValidationMessageErrorHandler;
import org.apache.jackrabbit.vault.validation.spi.DocumentViewXmlValidator;
diff --git a/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/nodetype/JcrNodeTypeMetaDataImpl.java b/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/nodetype/JcrNodeTypeMetaDataImpl.java
index 1fe29dd..0745420 100644
--- a/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/nodetype/JcrNodeTypeMetaDataImpl.java
+++ b/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/nodetype/JcrNodeTypeMetaDataImpl.java
@@ -57,7 +57,7 @@ import org.apache.jackrabbit.spi.commons.nodetype.constraint.ValueConstraint;
import org.apache.jackrabbit.spi.commons.value.QValueFactoryImpl;
import org.apache.jackrabbit.spi.commons.value.ValueFormat;
import org.apache.jackrabbit.vault.fs.api.WorkspaceFilter;
-import org.apache.jackrabbit.vault.util.Text;
+import org.apache.jackrabbit.util.Text;
import org.apache.jackrabbit.vault.validation.spi.NodeContext;
import org.apache.jackrabbit.vault.validation.spi.ValidationMessage;
import org.apache.jackrabbit.vault.validation.spi.ValidationMessageSeverity;
diff --git a/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/nodetype/NodeTypeValidator.java b/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/nodetype/NodeTypeValidator.java
index c72ec90..1a013a4 100644
--- a/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/nodetype/NodeTypeValidator.java
+++ b/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/nodetype/NodeTypeValidator.java
@@ -50,7 +50,7 @@ import org.apache.jackrabbit.value.StringValue;
import org.apache.jackrabbit.vault.fs.api.WorkspaceFilter;
import org.apache.jackrabbit.vault.util.DocViewNode;
import org.apache.jackrabbit.vault.util.DocViewProperty;
-import org.apache.jackrabbit.vault.util.Text;
+import org.apache.jackrabbit.util.Text;
import org.apache.jackrabbit.vault.validation.ValidationExecutor;
import org.apache.jackrabbit.vault.validation.spi.DocumentViewXmlValidator;
import org.apache.jackrabbit.vault.validation.spi.JcrPathValidator;
diff --git a/vault-vlt/src/main/java/org/apache/jackrabbit/vault/vlt/actions/Commit.java b/vault-vlt/src/main/java/org/apache/jackrabbit/vault/vlt/actions/Commit.java
index 2d7dc24..1c8a82c 100644
--- a/vault-vlt/src/main/java/org/apache/jackrabbit/vault/vlt/actions/Commit.java
+++ b/vault-vlt/src/main/java/org/apache/jackrabbit/vault/vlt/actions/Commit.java
@@ -26,7 +26,7 @@ import java.util.List;
import org.apache.jackrabbit.vault.fs.api.VaultFsTransaction;
import org.apache.jackrabbit.vault.fs.impl.TransactionImpl;
import org.apache.jackrabbit.vault.util.PathComparator;
-import org.apache.jackrabbit.vault.util.Text;
+import org.apache.jackrabbit.util.Text;
import org.apache.jackrabbit.vault.vlt.FileAction;
import org.apache.jackrabbit.vault.vlt.VltContext;
import org.apache.jackrabbit.vault.vlt.VltDirectory;
diff --git a/vault-vlt/src/main/java/org/apache/jackrabbit/vault/vlt/actions/Sync.java b/vault-vlt/src/main/java/org/apache/jackrabbit/vault/vlt/actions/Sync.java
index 41b5801..5717b0f 100644
--- a/vault-vlt/src/main/java/org/apache/jackrabbit/vault/vlt/actions/Sync.java
+++ b/vault-vlt/src/main/java/org/apache/jackrabbit/vault/vlt/actions/Sync.java
@@ -34,7 +34,7 @@ import javax.jcr.Value;
import org.apache.jackrabbit.commons.JcrUtils;
import org.apache.jackrabbit.vault.fs.api.RepositoryAddress;
import org.apache.jackrabbit.vault.sync.impl.VaultSyncServiceImpl;
-import org.apache.jackrabbit.vault.util.Text;
+import org.apache.jackrabbit.util.Text;
import org.apache.jackrabbit.vault.vlt.VltContext;
import org.apache.jackrabbit.vault.vlt.VltException;