You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by tj...@apache.org on 2021/05/18 15:59:58 UTC
[felix-dev] branch master updated (c1197d9 -> 20272ad)
This is an automated email from the ASF dual-hosted git repository.
tjwatson pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git.
from c1197d9 Merge pull request #75 from amitjoy/scr-logging-enhancement
new b747b7d Update framework implementations
new addf139 Update to compile with Java 8
new 4dc2ed1 Hide LoggerFactory from Equinox for unit test.
new d59927b Fix test cases to tolerate both felix and equinox
new 20272ad FELIX-6408 - NPE in MultipleStaticReluctantCustomizer.modifiedService
The 5 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:
scr/pom.xml | 12 +++++++++---
.../felix/scr/impl/manager/DependencyManager.java | 2 +-
.../org/apache/felix/scr/impl/logger/LoggerTest.java | 18 ++++++++++++++++++
.../scr/integration/ComponentConcurrencyTest.java | 1 +
.../felix/scr/integration/ComponentTestBase.java | 2 +-
5 files changed, 30 insertions(+), 5 deletions(-)
[felix-dev] 03/05: Hide LoggerFactory from Equinox for unit test.
Posted by tj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tjwatson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
commit 4dc2ed1865f5a2d0c6a1918b33a358b4edb753b2
Author: Thomas Watson <tj...@us.ibm.com>
AuthorDate: Tue May 11 12:20:17 2021 -0500
Hide LoggerFactory from Equinox for unit test.
---
.../org/apache/felix/scr/impl/logger/LoggerTest.java | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/scr/src/test/java/org/apache/felix/scr/impl/logger/LoggerTest.java b/scr/src/test/java/org/apache/felix/scr/impl/logger/LoggerTest.java
index faa534e..22f8e85 100644
--- a/scr/src/test/java/org/apache/felix/scr/impl/logger/LoggerTest.java
+++ b/scr/src/test/java/org/apache/felix/scr/impl/logger/LoggerTest.java
@@ -31,6 +31,7 @@ import java.io.FilterOutputStream;
import java.io.IOException;
import java.io.PrintStream;
import java.io.StringWriter;
+import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.ServiceLoader;
@@ -42,8 +43,11 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleException;
import org.osgi.framework.Constants;
+import org.osgi.framework.ServiceReference;
+import org.osgi.framework.hooks.service.FindHook;
import org.osgi.framework.launch.Framework;
import org.osgi.service.log.LogLevel;
import org.osgi.service.log.Logger;
@@ -70,6 +74,20 @@ public class LoggerTest {
.newFramework(configuration);
framework.init();
framework.start();
+ // hide LoggerFactory from equinox
+ framework.getBundleContext().registerService(FindHook.class, new FindHook()
+ {
+
+ @Override
+ public void find(BundleContext context, String name, String filter,
+ boolean allServices, Collection<ServiceReference<?>> references)
+ {
+ if (name != null && "org.osgi.service.log.LoggerFactory".equals(name))
+ {
+ references.removeIf((r) -> r.getBundle().getBundleId() == 0);
+ }
+ }
+ }, null);
scr = framework.getBundleContext().installBundle("scr", makeBundle("scr").openInputStream());
component = framework.getBundleContext().installBundle("component",
[felix-dev] 04/05: Fix test cases to tolerate both felix and equinox
Posted by tj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tjwatson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
commit d59927bdfefae1dee66a07d1a6b183e0e6184913
Author: Thomas Watson <tj...@us.ibm.com>
AuthorDate: Tue May 18 10:42:37 2021 -0500
Fix test cases to tolerate both felix and equinox
---
.../java/org/apache/felix/scr/integration/ComponentConcurrencyTest.java | 1 +
.../test/java/org/apache/felix/scr/integration/ComponentTestBase.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/scr/src/test/java/org/apache/felix/scr/integration/ComponentConcurrencyTest.java b/scr/src/test/java/org/apache/felix/scr/integration/ComponentConcurrencyTest.java
index 73e8ae6..24d0919 100644
--- a/scr/src/test/java/org/apache/felix/scr/integration/ComponentConcurrencyTest.java
+++ b/scr/src/test/java/org/apache/felix/scr/integration/ComponentConcurrencyTest.java
@@ -29,6 +29,7 @@ public class ComponentConcurrencyTest extends ComponentTestBase
restrictedLogging = true;
ignoredWarnings = new String[] {"FrameworkEvent: ERROR",
"FrameworkEvent ERROR",
+ "FrameworkEvent: WARNING",
"Could not get service from ref",
"Failed creating the component instance; see log for reason",
"Cannot create component instance due to failure to bind reference",
diff --git a/scr/src/test/java/org/apache/felix/scr/integration/ComponentTestBase.java b/scr/src/test/java/org/apache/felix/scr/integration/ComponentTestBase.java
index 0966c5b..03471ab 100644
--- a/scr/src/test/java/org/apache/felix/scr/integration/ComponentTestBase.java
+++ b/scr/src/test/java/org/apache/felix/scr/integration/ComponentTestBase.java
@@ -952,7 +952,7 @@ public abstract class ComponentTestBase
{
if ( m_warnings.size() < 1024 )
{
- m_warnings.add( entry.getMessage() );
+ m_warnings.add(entry.getMessage() + entry.getError());
}
else
{
[felix-dev] 01/05: Update framework implementations
Posted by tj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tjwatson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
commit b747b7d1d057c57cd2c78380ee1fdea1d0094195
Author: Thomas Watson <tj...@us.ibm.com>
AuthorDate: Tue May 11 12:18:49 2021 -0500
Update framework implementations
Older versions of the framework implementations do not support Java 11.
---
scr/pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/scr/pom.xml b/scr/pom.xml
index fa63fe9..39b66e9 100644
--- a/scr/pom.xml
+++ b/scr/pom.xml
@@ -380,7 +380,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>4.6.0</version>
+ <version>6.0.4</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -389,9 +389,9 @@
<id>equinox</id>
<dependencies>
<dependency>
- <groupId>org.eclipse</groupId>
+ <groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
- <version>3.8.0.v20120529-1548</version>
+ <version>3.16.200</version>
<scope>test</scope>
</dependency>
</dependencies>
[felix-dev] 02/05: Update to compile with Java 8
Posted by tj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tjwatson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
commit addf139ccd96be4cfa6b0b739cb257ff13e2b3a8
Author: Thomas Watson <tj...@us.ibm.com>
AuthorDate: Tue May 11 12:19:23 2021 -0500
Update to compile with Java 8
---
scr/pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/scr/pom.xml b/scr/pom.xml
index 39b66e9..0b9c77f 100644
--- a/scr/pom.xml
+++ b/scr/pom.xml
@@ -66,6 +66,12 @@
${bundle.build.name}/${project.build.finalName}.jar
</bundle.file.name>
<felix.ca.version>1.9.0</felix.ca.version>
+
+ <java.version>8</java.version>
+ <felix.java.version>${java.version}</felix.java.version>
+ <maven.compiler.release>${java.version}</maven.compiler.release>
+ <maven.compiler.source>${java.version}</maven.compiler.source>
+ <maven.compiler.target>${java.version}</maven.compiler.target>
</properties>
[felix-dev] 05/05: FELIX-6408 - NPE in
MultipleStaticReluctantCustomizer.modifiedService
Posted by tj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tjwatson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
commit 20272ad9aeb3dfd312163de2d0b013e5bb292aec
Author: Thomas Watson <tj...@us.ibm.com>
AuthorDate: Tue May 11 12:26:31 2021 -0500
FELIX-6408 - NPE in MultipleStaticReluctantCustomizer.modifiedService
Check for null on calls to this.refs.get().
---
.../main/java/org/apache/felix/scr/impl/manager/DependencyManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java b/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
index 7e99e2a..c39585a 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
@@ -667,7 +667,7 @@ public class DependencyManager<S, T> implements ReferenceManager<S, T>
null, getName(), trackingCount, serviceReference );
boolean reactivate = false;
Collection<RefPair<S, T>> refs = this.refs.get();
- if (isActive() && refs.contains(refPair))
+ if (isActive() && refs != null && refs.contains(refPair))
{
reactivate = m_componentManager.invokeUpdatedMethod(DependencyManager.this, refPair, trackingCount);
}