You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by da...@apache.org on 2018/06/07 14:53:15 UTC
[sling-org-apache-sling-feature-applicationbuilder] branch master
updated: Add -r option to enable resolver during application building
This is an automated email from the ASF dual-hosted git repository.
davidb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-applicationbuilder.git
The following commit(s) were added to refs/heads/master by this push:
new 7096edf Add -r option to enable resolver during application building
7096edf is described below
commit 7096edfee32d67307f92c6e8a369c2b16dfb7df2
Author: David Bosschaert <bo...@adobe.com>
AuthorDate: Thu Jun 7 15:52:42 2018 +0100
Add -r option to enable resolver during application building
The resolver is disabled by default right now
---
pom.xml | 12 ++++++------
.../sling/feature/applicationbuilder/impl/Main.java | 15 +++++++++++++--
2 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index 48aa125..947150f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,11 +52,11 @@
<goal>unpack-dependencies</goal>
</goals>
<configuration>
- <excludes>META-INF/**</excludes>
+ <excludes>META-INF/MANIFEST.MF</excludes>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
- <includeArtifactIds>org.apache.felix.utils,commons-cli,org.apache.sling.feature,org.apache.sling.feature.io,org.apache.sling.commons.johnzon,slf4j-api,slf4j-simple,org.apache.felix.converter,org.osgi.service.resolver,org.apache.sling.feature.resolver</includeArtifactIds>
+ <includeArtifactIds>org.apache.felix.framework,org.apache.felix.utils,commons-cli,org.apache.sling.feature,org.apache.sling.feature.io,org.apache.sling.feature.analyser,org.apache.sling.commons.johnzon,slf4j-api,slf4j-simple,org.apache.felix.converter,org.osgi.service.resolver,org.apache.sling.feature.resolver,osgi.core</includeArtifactIds>
</configuration>
</execution>
</executions>
@@ -110,19 +110,19 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.feature</artifactId>
- <version>0.1.1-SNAPSHOT</version>
+ <version>0.1.3-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.feature.analyser</artifactId>
- <version>0.1.0-SNAPSHOT</version>
- <scope>test</scope>
+ <version>0.1.3-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.feature.io</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>0.1.3-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/src/main/java/org/apache/sling/feature/applicationbuilder/impl/Main.java b/src/main/java/org/apache/sling/feature/applicationbuilder/impl/Main.java
index d07be10..54ff177 100644
--- a/src/main/java/org/apache/sling/feature/applicationbuilder/impl/Main.java
+++ b/src/main/java/org/apache/sling/feature/applicationbuilder/impl/Main.java
@@ -54,6 +54,8 @@ public class Main {
private static String propsFile;
+ private static Boolean useResolver = false;
+
/**
* Parse the command line parameters and update a configuration object.
* @param args Command line parameters
@@ -66,7 +68,8 @@ public class Main {
final Option filesOption = new Option("f", true, "Set feature files (comma separated)");
final Option dirsOption = new Option("d", true, "Set feature file dirs (comma separated)");
final Option propsOption = new Option("p", true, "sling.properties file");
-
+ final Option useResolverOption = new Option("r", false, "If enabled uses the resolver");
+ useResolverOption.setArgs(0); // is this needed?
final Option outputOption = Option.builder("o").hasArg().argName("Set output file")
.desc("output file").build();
@@ -77,6 +80,7 @@ public class Main {
options.addOption(dirsOption);
options.addOption(outputOption);
options.addOption(propsOption);
+ options.addOption(useResolverOption);
final CommandLineParser parser = new DefaultParser();
try {
@@ -97,6 +101,9 @@ public class Main {
if ( cl.hasOption(propsOption.getOpt()) ) {
propsFile = cl.getOptionValue(propsOption.getOpt());
}
+ if ( cl.hasOption(useResolverOption.getOpt()) ) {
+ useResolver = true;
+ }
} catch ( final ParseException pe) {
LOGGER.error("Unable to parse command line: {}", pe.getMessage(), pe);
System.exit(1);
@@ -123,7 +130,11 @@ public class Main {
}
private static FeatureResolver getFeatureResolver(ArtifactManager am) {
- return new FrameworkResolver(am, Collections.emptyMap());
+ if (useResolver) {
+ return new FrameworkResolver(am, Collections.emptyMap());
+ } else {
+ return null;
+ }
}
public static void main(final String[] args) {
--
To stop receiving notification emails like this one, please contact
davidb@apache.org.