[sling-org-apache-sling-distribution-core] branch master updated: SLING-8595 - Update of parent to make this module better compatible to upstream modules

[cs...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

cschneider pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git


The following commit(s) were added to refs/heads/master by this push:
     new a185019  SLING-8595 - Update of parent to make this module better compatible to upstream modules
a185019 is described below

commit a1850193d63ddedced4ad982df18a62345cdf41b
Author: Christian Schneider <cs...@adobe.com>
AuthorDate: Wed Jul 24 08:39:39 2019 +0200

    SLING-8595 - Update of parent to make this module better compatible to upstream modules
---
 pom.xml                                                     | 13 ++++++++++++-
 .../event/impl/DefaultDistributionEventFactory.java         |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 32f1b64..b0eaab0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>26</version>
+        <version>28</version>
     </parent>
 
     <!-- ======================================================================= -->
@@ -149,6 +149,16 @@
     <!-- D E P E N D E N C I E S                                                 -->
     <!-- ======================================================================= -->
     <dependencies>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>osgi.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>osgi.cmpn</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <!-- need it here as to avoid classpath conflicts with testing mock -->
         <dependency>
             <groupId>org.apache.sling</groupId>
@@ -282,6 +292,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
+            <version>2.4</version>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
diff --git a/src/main/java/org/apache/sling/distribution/event/impl/DefaultDistributionEventFactory.java b/src/main/java/org/apache/sling/distribution/event/impl/DefaultDistributionEventFactory.java
index be02716..695ee73 100644
--- a/src/main/java/org/apache/sling/distribution/event/impl/DefaultDistributionEventFactory.java
+++ b/src/main/java/org/apache/sling/distribution/event/impl/DefaultDistributionEventFactory.java
@@ -44,7 +44,7 @@ public class DefaultDistributionEventFactory implements DistributionEventFactory
     @Reference
     private EventAdmin eventAdmin;
 
-    private void generateEvent(@NotNull String distributionEventTopic, @NotNull Dictionary<?, ?> properties) {
+    private void generateEvent(@NotNull String distributionEventTopic, @NotNull Dictionary<String, ?> properties) {
         eventAdmin.postEvent(new Event(distributionEventTopic, properties));
         log.debug("distribution event {} posted", distributionEventTopic);
     }