You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2022/06/23 09:37:28 UTC
[sling-org-apache-sling-commons-osgi] branch master updated: Use newest parent 48
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-osgi.git
The following commit(s) were added to refs/heads/master by this push:
new 2f786f5 Use newest parent 48
2f786f5 is described below
commit 2f786f579f9c4afcaa1ff34373e06c168801bbcd
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Thu Jun 23 11:37:22 2022 +0200
Use newest parent 48
Reference individual OSGi spec chapter dependencies
Fix scope of mockito
---
pom.xml | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 459ebf1..dc71a03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-bundle-parent</artifactId>
- <version>39</version>
+ <version>48</version>
<relativePath />
</parent>
@@ -84,25 +84,35 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.annotation.versioning</artifactId>
+ <scope>provided</scope>
</dependency>
<!-- OSGi Libraries -->
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
+ <artifactId>org.osgi.framework</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.tracker</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.event</artifactId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.jmock</groupId>
<artifactId>jmock-junit4</artifactId>
+ <version>2.12.0</version>
+ <scope>test</scope>
</dependency>
-
<dependency>
<!-- Not used by our code, but need a non-bundle jar for unit tests -->
<groupId>javax.jcr</groupId>
@@ -121,7 +131,7 @@
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.3.3</version>
- <scope>provided</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>