Adjustments for the first release
diff --git a/Readme.md b/Readme.md
index e837d77..31e1ef5 100644
--- a/Readme.md
+++ b/Readme.md
@@ -6,7 +6,7 @@
## Build
-This plugin is built like usual with:
+This plugin is built as usual with:
```
mvn clean install
```
diff --git a/pom.xml b/pom.xml
index a415e37..e85bfdc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>35</version>
+ <version>38</version>
<relativePath />
</parent>
@@ -32,16 +32,19 @@
<url>https://sling.apache.org/components/sling-kickstart-maven-plugin/</url>
<properties>
- <maven.version>3.0.5</maven.version>
<maven.site.path>${project.artifactId}-archives/${project.artifactId}-LATEST</maven.site.path>
+
+ <maven.version>3.5.0</maven.version>
<sling.java.version>8</sling.java.version>
- <org.apache.sling.feature.extension.content.version>1.0.4</org.apache.sling.feature.extension.content.version>
- <org.apache.sling.feature.launcher.version>1.1.0</org.apache.sling.feature.launcher.version>
- <org.apache.sling.feature.io.version>1.1.0</org.apache.sling.feature.io.version>
- <org.apache.felix.converter.version>1.0.8</org.apache.felix.converter.version>
- <org.apache.sling.feature.version>1.1.0</org.apache.sling.feature.version>
- <org.apache.sling.feature.analyser.version>1.1.0</org.apache.sling.feature.analyser.version>
- <org.apache.sling.feature.modelconverter.version>1.0.8</org.apache.sling.feature.modelconverter.version>
+ <maven-plugin-annotations.version>3.4</maven-plugin-annotations.version>
+ <plexus-interactivity-api.version>1.0</plexus-interactivity-api.version>
+ <commons-io.version>2.4</commons-io.version>
+ <maven-shared-utils.version>3.2.1</maven-shared-utils.version>
+ <plexus-component-metadata.version>1.7.1</plexus-component-metadata.version>
+
+ <!-- Plugins -->
+ <maven-surefire-plugin.version>2.20.1</maven-surefire-plugin.version>
+ <maven-failsafe-plugin.version>2.20.1</maven-failsafe-plugin.version>
</properties>
<scm>
@@ -77,7 +80,7 @@
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
- <version>1.7.1</version>
+ <version>${plexus-component-metadata.version}</version>
<executions>
<execution>
<id>generate-metadata</id>
@@ -130,12 +133,12 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<!-- for https://issues.apache.org/jira/browse/SUREFIRE-1067 -->
- <version>2.20.1</version>
+ <version>${maven-surefire-plugin.version}</version>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<!-- for https://issues.apache.org/jira/browse/SUREFIRE-855 -->
- <version>2.20.1</version>
+ <version>${maven-failsafe-plugin.version}</version>
<executions>
<execution>
<goals>
@@ -154,31 +157,6 @@
</build>
<dependencies>
-<!-- <dependency>-->
-<!-- <groupId>org.apache.sling</groupId>-->
-<!-- <artifactId>org.apache.sling.provisioning.model</artifactId>-->
-<!-- <version>1.8.4</version>-->
-<!-- </dependency>-->
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.feature</artifactId>
- <version>${org.apache.sling.feature.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.feature.analyser</artifactId>
- <version>${org.apache.sling.feature.analyser.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.feature.modelconverter</artifactId>
- <version>${org.apache.sling.feature.modelconverter.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.feature.io</artifactId>
- <version>${org.apache.sling.feature.io.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
@@ -202,131 +180,23 @@
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
- <version>3.4</version>
+ <version>${maven-plugin-annotations.version}</version>
<scope>provided</scope>
</dependency>
- <!-- for converting Maven to OSGi versions -->
- <dependency>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>biz.aQute.bndlib</artifactId>
- <version>4.2.0</version>
- </dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interactivity-api</artifactId>
- <version>1.0-alpha-6</version>
- </dependency>
- <!-- We use a class from the config admin implementation to read config files -->
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.8.10</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.converter</artifactId>
- <version>1.0.10</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configurator</artifactId>
- <version>1.0.10</version>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.johnzon</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-archiver</artifactId>
- <version>2.4.4</version>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>3.0.17</version>
+ <version>${plexus-interactivity-api.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.4</version>
+ <version>${commons-io.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-filtering</artifactId>
- <version>1.2</version>
- <exclusions>
- <exclusion>
- <artifactId>maven-project</artifactId>
- <groupId>org.apache.maven</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.osgi</artifactId>
- <version>2.4.0</version>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.10.19</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <!-- The following artifacts are purely used by the unit tests
- so these dependencies ensures that they are in the .m2 directory prior to executing the tests.
- Whenever you modify these, you must also modify the references in org.apache.sling.maven.slingstart.PreparePackageMojoTest! -->
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.classloader</artifactId>
- <version>1.3.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.contentdetection</artifactId>
- <version>1.0.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.mime</artifactId>
- <version>2.1.8</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.threads</artifactId>
- <version>3.2.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
+ <artifactId>maven-shared-utils</artifactId>
+ <version>${maven-shared-utils.version}</version>
</dependency>
</dependencies>
diff --git a/src/main/java/org/apache/sling/maven/kickstart/launcher/Main.java b/src/main/java/org/apache/sling/maven/kickstart/launcher/Main.java
index 5567a7e..59d80ed 100644
--- a/src/main/java/org/apache/sling/maven/kickstart/launcher/Main.java
+++ b/src/main/java/org/apache/sling/maven/kickstart/launcher/Main.java
@@ -41,7 +41,7 @@
private final int listenerPort;
/** Main class default value */
- private final static String MAIN_CLASS_DEF = "org.apache.sling.kickstart.app.SlingStarter";
+ private final static String MAIN_CLASS_DEF = "org.apache.sling.kickstart.app.KickstartStarter";
/** Delimeter string */
private final static String DELIM =
@@ -60,9 +60,11 @@
this.appJar = new File(args[0]);
this.listenerPort = Integer.valueOf(args[1]);
this.verbose = Boolean.valueOf(args[2]);
- System.out.println("App Jar: " + appJar);
- System.out.println("Listener Port: " + listenerPort);
- System.out.println("Verbose: " + verbose);
+ if(verbose) {
+ System.out.println("App Jar: " + appJar);
+ System.out.println("Listener Port: " + listenerPort);
+ System.out.println("Verbose: " + verbose);
+ }
this.startupArgs = new String[args.length-3];
System.arraycopy(args, 3, this.startupArgs, 0, this.startupArgs.length);
}
@@ -73,7 +75,7 @@
public void run() throws Exception {
if (verbose) {
System.out.println(DELIM);
- System.out.println("Slingstart application: " + this.appJar);
+ System.out.println("Kickstart application: " + this.appJar);
System.out.println("Main class: " + MAIN_CLASS_DEF);
System.out.println("Listener Port: " + String.valueOf(this.listenerPort));
System.out.println("Arguments: " + Arrays.toString(this.startupArgs));
