You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ro...@apache.org on 2020/05/16 02:15:11 UTC

[aries-cdi] branch master updated (1943aaf -> b787f5c)

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

rotty3000 pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/aries-cdi.git.


    from 1943aaf  osgi-test 0.9.0 & simplify
     new ca06329  avoid implementing the Logger API
     new db6f380  re-resolve
     new ee84e2c  use released version of spifly
     new b787f5c  update actions to use JDK/OS matrix (thanks BJ)

The 4 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:
 .github/workflows/maven.yml                        | 128 +++++---------------
 cdi-bom/pom.xml                                    |   2 +-
 .../aries/cdi/container/internal/util/Logs.java    | 130 ++++++++++-----------
 .../apache/aries/cdi/container/test/TestUtil.java  |  19 +--
 cdi-extension-mp-config/owb-itest.bndrun           |   2 +-
 cdi-extension-mp-config/weld-itest.bndrun          |   2 +-
 cdi-extension-mp-jwt-auth/owb-itest.bndrun         |   2 +-
 cdi-extension-mp-jwt-auth/weld-itest.bndrun        |   2 +-
 cdi-extension-mp-metrics/owb-itest.bndrun          |   2 +-
 cdi-extension-mp-metrics/weld-itest.bndrun         |   4 +-
 cdi-itests/owb-itest.bndrun                        |   2 +-
 cdi-itests/weld-itest.bndrun                       |   2 +-
 12 files changed, 111 insertions(+), 186 deletions(-)


[aries-cdi] 02/04: re-resolve

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rotty3000 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-cdi.git

commit db6f38085f40b067fa0192cb165000c235af63f0
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Fri May 15 21:37:56 2020 -0400

    re-resolve
    
    Signed-off-by: Raymond Augé <ro...@apache.org>
---
 cdi-extension-mp-config/owb-itest.bndrun    | 2 +-
 cdi-extension-mp-config/weld-itest.bndrun   | 2 +-
 cdi-extension-mp-jwt-auth/owb-itest.bndrun  | 2 +-
 cdi-extension-mp-jwt-auth/weld-itest.bndrun | 2 +-
 cdi-extension-mp-metrics/owb-itest.bndrun   | 2 +-
 cdi-extension-mp-metrics/weld-itest.bndrun  | 4 ++--
 cdi-itests/owb-itest.bndrun                 | 2 +-
 cdi-itests/weld-itest.bndrun                | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cdi-extension-mp-config/owb-itest.bndrun b/cdi-extension-mp-config/owb-itest.bndrun
index 0ae93f8..2aba2a8 100644
--- a/cdi-extension-mp-config/owb-itest.bndrun
+++ b/cdi-extension-mp-config/owb-itest.bndrun
@@ -19,7 +19,7 @@
 -runblacklist: \
 	osgi.identity;filter:='(osgi.identity=*weld*)'
 -runbundles: \
-	assertj-core;version='[3.15.0,3.15.1)',\
+	assertj-core;version='[3.16.1,3.16.2)',\
 	openwebbeans-impl;version='[2.0.13,2.0.14)',\
 	openwebbeans-spi;version='[2.0.13,2.0.14)',\
 	org.apache.aries.cdi.extender;version='[1.1.2,1.1.3)',\
diff --git a/cdi-extension-mp-config/weld-itest.bndrun b/cdi-extension-mp-config/weld-itest.bndrun
index 94b68d9..9f54851 100644
--- a/cdi-extension-mp-config/weld-itest.bndrun
+++ b/cdi-extension-mp-config/weld-itest.bndrun
@@ -20,7 +20,7 @@
 -runblacklist: \
 	osgi.identity;filter:='(osgi.identity=*owb*)'
 -runbundles: \
-	assertj-core;version='[3.15.0,3.15.1)',\
+	assertj-core;version='[3.16.1,3.16.2)',\
 	jboss-classfilewriter;version='[1.2.4,1.2.5)',\
 	org.apache.aries.cdi.extender;version='[1.1.2,1.1.3)',\
 	org.apache.aries.cdi.extension.mp-config-tests;version='[1.1.2,1.1.3)',\
