You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by al...@apache.org on 2025/01/23 19:38:27 UTC
(aries) branch trunk updated (45a7f1a0c -> c4441cc06)
This is an automated email from the ASF dual-hosted git repository.
alien11689 pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/aries.git
from 45a7f1a0c Bump org.apache.maven.plugins:maven-compiler-plugin from 3.1 to 3.13.0
new 601ca3376 [MAINTENANCE] Use mockito-core instead of mockito-all
new c4441cc06 [MAINTENANCE] Upgrade to mockito-core 4.11.0
The 2 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:
async/async-impl/pom.xml | 6 +++---
.../test/java/org/apache/aries/async/impl/AsyncServiceTest.java | 2 +-
jmx/jmx-core-whiteboard/pom.xml | 6 +++---
jmx/jmx-core/pom.xml | 6 +++---
.../java/org/apache/aries/jmx/cm/ConfigurationAdminTest.java | 9 +++++----
.../java/org/apache/aries/jmx/framework/BundleStateTest.java | 6 +++---
.../java/org/apache/aries/jmx/framework/ServiceStateTest.java | 6 +++---
.../apache/aries/jmx/provisioning/ProvisioningServiceTest.java | 2 +-
.../test/java/org/apache/aries/jmx/util/FrameworkUtilsTest.java | 4 ++--
jmx/jmx-whiteboard/pom.xml | 6 +++---
pushstream/pom.xml | 6 +++---
spi-fly/spi-fly-itests/test.bndrun | 2 +-
12 files changed, 31 insertions(+), 30 deletions(-)
(aries) 02/02: [MAINTENANCE] Upgrade to mockito-core 4.11.0
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
alien11689 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/aries.git
commit c4441cc06adcdb94f6b781e3c7a6e98111386e39
Author: Dominik Przybysz <al...@gmail.com>
AuthorDate: Thu Jan 23 20:30:31 2025 +0100
[MAINTENANCE] Upgrade to mockito-core 4.11.0
---
async/async-impl/pom.xml | 2 +-
.../test/java/org/apache/aries/async/impl/AsyncServiceTest.java | 2 +-
jmx/jmx-core-whiteboard/pom.xml | 2 +-
jmx/jmx-core/pom.xml | 2 +-
.../java/org/apache/aries/jmx/cm/ConfigurationAdminTest.java | 9 +++++----
.../java/org/apache/aries/jmx/framework/BundleStateTest.java | 6 +++---
.../java/org/apache/aries/jmx/framework/ServiceStateTest.java | 6 +++---
.../apache/aries/jmx/provisioning/ProvisioningServiceTest.java | 2 +-
.../test/java/org/apache/aries/jmx/util/FrameworkUtilsTest.java | 4 ++--
jmx/jmx-whiteboard/pom.xml | 2 +-
pushstream/pom.xml | 2 +-
spi-fly/spi-fly-itests/test.bndrun | 2 +-
12 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/async/async-impl/pom.xml b/async/async-impl/pom.xml
index 8a08be501..eb99cb8d8 100644
--- a/async/async-impl/pom.xml
+++ b/async/async-impl/pom.xml
@@ -60,7 +60,7 @@
<lastReleaseVersion>1.0.1</lastReleaseVersion>
<cglib-nodep.version>3.2.4</cglib-nodep.version>
- <mockito-core.version>1.9.5</mockito-core.version>
+ <mockito-core.version>4.11.0</mockito-core.version>
<org.apache.aries.async.api.version>1.0.2-SNAPSHOT</org.apache.aries.async.api.version>
<org.apache.aries.async.promise.api.version>1.1.0-SNAPSHOT</org.apache.aries.async.promise.api.version>
<org.osgi.service.log.version>1.5.0</org.osgi.service.log.version>
diff --git a/async/async-impl/src/test/java/org/apache/aries/async/impl/AsyncServiceTest.java b/async/async-impl/src/test/java/org/apache/aries/async/impl/AsyncServiceTest.java
index 8378f81dc..6792eec2e 100644
--- a/async/async-impl/src/test/java/org/apache/aries/async/impl/AsyncServiceTest.java
+++ b/async/async-impl/src/test/java/org/apache/aries/async/impl/AsyncServiceTest.java
@@ -32,7 +32,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import org.osgi.service.log.LogService;
import org.osgi.util.function.Predicate;
import org.osgi.util.promise.Promise;
diff --git a/jmx/jmx-core-whiteboard/pom.xml b/jmx/jmx-core-whiteboard/pom.xml
index 306b90017..c1e09b740 100644
--- a/jmx/jmx-core-whiteboard/pom.xml
+++ b/jmx/jmx-core-whiteboard/pom.xml
@@ -68,7 +68,7 @@
</aries.osgi.dynamic>
<lastReleaseVersion>1.1.1</lastReleaseVersion>
- <mockito-core.version>1.8.2</mockito-core.version>
+ <mockito-core.version>4.11.0</mockito-core.version>
<org.apache.aries.jmx.api.version>1.1.5</org.apache.aries.jmx.api.version>
<org.apache.aries.jmx.core.version>1.1.8</org.apache.aries.jmx.core.version>
<org.apache.aries.util.version>1.1.1</org.apache.aries.util.version>
diff --git a/jmx/jmx-core/pom.xml b/jmx/jmx-core/pom.xml
index 14ea734ce..30e80e050 100644
--- a/jmx/jmx-core/pom.xml
+++ b/jmx/jmx-core/pom.xml
@@ -78,7 +78,7 @@
<lastReleaseVersion>1.1.1</lastReleaseVersion>
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
- <mockito-core.version>1.8.2</mockito-core.version>
+ <mockito-core.version>4.11.0</mockito-core.version>
<org.apache.aries.jmx.api.version>1.1.5</org.apache.aries.jmx.api.version>
<org.apache.aries.util.version>1.1.1</org.apache.aries.util.version>
</properties>
diff --git a/jmx/jmx-core/src/test/java/org/apache/aries/jmx/cm/ConfigurationAdminTest.java b/jmx/jmx-core/src/test/java/org/apache/aries/jmx/cm/ConfigurationAdminTest.java
index 91cae3738..f2bcfcb41 100644
--- a/jmx/jmx-core/src/test/java/org/apache/aries/jmx/cm/ConfigurationAdminTest.java
+++ b/jmx/jmx-core/src/test/java/org/apache/aries/jmx/cm/ConfigurationAdminTest.java
@@ -19,8 +19,8 @@ package org.apache.aries.jmx.cm;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.verify;
@@ -36,6 +36,7 @@ import javax.management.openmbean.TabularDataSupport;
import org.apache.aries.jmx.codec.PropertyData;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
+import org.mockito.ArgumentMatchers;
import org.osgi.framework.Constants;
import org.osgi.service.cm.Configuration;
@@ -156,7 +157,7 @@ public class ConfigurationAdminTest {
String factoryPid = "org.apache.aries.jmx.factory.mock";
Configuration config = mock(Configuration.class);
- when(admin.getConfiguration(eq(factoryPid + "-1260133982371-0"), anyString())).thenReturn(config);
+ when(admin.getConfiguration(eq(factoryPid + "-1260133982371-0"), ArgumentMatchers.<String>any())).thenReturn(config);
when(config.getFactoryPid()).thenReturn(factoryPid);
ConfigurationAdmin mbean = new ConfigurationAdmin(admin);
@@ -176,7 +177,7 @@ public class ConfigurationAdminTest {
Dictionary<String, Object> props = new Hashtable<String, Object>();
props.put("one", "value");
props.put("two", 2);
- when(admin.getConfiguration(eq(pid), anyString())).thenReturn(config);
+ when(admin.getConfiguration(eq(pid), ArgumentMatchers.<String>any())).thenReturn(config);
when(config.getProperties()).thenReturn(props);
ConfigurationAdmin mbean = new ConfigurationAdmin(admin);
diff --git a/jmx/jmx-core/src/test/java/org/apache/aries/jmx/framework/BundleStateTest.java b/jmx/jmx-core/src/test/java/org/apache/aries/jmx/framework/BundleStateTest.java
index 547297a13..f5a39ec8e 100644
--- a/jmx/jmx-core/src/test/java/org/apache/aries/jmx/framework/BundleStateTest.java
+++ b/jmx/jmx-core/src/test/java/org/apache/aries/jmx/framework/BundleStateTest.java
@@ -43,6 +43,7 @@ import org.apache.aries.jmx.Logger;
import org.apache.aries.jmx.codec.BundleEventData;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
+import org.mockito.Mockito;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleEvent;
@@ -189,6 +190,7 @@ public class BundleStateTest {
BundleListener listener = argument.getValue();
assertNotNull(listener);
+ Mockito.reset(context);
ExecutorService dispatcher = bundleState.getEventDispatcher();
@@ -197,9 +199,7 @@ public class BundleStateTest {
bundleState.postRegister(true);
// check no more actions on BundleContext
- argument = ArgumentCaptor.forClass(BundleListener.class);
- verify(context, atMost(1)).addBundleListener(argument.capture());
- assertEquals(1, argument.getAllValues().size());
+ verify(context, never()).addBundleListener(argument.capture());
//do one unregister
bundleState.postDeregister();
diff --git a/jmx/jmx-core/src/test/java/org/apache/aries/jmx/framework/ServiceStateTest.java b/jmx/jmx-core/src/test/java/org/apache/aries/jmx/framework/ServiceStateTest.java
index a01a39aae..5e771eae0 100644
--- a/jmx/jmx-core/src/test/java/org/apache/aries/jmx/framework/ServiceStateTest.java
+++ b/jmx/jmx-core/src/test/java/org/apache/aries/jmx/framework/ServiceStateTest.java
@@ -49,6 +49,7 @@ import javax.management.openmbean.CompositeData;
import org.apache.aries.jmx.Logger;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
+import org.mockito.Mockito;
import org.osgi.framework.AllServiceListener;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
@@ -204,6 +205,7 @@ public class ServiceStateTest {
AllServiceListener serviceListener = argument.getValue();
assertNotNull(serviceListener);
+ Mockito.reset(context);
ExecutorService dispatcher = serviceState.getEventDispatcher();
@@ -212,9 +214,7 @@ public class ServiceStateTest {
serviceState.postRegister(true);
// check no more actions on BundleContext
- argument = ArgumentCaptor.forClass(AllServiceListener.class);
- verify(context, atMost(1)).addServiceListener(argument.capture());
- assertEquals(1, argument.getAllValues().size());
+ verify(context, never()).addServiceListener(argument.capture());
//do one unregister
serviceState.postDeregister();
diff --git a/jmx/jmx-core/src/test/java/org/apache/aries/jmx/provisioning/ProvisioningServiceTest.java b/jmx/jmx-core/src/test/java/org/apache/aries/jmx/provisioning/ProvisioningServiceTest.java
index a882a9447..b9c65f2af 100644
--- a/jmx/jmx-core/src/test/java/org/apache/aries/jmx/provisioning/ProvisioningServiceTest.java
+++ b/jmx/jmx-core/src/test/java/org/apache/aries/jmx/provisioning/ProvisioningServiceTest.java
@@ -19,7 +19,7 @@ package org.apache.aries.jmx.provisioning;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
diff --git a/jmx/jmx-core/src/test/java/org/apache/aries/jmx/util/FrameworkUtilsTest.java b/jmx/jmx-core/src/test/java/org/apache/aries/jmx/util/FrameworkUtilsTest.java
index 7823bc3ab..253a063e5 100644
--- a/jmx/jmx-core/src/test/java/org/apache/aries/jmx/util/FrameworkUtilsTest.java
+++ b/jmx/jmx-core/src/test/java/org/apache/aries/jmx/util/FrameworkUtilsTest.java
@@ -31,7 +31,6 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -41,6 +40,7 @@ import java.util.Hashtable;
import java.util.Set;
import org.junit.Test;
+import org.mockito.ArgumentMatchers;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
@@ -79,7 +79,7 @@ public class FrameworkUtilsTest {
BundleContext context = mock(BundleContext.class);
ServiceReference reference = mock(ServiceReference.class);
- when(context.getAllServiceReferences(anyString(), anyString())).thenReturn(new ServiceReference[] { reference });
+ when(context.getAllServiceReferences(ArgumentMatchers.<String>any(), ArgumentMatchers.<String>any())).thenReturn(new ServiceReference[] { reference });
ServiceReference result = resolveService(context, 998);
assertNotNull(result);
diff --git a/jmx/jmx-whiteboard/pom.xml b/jmx/jmx-whiteboard/pom.xml
index a49ab2abf..d1a7e7614 100644
--- a/jmx/jmx-whiteboard/pom.xml
+++ b/jmx/jmx-whiteboard/pom.xml
@@ -83,7 +83,7 @@
<exam.version>3.4.0</exam.version>
<javax.inject.version>1</javax.inject.version>
<maven-antrun-plugin.version>1.3</maven-antrun-plugin.version>
- <mockito-core.version>1.10.19</mockito-core.version>
+ <mockito-core.version>4.11.0</mockito-core.version>
<org.apache.aries.jmx.core.version>1.1.8</org.apache.aries.jmx.core.version>
<org.eclipse.osgi.version>3.11.3</org.eclipse.osgi.version>
<tinybundles.version>2.0.0</tinybundles.version>
diff --git a/pushstream/pom.xml b/pushstream/pom.xml
index 21ee5dcdc..7722e1b2e 100644
--- a/pushstream/pom.xml
+++ b/pushstream/pom.xml
@@ -48,7 +48,7 @@
<bnd-maven-plugin.version>3.2.0</bnd-maven-plugin.version>
<junit.version>4.13.2</junit.version>
- <mockito-core.version>1.9.5</mockito-core.version>
+ <mockito-core.version>4.11.0</mockito-core.version>
<org.apache.aries.async.promise.api.version>1.0.1</org.apache.aries.async.promise.api.version>
<osgi.annotation.version>6.0.1</osgi.annotation.version>
<slf4j-api.version>1.7.0</slf4j-api.version>
diff --git a/spi-fly/spi-fly-itests/test.bndrun b/spi-fly/spi-fly-itests/test.bndrun
index 669c1296b..1df076e96 100644
--- a/spi-fly/spi-fly-itests/test.bndrun
+++ b/spi-fly/spi-fly-itests/test.bndrun
@@ -51,7 +51,7 @@
bnd.identity;id='junit-platform-launcher'
-runbundles: \
- assertj-core;version='[3.27.2,3.27.3)',\
+ assertj-core;version='[3.27.3,3.27.4)',\
junit-jupiter-api;version='[5.11.4,5.11.5)',\
junit-jupiter-engine;version='[5.11.4,5.11.5)',\
junit-jupiter-params;version='[5.11.4,5.11.5)',\
(aries) 01/02: [MAINTENANCE] Use mockito-core instead of mockito-all
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
alien11689 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/aries.git
commit 601ca33766cc12f308ee0b418af113e3005a0499
Author: Dominik Przybysz <al...@gmail.com>
AuthorDate: Thu Jan 23 18:49:00 2025 +0100
[MAINTENANCE] Use mockito-core instead of mockito-all
---
async/async-impl/pom.xml | 6 +++---
jmx/jmx-core-whiteboard/pom.xml | 6 +++---
jmx/jmx-core/pom.xml | 6 +++---
jmx/jmx-whiteboard/pom.xml | 6 +++---
pushstream/pom.xml | 6 +++---
5 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/async/async-impl/pom.xml b/async/async-impl/pom.xml
index 5c3c275d1..8a08be501 100644
--- a/async/async-impl/pom.xml
+++ b/async/async-impl/pom.xml
@@ -60,7 +60,7 @@
<lastReleaseVersion>1.0.1</lastReleaseVersion>
<cglib-nodep.version>3.2.4</cglib-nodep.version>
- <mockito-all.version>1.9.5</mockito-all.version>
+ <mockito-core.version>1.9.5</mockito-core.version>
<org.apache.aries.async.api.version>1.0.2-SNAPSHOT</org.apache.aries.async.api.version>
<org.apache.aries.async.promise.api.version>1.1.0-SNAPSHOT</org.apache.aries.async.promise.api.version>
<org.osgi.service.log.version>1.5.0</org.osgi.service.log.version>
@@ -113,8 +113,8 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>${mockito-all.version}</version>
+ <artifactId>mockito-core</artifactId>
+ <version>${mockito-core.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/jmx/jmx-core-whiteboard/pom.xml b/jmx/jmx-core-whiteboard/pom.xml
index d12bacc42..306b90017 100644
--- a/jmx/jmx-core-whiteboard/pom.xml
+++ b/jmx/jmx-core-whiteboard/pom.xml
@@ -68,7 +68,7 @@
</aries.osgi.dynamic>
<lastReleaseVersion>1.1.1</lastReleaseVersion>
- <mockito-all.version>1.8.2</mockito-all.version>
+ <mockito-core.version>1.8.2</mockito-core.version>
<org.apache.aries.jmx.api.version>1.1.5</org.apache.aries.jmx.api.version>
<org.apache.aries.jmx.core.version>1.1.8</org.apache.aries.jmx.core.version>
<org.apache.aries.util.version>1.1.1</org.apache.aries.util.version>
@@ -102,9 +102,9 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
- <version>${mockito-all.version}</version>
+ <version>${mockito-core.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/jmx/jmx-core/pom.xml b/jmx/jmx-core/pom.xml
index 58d605404..14ea734ce 100644
--- a/jmx/jmx-core/pom.xml
+++ b/jmx/jmx-core/pom.xml
@@ -78,7 +78,7 @@
<lastReleaseVersion>1.1.1</lastReleaseVersion>
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
- <mockito-all.version>1.8.2</mockito-all.version>
+ <mockito-core.version>1.8.2</mockito-core.version>
<org.apache.aries.jmx.api.version>1.1.5</org.apache.aries.jmx.api.version>
<org.apache.aries.util.version>1.1.1</org.apache.aries.util.version>
</properties>
@@ -106,9 +106,9 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
- <version>${mockito-all.version}</version>
+ <version>${mockito-core.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/jmx/jmx-whiteboard/pom.xml b/jmx/jmx-whiteboard/pom.xml
index 4fab9100e..a49ab2abf 100644
--- a/jmx/jmx-whiteboard/pom.xml
+++ b/jmx/jmx-whiteboard/pom.xml
@@ -83,7 +83,7 @@
<exam.version>3.4.0</exam.version>
<javax.inject.version>1</javax.inject.version>
<maven-antrun-plugin.version>1.3</maven-antrun-plugin.version>
- <mockito-all.version>1.10.19</mockito-all.version>
+ <mockito-core.version>1.10.19</mockito-core.version>
<org.apache.aries.jmx.core.version>1.1.8</org.apache.aries.jmx.core.version>
<org.eclipse.osgi.version>3.11.3</org.eclipse.osgi.version>
<tinybundles.version>2.0.0</tinybundles.version>
@@ -157,9 +157,9 @@
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
- <version>${mockito-all.version}</version>
+ <version>${mockito-core.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/pushstream/pom.xml b/pushstream/pom.xml
index 4b7d42020..21ee5dcdc 100644
--- a/pushstream/pom.xml
+++ b/pushstream/pom.xml
@@ -48,7 +48,7 @@
<bnd-maven-plugin.version>3.2.0</bnd-maven-plugin.version>
<junit.version>4.13.2</junit.version>
- <mockito-all.version>1.9.5</mockito-all.version>
+ <mockito-core.version>1.9.5</mockito-core.version>
<org.apache.aries.async.promise.api.version>1.0.1</org.apache.aries.async.promise.api.version>
<osgi.annotation.version>6.0.1</osgi.annotation.version>
<slf4j-api.version>1.7.0</slf4j-api.version>
@@ -80,8 +80,8 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>${mockito-all.version}</version>
+ <artifactId>mockito-core</artifactId>
+ <version>${mockito-core.version}</version>
<scope>test</scope>
</dependency>
</dependencies>