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-installer-factory-deploymentpackage.git
commit 8bfd6dab8b81df407b727567279f6483d5a99523 Author: Carsten Ziegeler <[email protected]> AuthorDate: Wed Dec 21 09:25:35 2011 +0000 Use new versioning feature git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1221657 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- .../factories/deploypck/impl/DeploymentPackageInstaller.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 3f5709f..b2a10b7 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.installer.core</artifactId> - <version>3.1.2</version> + <version>3.2.3-SNAPSHOT</version> <scope>provided</scope> </dependency> </dependencies> diff --git a/src/main/java/org/apache/sling/installer/factories/deploypck/impl/DeploymentPackageInstaller.java b/src/main/java/org/apache/sling/installer/factories/deploypck/impl/DeploymentPackageInstaller.java index 934b18f..fee1b96 100644 --- a/src/main/java/org/apache/sling/installer/factories/deploypck/impl/DeploymentPackageInstaller.java +++ b/src/main/java/org/apache/sling/installer/factories/deploypck/impl/DeploymentPackageInstaller.java @@ -32,6 +32,7 @@ import org.apache.sling.installer.api.tasks.RegisteredResource; import org.apache.sling.installer.api.tasks.ResourceTransformer; import org.apache.sling.installer.api.tasks.TaskResourceGroup; import org.apache.sling.installer.api.tasks.TransformationResult; +import org.osgi.framework.Version; import org.osgi.service.deploymentadmin.DeploymentAdmin; /** @@ -67,10 +68,10 @@ public class DeploymentPackageInstaller if (v != null) { final Map<String, Object> attr = new HashMap<String, Object>(); attr.put(DEPLOYMENTPACKAGE_SYMBOLICMAME, sn); - attr.put(DEPLOYMENTPACKAGE_VERSION, v.toString()); final TransformationResult tr = new TransformationResult(); tr.setId(sn); + tr.setVersion(new Version(v)); tr.setResourceType(TYPE_DP); tr.setAttributes(attr); @@ -105,12 +106,12 @@ public class DeploymentPackageInstaller if (jis != null) { try { jis.close(); - } catch (IOException ignore) { + } catch (final IOException ignore) { } } else { try { ins.close(); - } catch (IOException ignore) { + } catch (final IOException ignore) { } } } -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
