[felix-dev] 01/01: Merge branch 'master' into scrR8

[tj...@apache.org]

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

tjwatson pushed a commit to branch scrR8
in repository https://gitbox.apache.org/repos/asf/felix-dev.git

commit f343822f21c316e7a1b8c64d12fbe2495063959f
Merge: ee34b77 a6c986f
Author: Thomas Watson <tj...@us.ibm.com>
AuthorDate: Fri Nov 6 09:32:52 2020 -0600

    Merge branch 'master' into scrR8

 .../scr/integration/ComponentConstructorTest.java  | 68 ++++++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --cc scr/src/test/java/org/apache/felix/scr/integration/ComponentConstructorTest.java
index f8b8aaa,548a284..43053fc
--- a/scr/src/test/java/org/apache/felix/scr/integration/ComponentConstructorTest.java
+++ b/scr/src/test/java/org/apache/felix/scr/integration/ComponentConstructorTest.java
@@@ -27,14 -27,20 +27,20 @@@ import static org.junit.Assert.assertTr
  import java.util.Collection;
  
  import org.apache.felix.scr.integration.components.ConstructorComponent;
+ import org.apache.felix.scr.integration.components.ConstructorMultiReference;
+ import org.apache.felix.scr.integration.components.ConstructorSingleReference;
 +import org.junit.Assert;
  import org.junit.Test;
  import org.junit.runner.RunWith;
  import org.ops4j.pax.exam.junit.PaxExam;
+ import org.osgi.framework.Bundle;
  import org.osgi.framework.InvalidSyntaxException;
+ import org.osgi.framework.ServiceException;
+ import org.osgi.framework.ServiceFactory;
  import org.osgi.framework.ServiceReference;
+ import org.osgi.framework.ServiceRegistration;
  import org.osgi.service.component.runtime.dto.ComponentConfigurationDTO;
  
 -import junit.framework.Assert;
  import junit.framework.TestCase;