[isis] branch master updated (6cb9dab -> afdf7f9)

[da...@apache.org]

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

danhaywood pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.


    from 6cb9dab  Merge pull request #621 from apache/ISIS-2755
     add 9c4f12d  ISIS-2757: fixes order of InstanceByPriorityComparator, and supports @Primary
     add ccfeb8e  ISIS-2757: fixes impl, adds integ test
     new afdf7f9  Merge pull request #622 from apache/ISIS-2757

The 1 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:
 .../registry/InstanceByPriorityComparator.java     |  18 ++-
 core/internaltestsupport/pom.xml                   |   6 +-
 .../value/ValueTypeContractTestAbstract.java       | 132 ---------------------
 .../SpringServiceInjectPriorityTest.java           |  25 +++-
 4 files changed, 37 insertions(+), 144 deletions(-)
 delete mode 100644 core/internaltestsupport/src/main/java/org/apache/isis/core/internaltestsupport/value/ValueTypeContractTestAbstract.java

[isis] 01/01: Merge pull request #622 from apache/ISIS-2757

[da...@apache.org]

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

danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git

commit afdf7f969f29180e9e6194e4e98996f3674ac163
Merge: 6cb9dab ccfeb8e
Author: Dan Haywood <da...@apache.org>
AuthorDate: Sat Jun 19 16:54:56 2021 +0100

    Merge pull request #622 from apache/ISIS-2757
    
    Isis 2757

 .../registry/InstanceByPriorityComparator.java     |  18 ++-
 core/internaltestsupport/pom.xml                   |   6 +-
 .../value/ValueTypeContractTestAbstract.java       | 132 ---------------------
 .../SpringServiceInjectPriorityTest.java           |  25 +++-
 4 files changed, 37 insertions(+), 144 deletions(-)