diff --git a/cdi-extension-mp-jwt-auth/owb-itest.bndrun b/cdi-extension-mp-jwt-auth/owb-itest.bndrun
index 1386a7b..48c6522 100644
--- a/cdi-extension-mp-jwt-auth/owb-itest.bndrun
+++ b/cdi-extension-mp-jwt-auth/owb-itest.bndrun
@@ -19,7 +19,7 @@
 -runblacklist: \
 	osgi.identity;filter:='(osgi.identity=*weld*)'
 -runbundles: \
-	assertj-core;version='[3.15.0,3.15.1)',\
+	assertj-core;version='[3.16.1,3.16.2)',\
 	javax.servlet.jsp-api;version='[2.3.3,2.3.4)',\
 	openwebbeans-impl;version='[2.0.13,2.0.14)',\
 	openwebbeans-spi;version='[2.0.13,2.0.14)',\
diff --git a/cdi-extension-mp-jwt-auth/weld-itest.bndrun b/cdi-extension-mp-jwt-auth/weld-itest.bndrun
index 15f7dbd..41ad983 100644
--- a/cdi-extension-mp-jwt-auth/weld-itest.bndrun
+++ b/cdi-extension-mp-jwt-auth/weld-itest.bndrun
@@ -20,7 +20,7 @@
 -runblacklist: \
 	osgi.identity;filter:='(osgi.identity=*owb*)'
 -runbundles: \
-	assertj-core;version='[3.15.0,3.15.1)',\
+	assertj-core;version='[3.16.1,3.16.2)',\
 	jboss-classfilewriter;version='[1.2.4,1.2.5)',\
 	org.apache.aries.cdi.extender;version='[1.1.2,1.1.3)',\
 	org.apache.aries.cdi.extension.jaxrs;version='[1.1.2,1.1.3)',\
diff --git a/cdi-extension-mp-metrics/owb-itest.bndrun b/cdi-extension-mp-metrics/owb-itest.bndrun
index 877668d..b63e21d 100644
--- a/cdi-extension-mp-metrics/owb-itest.bndrun
+++ b/cdi-extension-mp-metrics/owb-itest.bndrun
@@ -19,7 +19,7 @@
 -runblacklist: \
 	osgi.identity;filter:='(osgi.identity=*weld*)'
 -runbundles: \
-	assertj-core;version='[3.15.0,3.15.1)',\
+	assertj-core;version='[3.16.1,3.16.2)',\
 	openwebbeans-impl;version='[2.0.13,2.0.14)',\
 	openwebbeans-spi;version='[2.0.13,2.0.14)',\
 	org.apache.aries.cdi.extender;version='[1.1.2,1.1.3)',\
diff --git a/cdi-extension-mp-metrics/weld-itest.bndrun b/cdi-extension-mp-metrics/weld-itest.bndrun
index 504da07..48a29d3 100644
--- a/cdi-extension-mp-metrics/weld-itest.bndrun
+++ b/cdi-extension-mp-metrics/weld-itest.bndrun
@@ -20,7 +20,7 @@
 -runblacklist: \
 	osgi.identity;filter:='(osgi.identity=*owb*)'
 -runbundles: \
-	assertj-core;version='[3.15.0,3.15.1)',\
+	assertj-core;version='[3.16.1,3.16.2)',\
 	jboss-classfilewriter;version='[1.2.4,1.2.5)',\
 	org.apache.aries.cdi.extender;version='[1.1.2,1.1.3)',\
 	org.apache.aries.cdi.extension.mp-metrics-tests;version='[1.1.2,1.1.3)',\
@@ -59,4 +59,4 @@
 	org.osgi.test.common;version='[0.9.0,0.9.1)',\
 	org.osgi.test.junit4;version='[0.9.0,0.9.1)',\
 	org.osgi.util.function;version='[1.1.0,1.1.1)',\
-	org.osgi.util.promise;version='[1.1.0,1.1.1)'
\ No newline at end of file
+	org.osgi.util.promise;version='[1.1.0,1.1.1)'
diff --git a/cdi-itests/owb-itest.bndrun b/cdi-itests/owb-itest.bndrun
index 9d9f8ce..2049646 100644
--- a/cdi-itests/owb-itest.bndrun
+++ b/cdi-itests/owb-itest.bndrun
@@ -19,7 +19,7 @@
 -runblacklist: \
 	osgi.identity;filter:='(osgi.identity=*weld*)'
 -runbundles: \
