This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-tooling-support-install.git
commit 690c71e10473c1779d9e984f09da3d93a6a078cb Author: Carsten Ziegeler <[email protected]> AuthorDate: Wed Oct 4 14:41:35 2017 +0000 Move to latest parent pom and official OSGi annotations git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1811077 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 21 +++-------------- .../support/install/impl/InstallServlet.java | 26 +++++++++++----------- 2 files changed, 16 insertions(+), 31 deletions(-) diff --git a/pom.xml b/pom.xml index d708da6..fb80a6d 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.sling</groupId> <artifactId>sling</artifactId> - <version>26</version> + <version>32</version> </parent> <artifactId>org.apache.sling.tooling.support.install</artifactId> @@ -42,17 +42,10 @@ <plugins> <plugin> <groupId>org.apache.felix</groupId> - <artifactId>maven-scr-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> <extensions>true</extensions> <configuration> <instructions> - <Private-Package> - org.apache.sling.tooling.support.install.impl - </Private-Package> <Embed-Dependency> org.apache.felix.utils;inline=org/apache/felix/utils/json/JSONWriter.class </Embed-Dependency> @@ -64,24 +57,16 @@ <dependencies> <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.scr.annotations</artifactId> - </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </dependency> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> + <artifactId>javax.servlet-api</artifactId> </dependency> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> + <artifactId>osgi.core</artifactId> </dependency> <dependency> <groupId>commons-io</groupId> diff --git a/src/main/java/org/apache/sling/tooling/support/install/impl/InstallServlet.java b/src/main/java/org/apache/sling/tooling/support/install/impl/InstallServlet.java index 8eee97d..9501f9a 100644 --- a/src/main/java/org/apache/sling/tooling/support/install/impl/InstallServlet.java +++ b/src/main/java/org/apache/sling/tooling/support/install/impl/InstallServlet.java @@ -37,30 +37,30 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.felix.scr.annotations.Activate; -import org.apache.felix.scr.annotations.Component; -import org.apache.felix.scr.annotations.Property; -import org.apache.felix.scr.annotations.Reference; -import org.apache.felix.scr.annotations.Service; +import org.apache.commons.fileupload.FileItem; +import org.apache.commons.fileupload.FileUploadException; +import org.apache.commons.fileupload.disk.DiskFileItemFactory; +import org.apache.commons.fileupload.servlet.ServletFileUpload; +import org.apache.commons.io.IOUtils; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.BundleException; import org.osgi.framework.Constants; +import org.osgi.service.component.annotations.Activate; +import org.osgi.service.component.annotations.Component; +import org.osgi.service.component.annotations.Reference; import org.osgi.service.packageadmin.PackageAdmin; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.commons.fileupload.FileItem; -import org.apache.commons.fileupload.FileUploadException; -import org.apache.commons.fileupload.disk.DiskFileItemFactory; -import org.apache.commons.fileupload.servlet.ServletFileUpload; -import org.apache.commons.io.IOUtils; /** * Prototype for installing/updating a bundle from a directory */ -@Component -@Service(value = Servlet.class) -@Property(name="alias", value="/system/sling/tooling/install") +@Component(service = Servlet.class, + property = { + Constants.SERVICE_VENDOR + "=The Apache Software Foundation", + "alias=/system/sling/tooling/install" + }) public class InstallServlet extends HttpServlet { private static final long serialVersionUID = -8820366266126231409L; -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
