You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by tm...@apache.org on 2020/04/07 12:51:15 UTC
[sling-org-apache-sling-distribution-journal] 05/06: Revert
"SLING-9321 - Update to declarative services 1.4"
This is an automated email from the ASF dual-hosted git repository.
tmaret pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-journal.git
commit 16995f030de504e3687f74416febe31b4a5f394e
Author: tmaret <tm...@adobe.com>
AuthorDate: Tue Apr 7 14:41:03 2020 +0200
Revert "SLING-9321 - Update to declarative services 1.4"
This reverts commit eef9d66b
---
pom.xml | 21 ++++-----------------
1 file changed, 4 insertions(+), 17 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0e02ac2..84f2ea4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-bundle-parent</artifactId>
- <version>38</version>
+ <version>35</version>
<relativePath />
</parent>
@@ -151,19 +151,12 @@
<!-- OSGi -->
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.component</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.component.annotations</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.metatype.annotations</artifactId>
+ <artifactId>osgi.core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
@@ -200,12 +193,6 @@
<artifactId>org.apache.sling.testing.sling-mock-oak</artifactId>
<version>2.0.2</version>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>