[jackrabbit-filevault] branch bugfix/nt-file-import-failure updated (6caaaeec -> 51ec533b)

[kw...@apache.org]

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

kwin pushed a change to branch bugfix/nt-file-import-failure
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git


 discard 6caaaeec fix intermediate save
 discard e170dc40 fix IT
 discard f6dbd126 add test to reproduce installation issue with nt:file
     add 51ec533b JCRVLT-646 fix ConstraingViolationException during intermediate save when deserializing enhanced file aggregate

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   (6caaaeec)
            \
             N -- N -- N   refs/heads/bugfix/nt-file-import-failure (51ec533b)

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:
 .../apache/jackrabbit/vault/fs/io/AutoSave.java    |   4 +-
 .../apache/jackrabbit/vault/fs/io/Importer.java    |   2 +-
 .../vault/packaging/integration/ImportIT.java      |   9 +-
 .../META-INF/vault/config.xml                      |   0
 .../META-INF/vault/filter.xml                      |   2 +-
 .../META-INF/vault/properties.xml                  |  13 +
 .../META-INF/vault/settings.xml                    |   0
 .../jcr_root/apps/testnode/.content.xml            |   9 +
 .../jcr_root/apps/testnode}/tika/config.xml        |   0
 .../nt_file_package.zip/META-INF/MANIFEST.MF       |  15 -
 .../software-distribution.ui.apps/pom.properties   |   3 -
 .../software-distribution.ui.apps/pom.xml          | 147 ---------
 .../nt_file_package.zip/META-INF/vault/filter.xml  |  12 -
 .../META-INF/vault/properties.xml                  |  17 -
 .../damAssetLucene-7-custom-2/.content.xml         | 361 ---------------------
 15 files changed, 30 insertions(+), 564 deletions(-)
 rename vault-core/src/test/resources/test-packages/{nt_file_package.zip => enhanced_file_aggregate.zip}/META-INF/vault/config.xml (100%)
 copy vault-core/src/test/resources/test-packages/{namespace.zip => enhanced_file_aggregate.zip}/META-INF/vault/filter.xml (71%)
 create mode 100644 vault-core/src/test/resources/test-packages/enhanced_file_aggregate.zip/META-INF/vault/properties.xml
 rename vault-core/src/test/resources/test-packages/{nt_file_package.zip => enhanced_file_aggregate.zip}/META-INF/vault/settings.xml (100%)
 create mode 100644 vault-core/src/test/resources/test-packages/enhanced_file_aggregate.zip/jcr_root/apps/testnode/.content.xml
 rename vault-core/src/test/resources/test-packages/{nt_file_package.zip/jcr_root/_oak_index/damAssetLucene-7-custom-2 => enhanced_file_aggregate.zip/jcr_root/apps/testnode}/tika/config.xml (100%)
 delete mode 100644 vault-core/src/test/resources/test-packages/nt_file_package.zip/META-INF/MANIFEST.MF
 delete mode 100644 vault-core/src/test/resources/test-packages/nt_file_package.zip/META-INF/maven/com.adobe.aem.distribution/software-distribution.ui.apps/pom.properties
 delete mode 100644 vault-core/src/test/resources/test-packages/nt_file_package.zip/META-INF/maven/com.adobe.aem.distribution/software-distribution.ui.apps/pom.xml
 delete mode 100644 vault-core/src/test/resources/test-packages/nt_file_package.zip/META-INF/vault/filter.xml
 delete mode 100644 vault-core/src/test/resources/test-packages/nt_file_package.zip/META-INF/vault/properties.xml
 delete mode 100644 vault-core/src/test/resources/test-packages/nt_file_package.zip/jcr_root/_oak_index/damAssetLucene-7-custom-2/.content.xml