You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 09:52:24 UTC
[sling-org-apache-sling-launchpad-installer] 02/10: SLING-1900 -
use org.apache.sling.installer.core instead of obsolete
org.apache.sling.osgi.installer
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.launchpad.installer-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-installer.git
commit 0da39a1d8e749c654885ac9cc05a7e6c22de580c
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Thu Dec 23 16:07:05 2010 +0000
SLING-1900 - use org.apache.sling.installer.core instead of obsolete org.apache.sling.osgi.installer
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/launchpad/installer@1052306 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 6 +++---
.../sling/launchpad/installer/impl/LaunchpadConfigInstaller.java | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3acf186..ed26bd4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,8 +70,8 @@
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.osgi.installer</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <artifactId>org.apache.sling.installer.core</artifactId>
+ <version>3.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -93,4 +93,4 @@
<scope>provided</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/src/main/java/org/apache/sling/launchpad/installer/impl/LaunchpadConfigInstaller.java b/src/main/java/org/apache/sling/launchpad/installer/impl/LaunchpadConfigInstaller.java
index 4b1d45a..c4ad12e 100644
--- a/src/main/java/org/apache/sling/launchpad/installer/impl/LaunchpadConfigInstaller.java
+++ b/src/main/java/org/apache/sling/launchpad/installer/impl/LaunchpadConfigInstaller.java
@@ -24,8 +24,8 @@ import java.util.Iterator;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Reference;
import org.apache.sling.launchpad.api.LaunchpadContentProvider;
-import org.apache.sling.osgi.installer.InstallableResource;
-import org.apache.sling.osgi.installer.OsgiInstaller;
+import org.apache.sling.installer.api.InstallableResource;
+import org.apache.sling.installer.api.OsgiInstaller;
import org.osgi.service.component.ComponentContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -63,6 +63,6 @@ public class LaunchpadConfigInstaller {
}
- installer.registerResources("launchpad", installables);
+ installer.registerResources("launchpad", (InstallableResource[])installables.toArray());
}
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.