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-bnd-models.git
The following commit(s) were added to refs/heads/master by this push:
new 8033ca4 SLING-12099 update to sling-parent 52 update to latest
mockito version
8033ca4 is described below
commit 8033ca4c5b8bcf425b50cf012e672a80bfb7cf7e
Author: Stefan Seifert <[email protected]>
AuthorDate: Sun Oct 15 09:48:03 2023 +0200
SLING-12099 update to sling-parent 52
update to latest mockito version
---
pom.xml | 9 +++++++--
.../apache/sling/bnd/models/AbstractModelsScannerPluginTest.java | 2 +-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index d064863..e1b9753 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>30</version>
+ <version>52</version>
<relativePath />
</parent>
@@ -39,10 +39,15 @@
<url>https://github.com/apache/sling-org-apache-sling-bnd-models.git</url>
</scm>
+ <properties>
+ <bnd.version>4.0.0</bnd.version>
+ </properties>
+
<dependencies>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.bndlib</artifactId>
+ <version>${bnd.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -64,7 +69,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>2.2.15</version>
+ <version>5.6.0</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/src/test/java/org/apache/sling/bnd/models/AbstractModelsScannerPluginTest.java
b/src/test/java/org/apache/sling/bnd/models/AbstractModelsScannerPluginTest.java
index ab1db08..901e6b0 100644
---
a/src/test/java/org/apache/sling/bnd/models/AbstractModelsScannerPluginTest.java
+++
b/src/test/java/org/apache/sling/bnd/models/AbstractModelsScannerPluginTest.java
@@ -35,7 +35,7 @@ import org.apache.commons.lang3.StringUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import aQute.bnd.osgi.Builder;
import aQute.bnd.osgi.Jar;