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-testing-osgi-mock.git
The following commit(s) were added to refs/heads/master by this push:
new 2ff8736 SLING-12208 Update Dependencies to 2023 (#39)
2ff8736 is described below
commit 2ff8736b466ef13c449adb0bb3df125cd9430e63
Author: Stefan Seifert <[email protected]>
AuthorDate: Thu Dec 21 12:10:20 2023 +0100
SLING-12208 Update Dependencies to 2023 (#39)
---
core/pom.xml | 6 +++---
.../main/java/org/apache/sling/testing/mock/osgi/MockBundle.java | 2 +-
.../java/org/apache/sling/testing/mock/osgi/OsgiServiceUtil.java | 2 +-
.../mock/osgi/config/AbstractConfigTypeReflectionProvider.java | 2 +-
.../apache/sling/testing/mock/osgi/config/ConfigTypeContext.java | 2 +-
.../org/apache/sling/testing/mock/osgi/ManifestScannerTest.java | 2 +-
parent/pom.xml | 8 ++++----
7 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 7c699f9..0590d92 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -125,7 +125,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>5.6.10</version>
+ <version>6.0.2</version>
<scope>compile</scope>
</dependency>
@@ -133,7 +133,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr</artifactId>
- <version>2.1.8</version>
+ <version>2.1.20</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -250,7 +250,7 @@
<filter>
<artifact>org.apache.felix:org.apache.felix.scr</artifact>
<includes>
-
<include>org/apache/felix/scr/impl/inject/Annotations*</include>
+
<include>org/apache/felix/scr/impl/inject/internal/Annotations*</include>
<include>org/apache/felix/scr/impl/helper/Coercions*</include>
</includes>
</filter>
diff --git
a/core/src/main/java/org/apache/sling/testing/mock/osgi/MockBundle.java
b/core/src/main/java/org/apache/sling/testing/mock/osgi/MockBundle.java
index 839ad16..4397c22 100644
--- a/core/src/main/java/org/apache/sling/testing/mock/osgi/MockBundle.java
+++ b/core/src/main/java/org/apache/sling/testing/mock/osgi/MockBundle.java
@@ -210,7 +210,7 @@ public final class MockBundle implements Bundle {
/**
* This is primarily used within the context of unit testing by
- * {@link org.apache.felix.scr.impl.inject.Annotations#toObject(Class,
Map, Bundle, boolean)} for injection of
+ * {@link
org.apache.felix.scr.impl.inject.internal.Annotations#toObject(Class, Map,
Bundle, boolean)} for injection of
* {@code Class}-typed OSGi config attributes for default values and
String properties representing FQDNs.
*
* @param name The name of the class to load.
diff --git
a/core/src/main/java/org/apache/sling/testing/mock/osgi/OsgiServiceUtil.java
b/core/src/main/java/org/apache/sling/testing/mock/osgi/OsgiServiceUtil.java
index f4d91a1..5913537 100644
--- a/core/src/main/java/org/apache/sling/testing/mock/osgi/OsgiServiceUtil.java
+++ b/core/src/main/java/org/apache/sling/testing/mock/osgi/OsgiServiceUtil.java
@@ -40,7 +40,7 @@ import java.util.function.Predicate;
import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils;
-import org.apache.felix.scr.impl.inject.Annotations;
+import org.apache.felix.scr.impl.inject.internal.Annotations;
import org.apache.sling.testing.mock.osgi.OsgiMetadataUtil.DynamicReference;
import org.apache.sling.testing.mock.osgi.OsgiMetadataUtil.FieldCollectionType;
import org.apache.sling.testing.mock.osgi.OsgiMetadataUtil.OsgiMetadata;
diff --git
a/core/src/main/java/org/apache/sling/testing/mock/osgi/config/AbstractConfigTypeReflectionProvider.java
b/core/src/main/java/org/apache/sling/testing/mock/osgi/config/AbstractConfigTypeReflectionProvider.java
index c126597..40fb35c 100644
---
a/core/src/main/java/org/apache/sling/testing/mock/osgi/config/AbstractConfigTypeReflectionProvider.java
+++
b/core/src/main/java/org/apache/sling/testing/mock/osgi/config/AbstractConfigTypeReflectionProvider.java
@@ -29,7 +29,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.stream.Stream;
-import org.apache.felix.scr.impl.inject.Annotations;
+import org.apache.felix.scr.impl.inject.internal.Annotations;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ProviderType;
diff --git
a/core/src/main/java/org/apache/sling/testing/mock/osgi/config/ConfigTypeContext.java
b/core/src/main/java/org/apache/sling/testing/mock/osgi/config/ConfigTypeContext.java
index 32d135c..2649d31 100644
---
a/core/src/main/java/org/apache/sling/testing/mock/osgi/config/ConfigTypeContext.java
+++
b/core/src/main/java/org/apache/sling/testing/mock/osgi/config/ConfigTypeContext.java
@@ -24,7 +24,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
-import org.apache.felix.scr.impl.inject.Annotations;
+import org.apache.felix.scr.impl.inject.internal.Annotations;
import org.apache.sling.testing.mock.osgi.MapUtil;
import org.apache.sling.testing.mock.osgi.config.annotations.ConfigType;
import org.apache.sling.testing.mock.osgi.config.annotations.SetConfig;
diff --git
a/core/src/test/java/org/apache/sling/testing/mock/osgi/ManifestScannerTest.java
b/core/src/test/java/org/apache/sling/testing/mock/osgi/ManifestScannerTest.java
index 8a536c5..9f2fa65 100644
---
a/core/src/test/java/org/apache/sling/testing/mock/osgi/ManifestScannerTest.java
+++
b/core/src/test/java/org/apache/sling/testing/mock/osgi/ManifestScannerTest.java
@@ -33,7 +33,7 @@ public class ManifestScannerTest {
@Test
public void testGetValues() {
Collection<String> bundleSymbolicNames =
ManifestScanner.getValues(Constants.BUNDLE_SYMBOLICNAME);
- assertTrue(bundleSymbolicNames.contains("org.apache.commons.io"));
+
assertTrue(bundleSymbolicNames.contains("org.apache.commons.commons-io"));
Collection<String> includeResource =
ManifestScanner.getValues("Include-Resource");
assertTrue(includeResource.contains("META-INF/LICENSE.txt=LICENSE.txt"));
diff --git a/parent/pom.xml b/parent/pom.xml
index 9509660..e14e83a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -97,7 +97,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
- <version>4.2</version>
+ <version>4.4</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -107,18 +107,18 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.6</version>
+ <version>2.11.0</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>5.7.0</version>
+ <version>5.8.0</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
- <version>5.7.0</version>
+ <version>5.8.0</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