-	assertj-core;version='[3.15.0,3.15.1)',\
+	assertj-core;version='[3.16.1,3.16.2)',\
 	javax.servlet.jsp-api;version='[2.3.3,2.3.4)',\
 	openwebbeans-impl;version='[2.0.13,2.0.14)',\
 	openwebbeans-spi;version='[2.0.13,2.0.14)',\
diff --git a/cdi-itests/weld-itest.bndrun b/cdi-itests/weld-itest.bndrun
index f65f9e1..586afd7 100644
--- a/cdi-itests/weld-itest.bndrun
+++ b/cdi-itests/weld-itest.bndrun
@@ -20,7 +20,7 @@
 -runblacklist: \
 	osgi.identity;filter:='(osgi.identity=*owb*)'
 -runbundles: \
-	assertj-core;version='[3.15.0,3.15.1)',\
+	assertj-core;version='[3.16.1,3.16.2)',\
 	jboss-classfilewriter;version='[1.2.4,1.2.5)',\
 	org.apache.aries.cdi.extender;version='[1.1.2,1.1.3)',\
 	org.apache.aries.cdi.extension.jaxrs;version='[1.1.2,1.1.3)',\


[aries-cdi] 04/04: update actions to use JDK/OS matrix (thanks BJ)

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rotty3000 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-cdi.git

commit b787f5c1399744b5cae0dcd2727f2cd229fdeb11
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Fri May 15 21:54:09 2020 -0400

    update actions to use JDK/OS matrix (thanks BJ)
    
    Signed-off-by: Raymond Augé <ro...@apache.org>
---
 .github/workflows/maven.yml | 128 ++++++++++----------------------------------
 1 file changed, 28 insertions(+), 100 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index bb6e412..03a8e8e 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -18,116 +18,44 @@ env:
   LC_ALL: en_US.UTF-8
 
 jobs:
-  OpenJDK8_Linux:
-    name: OpenJDK8 Linux
-    runs-on: ubuntu-latest
+  JDKxx_Matrix:
+    strategy:
+      matrix:
+        java: [ 8, 11, 14 ]
+        os: [ ubuntu-latest ]
+        include:
+        - os: windows-latest
+          java: 8
+    name: JDK${{ matrix.java }} ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
     steps:
     - name: Git Checkout
       uses: actions/checkout@v2
     - name: Set up Java
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
-    - name: Build OpenJDK8 Linux
-      run: mvn -U -e -B -ntp install
-  OpenJDK11_Linux:
-    name: OpenJDK11 Linux
-    runs-on: ubuntu-latest
-    steps:
-    - name: Git Checkout
-      uses: actions/checkout@v2
-    - name: Set up Java
-      uses: actions/setup-java@v1
-      with:
-        java-version: 11
-    - name: Build OpenJDK11 Linux
-      run: mvn -U -e -B -ntp install
-  OpenJDK13_Linux:
-    name: OpenJDK13 Linux
-    runs-on: ubuntu-latest
-    steps:
-    - name: Git Checkout
-      uses: actions/checkout@v2
-    - name: Set up Java
-      uses: actions/setup-java@v1
-      with:
-        java-version: 13
-    - name: Build OpenJDK13 Linux
-      run: mvn -U -e -B -ntp install
-  OpenJDK8_Windows:
-    name: OpenJDK8 Windows
-    runs-on: windows-latest
-    steps:
-    - name: Git Checkout
-      uses: actions/checkout@v2
-    - name: Set up Java
-      uses: actions/setup-java@v1
-      with:
-        java-version: 1.8
-    - name: Build OpenJDK8 Windows
+        java-version: ${{ matrix.java }}
+    - name: Build
       shell: bash
