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/05/12 06:53:43 UTC

[jackrabbit-filevault] branch bugfix/JCRVLT-255-importmodes-for-docview updated (9e11c48 -> b23de3f)

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

kwin pushed a change to branch bugfix/JCRVLT-255-importmodes-for-docview
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git.


 discard 9e11c48  fix javadoc
 discard c1a4b3c  add new import modes, clarify existing ones.
 discard dadbc46  JCRVLT-255 add failing test case for testing import modes
     add b72164a  releng: consolidate how system properties are passed to ITs
     add 84df2bb  releng: always append to jacoco file for ITs
     add 39e306d  releng: run ITs with Oak by default
     add 3dba5a2  JCRVLT-517 fix package cache init in OSGi containers (#136)
     add 492c26e  improve documentation on VaultFS and configuration
     add bcd36a1  releng: build with Java16
     add f290e54  releng: update mockito and hamcrest
     add 4f50ba0  JCRVLT-255 add failing test case for testing import modes
     add 0b1e3d4  add new import modes, clarify existing ones.
     add b17d4f5  fix javadoc
     add b23de3f  fix typo

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (9e11c48)
            \
             N -- N -- N   refs/heads/bugfix/JCRVLT-255-importmodes-for-docview (b23de3f)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 .travis.yml                                        |   2 +-
 parent/pom.xml                                     |  29 +-
 vault-core/pom.xml                                 |  32 +-
 .../vault/fs/impl/io/FileArtifactHandler.java      |   2 +-
 .../jackrabbit/vault/fs/io/MemoryArchive.java      |   7 +-
 .../packaging/impl/SubPackageExportProcessor.java  |   7 +-
 .../vault/packaging/impl/ZipVaultPackage.java      |   3 +-
 .../vault/packaging/registry/PackageRegistry.java  |   8 +-
 .../registry/impl/AbstractPackageRegistry.java     |   6 +-
 .../packaging/registry/impl/FSInstallState.java    | 116 ++++--
 .../registry/impl/FSInstallStateCache.java         | 219 ++++++++++++
 .../packaging/registry/impl/FSPackageRegistry.java | 396 ++++++---------------
 .../packaging/registry/impl/FSPackageStatus.java   |   3 +-
 .../registry/impl/FSRegisteredPackage.java         |   9 +-
 .../registry/impl/JcrPackageRegistry.java          |  19 +-
 .../jackrabbit/vault/util/InputStreamPump.java     |  22 +-
 .../packaging/integration/PackageInstallIT.java    |  29 +-
 .../vault/packaging/integration/SubPackagesIT.java |   2 +-
 .../impl}/FSInstallStateTest.java                  |  39 +-
 .../impl}/FSPackageRegistryIT.java                 | 102 ++++--
 .../registry/impl/FSPackageRegistryTest.java       |  97 +++++
 .../registry/impl/FSRegisteredPackageTest.java     |   7 +-
 .../impl/invalid-metadata.xml}                     |   0
 .../vault/packaging/registry/impl/test-package.xml |  28 ++
 .../test-packages/properties-with-0mtime.zip       | Bin 0 -> 453 bytes
 vault-doc/src/site/markdown/config.md              |  49 ++-
 vault-doc/src/site/markdown/vaultfs.md             |  42 +--
 27 files changed, 810 insertions(+), 465 deletions(-)
 create mode 100644 vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSInstallStateCache.java
 rename vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/{integration => registry/impl}/FSInstallStateTest.java (66%)
 rename vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/{integration => registry/impl}/FSPackageRegistryIT.java (90%)
 create mode 100644 vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSPackageRegistryTest.java
 copy vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/{integration/repository.xml => registry/impl/invalid-metadata.xml} (100%)
 create mode 100644 vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/registry/impl/test-package.xml
 create mode 100644 vault-core/src/test/resources/test-packages/properties-with-0mtime.zip