You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by pa...@apache.org on 2017/11/13 14:14:36 UTC
[sling-whiteboard] branch master updated: Update the example to
work with the latest changes in the mvn url vs id parsing.
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git
The following commit(s) were added to refs/heads/master by this push:
new c624fc5 Update the example to work with the latest changes in the mvn url vs id parsing.
c624fc5 is described below
commit c624fc5a38fafd9e9ed4ef30608c72b0655ed20b
Author: Karl Pauls <kp...@adobe.com>
AuthorDate: Mon Nov 13 15:14:29 2017 +0100
Update the example to work with the latest changes in the mvn url vs id parsing.
---
featuremodel/example/sling/boot.json | 2 +-
featuremodel/example/sling/launchpad.json | 2 +-
.../java/org/apache/sling/feature/applicationbuilder/impl/Main.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/featuremodel/example/sling/boot.json b/featuremodel/example/sling/boot.json
index 6af3979..d319d51 100644
--- a/featuremodel/example/sling/boot.json
+++ b/featuremodel/example/sling/boot.json
@@ -1 +1 @@
-{"id":"generated/:boot/1.0.0","bundles":{"1":["org.apache.aries/org.apache.aries.util/1.1.3","org.apache.felix/org.apache.felix.configadmin/1.9.0-SNAPSHOT","org.apache.felix/org.apache.felix.eventadmin/1.4.10","org.apache.geronimo.specs/geronimo-atinject_1.0_spec/1.0","org.apache.sling/org.apache.sling.commons.log/5.0.2","org.apache.sling/org.apache.sling.commons.logservice/1.0.6","org.apache.sling/org.apache.sling.fragment.transaction/1.0.0","org.apache.sling/org.apache.sling.fragment.w [...]
+{"id":"generated/boot/1.0.0","bundles":{"1":["org.apache.aries/org.apache.aries.util/1.1.3","org.apache.felix/org.apache.felix.configadmin/1.9.0-SNAPSHOT","org.apache.felix/org.apache.felix.eventadmin/1.4.10","org.apache.geronimo.specs/geronimo-atinject_1.0_spec/1.0","org.apache.sling/org.apache.sling.commons.log/5.0.2","org.apache.sling/org.apache.sling.commons.logservice/1.0.6","org.apache.sling/org.apache.sling.fragment.transaction/1.0.0","org.apache.sling/org.apache.sling.fragment.ws [...]
diff --git a/featuremodel/example/sling/launchpad.json b/featuremodel/example/sling/launchpad.json
index 7bd778b..a6e2f5f 100644
--- a/featuremodel/example/sling/launchpad.json
+++ b/featuremodel/example/sling/launchpad.json
@@ -1 +1 @@
-{"id":"generated/:launchpad/1.0.0","framework-properties":{"localIndexDir":"${sling.home}/repository/index","repository.home":"${sling.home}/repository","sling.run.mode.install.options":"oak_tar,oak_mongo"}}
\ No newline at end of file
+{"id":"generated/launchpad/1.0.0","framework-properties":{"localIndexDir":"${sling.home}/repository/index","repository.home":"${sling.home}/repository","sling.run.mode.install.options":"oak_tar,oak_mongo"}}
diff --git a/featuremodel/feature-applicationbuilder/src/main/java/org/apache/sling/feature/applicationbuilder/impl/Main.java b/featuremodel/feature-applicationbuilder/src/main/java/org/apache/sling/feature/applicationbuilder/impl/Main.java
index 80c609d..232c99b 100644
--- a/featuremodel/feature-applicationbuilder/src/main/java/org/apache/sling/feature/applicationbuilder/impl/Main.java
+++ b/featuremodel/feature-applicationbuilder/src/main/java/org/apache/sling/feature/applicationbuilder/impl/Main.java
@@ -188,7 +188,7 @@ public class Main {
}
private static Application buildApplication(final Application app) {
- app.getBundles().add(1, new org.apache.sling.feature.Artifact(ArtifactId.fromMvnId("org.apache.sling/org.apache.sling.launchpad.api/1.2.0")));
+ app.getBundles().add(1, new org.apache.sling.feature.Artifact(ArtifactId.parse("org.apache.sling/org.apache.sling.launchpad.api/1.2.0")));
// sling.properties (TODO)
if ( propsFile == null ) {
app.getFrameworkProperties().put("org.osgi.framework.bootdelegation", "sun.*,com.sun.*");
--
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].