-      run: mvn -U -e -B -ntp install
-  OpenJDK8_macOS:
-    name: OpenJDK8 macOS
-    runs-on: macos-latest
-    steps:
-    - name: Git Checkout
-      uses: actions/checkout@v2
-    - name: Set up Java
-      uses: actions/setup-java@v1
-      with:
-        java-version: 1.8
-    - name: Build OpenJDK8 macOS
-      shell: bash
-      run: mvn -U -e -B -ntp install
-  OpenJDK8_Linux_Experimental:
-    name: OpenJDK8 Linux Experimental
-    runs-on: ubuntu-latest
-    steps:
-    - name: Git Checkout
-      uses: actions/checkout@v2
-    - name: Set up Java
-      uses: actions/setup-java@v1
-      with:
-        java-version: 1.8
-    - name: Build OpenJDK8 Linux Experimental
-      continue-on-error: true
-      run: mvn -U -e -B -ntp install -Pexperimental
-  OpenJDK11_Linux_Experimental:
-    name: OpenJDK11 Linux Experimental
-    runs-on: ubuntu-latest
-    steps:
-    - name: Git Checkout
-      uses: actions/checkout@v2
-    - name: Set up Java
-      uses: actions/setup-java@v1
-      with:
-        java-version: 11
-    - name: Build OpenJDK11 Linux Experimental
-      continue-on-error: true
-      run: mvn -U -e -B -ntp install -Pexperimental
-  OpenJDK13_Linux_Experimental:
-    name: OpenJDK13 Linux Experimental
-    runs-on: ubuntu-latest
-    steps:
-    - name: Git Checkout
-      uses: actions/checkout@v2
-    - name: Set up Java
-      uses: actions/setup-java@v1
-      with:
-        java-version: 13
-    - name: Build OpenJDK13 Linux Experimental
-      continue-on-error: true
-      run: mvn -U -e -B -ntp install -Pexperimental
-  OpenJDK14_Linux_Experimental:
-    name: OpenJDK14 Linux Experimental
-    runs-on: ubuntu-latest
+      run: |
+        mvn -U -e -B -ntp -X install
+  JDKxx_Matrix-Experimental:
+    strategy:
+      matrix:
+        java: [ 8, 11, 14 ]
+        os: [ ubuntu-latest ]
+        include:
+        - os: windows-latest
+          java: 8
+    name: JDK${{ matrix.java }} ${{ matrix.os }} Experimental
+    runs-on: ${{ matrix.os }}
     steps:
     - name: Git Checkout
       uses: actions/checkout@v2
     - name: Set up Java
       uses: actions/setup-java@v1
       with:
-        java-version: 14
-    - name: Build OpenJDK14 Linux Experimental
-      run: mvn -U -e -B -ntp install -Pexperimental
+        java-version: ${{ matrix.java }}
+    - name: Build
+      run: |
+        mvn -U -e -B -ntp -X install -Pexperimental


[aries-cdi] 01/04: avoid implementing the Logger API

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rotty3000 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-cdi.git

commit ca0632935297893eca903362afaa45e6e1edd3e0
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Fri May 15 21:27:58 2020 -0400

    avoid implementing the Logger API
    
    Signed-off-by: Raymond Augé <ro...@apache.org>
---
 .../aries/cdi/container/internal/util/Logs.java    | 130 ++++++++++-----------
 .../apache/aries/cdi/container/test/TestUtil.java  |  19 +--
 2 files changed, 73 insertions(+), 76 deletions(-)

diff --git a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/util/Logs.java b/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/util/Logs.java
index a12ce38..80042f9 100644
--- a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/util/Logs.java
+++ b/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/util/Logs.java
@@ -14,6 +14,13 @@
 
 package org.apache.aries.cdi.container.internal.util;
 
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
 import org.osgi.framework.BundleContext;
 import org.osgi.service.log.Logger;
 import org.osgi.service.log.LoggerConsumer;
@@ -59,7 +66,12 @@ public class Logs {
 			return _loggerFactory.getLogger(name);
 		}
 
