[jackrabbit-oak] branch 1.22 updated: OAK-9459: ConstraintViolationException in VersionManagerImplRestore when target node has a property definition unknown by the frozen node - marked test as failing

[mr...@apache.org]

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

mreutegg pushed a commit to branch 1.22
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git


The following commit(s) were added to refs/heads/1.22 by this push:
     new fa4d1b3  OAK-9459: ConstraintViolationException in VersionManagerImplRestore when target node has a property definition unknown by the frozen node - marked test as failing
     new 34fbca6  Merge pull request #411 from mreutegg/OAK-9459-1.22
fa4d1b3 is described below

commit fa4d1b3648d35bf6dadf2ccc5346d228847cbaf0
Author: Julian Reschke <re...@apache.org>
AuthorDate: Fri Jun 11 15:11:19 2021 +0000

    OAK-9459: ConstraintViolationException in VersionManagerImplRestore when target node has a property definition unknown by the frozen node - marked test as failing
    
    git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1890699 13f79535-47bb-0310-9956-ffa450edef68
    (cherry picked from commit bb73fe474d83709f224229dea668a99d9c80c198)
---
 oak-jcr/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/oak-jcr/pom.xml b/oak-jcr/pom.xml
index e90a467..367d372 100644
--- a/oak-jcr/pom.xml
+++ b/oak-jcr/pom.xml
@@ -82,6 +82,7 @@
       org.apache.jackrabbit.test.api.version.VersionHistoryTest#testMerge
       org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreLabel
       org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreLabelJcr2
+      org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreRemovesMixin <!-- OAK-9459 -->
       org.apache.jackrabbit.test.api.version.WorkspaceRestoreTest
       org.apache.jackrabbit.test.api.version.MergeCancelMergeTest
       org.apache.jackrabbit.test.api.version.MergeCheckedoutSubNodeTest