You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@sling.apache.org by ss...@apache.org on 2018/07/31 10:28:13 UTC

[sling-org-apache-sling-testing-osgi-mock] 03/03: Merge branch 'dynamic-reference-properties'

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

sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-osgi-mock.git

commit dbfffe91d6e2a1b640a19d73cfae62826690129d
Merge: bf71f40 3cc2d81
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Tue Jul 31 12:27:42 2018 +0200

    Merge branch 'dynamic-reference-properties'

 .../sling/testing/mock/osgi/MockBundleContext.java |  7 +++
 .../apache/sling/testing/mock/osgi/MockOsgi.java   | 15 +++++-
 .../sling/testing/mock/osgi/OsgiMetadataUtil.java  | 59 +++++++++++++++++-----
 .../sling/testing/mock/osgi/OsgiServiceUtil.java   | 11 +++-
 .../testing/mock/osgi/context/OsgiContextImpl.java |  2 +-
 .../sling/testing/mock/osgi/package-info.java      |  2 +-
 ...ckBundleContextDynamicReferencesOsgiR6Test.java | 26 +++++++++-
 .../testing/mock/osgi/OsgiServiceUtilTest.java     |  6 +++
 ...sling.testing.mock.osgi.OsgiServiceUtilTest.xml |  1 +
 9 files changed, 109 insertions(+), 20 deletions(-)