-		return new SysoutLogger(name);
+		return getLoggerProxy(new SysoutLogger(name));
+	}
+
+	public static Logger getLoggerProxy(InvocationHandler invocationHandler) {
+		return (Logger)Proxy.newProxyInstance(
+			Logs.class.getClassLoader(), new Class<?>[] {Logger.class}, invocationHandler);
 	}
 
 	public LoggerFactory getLoggerFactory() {
@@ -68,174 +80,156 @@ public class Logs {
 
 	private final LoggerFactory _loggerFactory;
 
-	private static abstract class BaseLogger implements Logger {
+	public static class SysoutLogger implements InvocationHandler {
 
-		@Override
-		public <E extends Exception> void debug(LoggerConsumer<E> consumer) throws E {
-			if (isDebugEnabled())
-				consumer.accept(this);
-		}
+		static final Map<Method, Method> methodMap = new ConcurrentHashMap<>();
 
-		@Override
-		public <E extends Exception> void error(LoggerConsumer<E> consumer) throws E {
-			if (isErrorEnabled())
-				consumer.accept(this);
-		}
+		static {
+			Method[] handlerMethods = SysoutLogger.class.getDeclaredMethods();
 
-		@Override
-		public <E extends Exception> void info(LoggerConsumer<E> consumer) throws E {
-			if (isInfoEnabled())
-				consumer.accept(this);
+			for (Method handlerMethod : handlerMethods) {
+				try {
+					Method method = Logger.class.getMethod(handlerMethod.getName(), handlerMethod.getParameterTypes());
+					methodMap.put(method, handlerMethod);
+				} catch (NoSuchMethodException | SecurityException e) {
+					// nothing to do
+				}
+			}
 		}
 
-		@Override
-		public <E extends Exception> void trace(LoggerConsumer<E> consumer) throws E {
-			if (isTraceEnabled())
-				consumer.accept(this);
+		private final String name;
+
+		public SysoutLogger(String name) {
+			this.name = name;
 		}
 
 		@Override
-		public <E extends Exception> void warn(LoggerConsumer<E> consumer) throws E {
-			if (isWarnEnabled())
-				consumer.accept(this);
+		public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+			Method handlerMethod = methodMap.get(method);
+
+			if (handlerMethod != null) {
+				try {
+					if (handlerMethod != null) {
+						return handlerMethod.invoke(this, args);
+					}
+				} catch (InvocationTargetException e) {
+					throw e.getCause();
+				}
+			}
+			return method.invoke(this, args);
 		}
 
-		@Override
 		public void audit(String message) {
 		}
 
-		@Override
 		public void audit(String format, Object arg) {
 		}
 
-		@Override
 		public void audit(String format, Object arg1, Object arg2) {
 		}
 
-		@Override
 		public void audit(String format, Object... arguments) {
 		}
 
-	}
-
-	public static class SysoutLogger extends BaseLogger {
-
-		private final String name;
-
-		public SysoutLogger(String name) {
-			this.name = name;
-		}
-
-		@Override
 		public void debug(String message) {
 		}
 
-		@Override
 		public void debug(String format, Object arg) {
 		}
 
-		@Override
 		public void debug(String format, Object arg1, Object arg2) {
 		}
 
-		@Override
 		public void debug(String format, Object... arguments) {
 		}
 
-		@Override
+		public <E extends Exception> void debug(LoggerConsumer<E> consumer) throws E {
+		}
+
 		public void error(String message) {
 		}
 
-		@Override
 		public void error(String format, Object arg) {
 		}
 
-		@Override
 		public void error(String format, Object arg1, Object arg2) {
 		}
 
-		@Override
 		public void error(String format, Object... arguments) {
 		}
 
-		@Override
+		public <E extends Exception> void error(LoggerConsumer<E> consumer) throws E {
+		}
+
 		public String getName() {
 			return name;
 		}
 
-		@Override
 		public void info(String message) {
 		}
 
-		@Override
 		public void info(String format, Object arg) {
 		}
 
-		@Override
 		public void info(String format, Object arg1, Object arg2) {
 		}
 
-		@Override
 		public void info(String format, Object... arguments) {
 		}
 
-		@Override
+		public <E extends Exception> void info(LoggerConsumer<E> consumer) throws E {
+		}
+
 		public boolean isDebugEnabled() {
-			return true;
+			return false;
 		}
 
-		@Override
 		public boolean isErrorEnabled() {
-			return true;
+			return false;
 		}
 
-		@Override
 		public boolean isInfoEnabled() {
-			return true;
+			return false;
 		}
 
-		@Override
 		public boolean isTraceEnabled() {
-			return true;
+			return false;
 		}
 
-		@Override
 		public boolean isWarnEnabled() {
-			return true;
+			return false;
 		}
 
-		@Override
 		public void trace(String message) {
 		}
 
-		@Override
 		public void trace(String format, Object arg) {
 		}
 
-		@Override
 		public void trace(String format, Object arg1, Object arg2) {
 		}
 
-		@Override
 		public void trace(String format, Object... arguments) {
 		}
 
-		@Override
+		public <E extends Exception> void trace(LoggerConsumer<E> consumer) throws E {
+		}
+
 		public void warn(String message) {
 		}
 
-		@Override
 		public void warn(String format, Object arg) {
 		}
 
-		@Override
 		public void warn(String format, Object arg1, Object arg2) {
 		}
 
-		@Override
 		public void warn(String format, Object... arguments) {
 		}
 
+		public <E extends Exception> void warn(LoggerConsumer<E> consumer) throws E {
+		}
+
 	}
 
 }
\ No newline at end of file
diff --git a/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/TestUtil.java b/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/TestUtil.java
index 5da1cd3..2b0b78a 100644
--- a/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/TestUtil.java
+++ b/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/TestUtil.java
@@ -14,9 +14,12 @@
 
 package org.apache.aries.cdi.container.test;
 
-import static org.apache.aries.cdi.container.internal.util.Reflection.*;
-import static org.mockito.ArgumentMatchers.*;
-import static org.mockito.Mockito.*;
+import static org.apache.aries.cdi.container.internal.util.Reflection.cast;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import java.net.URL;
 import java.util.AbstractMap.SimpleEntry;
@@ -245,31 +248,31 @@ public class TestUtil {
 		when(lf.getLogger(any(Class.class))).then(
 			(Answer<Logger>) getLogger -> {
 				Class<?> clazz = getLogger.getArgument(0);
-				return new Sfl4jLogger(clazz.getName());
+				return Logs.getLoggerProxy(new Sfl4jLogger(clazz.getName()));
 			}
 		);
 		when(lf.getLogger(anyString())).then(
 			(Answer<Logger>) getLogger -> {
 				String name = getLogger.getArgument(0);
-				return new Sfl4jLogger(name);
+				return Logs.getLoggerProxy(new Sfl4jLogger(name));
 			}
 		);
 		when(lf.getLogger(any(Class.class), any())).then(
 			(Answer<Logger>) getLogger -> {
 				Class<?> clazz = getLogger.getArgument(0);
-				return new Sfl4jLogger(clazz.getName());
+				return Logs.getLoggerProxy(new Sfl4jLogger(clazz.getName()));
 			}
 		);
 		when(lf.getLogger(anyString(), any())).then(
 			(Answer<Logger>) getLogger -> {
 				String name = getLogger.getArgument(0);
-				return new Sfl4jLogger(name);
+				return Logs.getLoggerProxy(new Sfl4jLogger(name));
 			}
 		);
 		when(lf.getLogger(any(), anyString(), any())).then(
 			(Answer<Logger>) getLogger -> {
 				String name = getLogger.getArgument(1);
-				return new Sfl4jLogger(name);
+				return Logs.getLoggerProxy(new Sfl4jLogger(name));
 			}
 		);
 		bundle.getBundleContext().registerService(LoggerFactory.class, lf, null);


[aries-cdi] 03/04: use released version of spifly

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rotty3000 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-cdi.git

commit ee84e2c874923bc9a1fc24d84ee8cc7e8dba7d8e
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Fri May 15 21:45:45 2020 -0400

    use released version of spifly
    
    Signed-off-by: Raymond Augé <ro...@apache.org>
---
 cdi-bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cdi-bom/pom.xml b/cdi-bom/pom.xml
index 0c21f99..a5c8792 100644
--- a/cdi-bom/pom.xml
+++ b/cdi-bom/pom.xml
@@ -126,7 +126,7 @@
 			<dependency>
 				<groupId>org.apache.aries.spifly</groupId>
 				<artifactId>org.apache.aries.spifly.dynamic.framework.extension</artifactId>
-				<version>1.2.4-SNAPSHOT</version>
+				<version>1.2.4</version>
 				<scope>runtime</scope>
 			</dependency>
 			<dependency>