You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 10:28:33 UTC
[sling-slingstart-maven-plugin] annotated tag
slingstart-maven-plugin-1.7.4 created (now d28fc8a)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to annotated tag slingstart-maven-plugin-1.7.4
in repository https://gitbox.apache.org/repos/asf/sling-slingstart-maven-plugin.git.
at d28fc8a (tag)
tagging c19f7f7da7b13eccf7f1333e016872a000dd00a4 (commit)
by Carsten Ziegeler
on Wed Apr 26 06:58:24 2017 +0000
- Log -----------------------------------------------------------------
slingstart-maven-plugin-1.7.4
-----------------------------------------------------------------------
This annotated tag includes the following new commits:
new 87744a4 Add slingstart maven plugin
new d0a48e9 Add slingstart maven plugin
new 9544826 Update javadocs and rename subsystem to deliverable and run mode to feature
new 869228d Rename classes
new 5758009 Fully support Apach Felix config file format. Move from properties to getter and setter methods
new 42e2fe7 Implement txt format for reading and writing
new c348dc3 Implement txt format for reading and writing
new cb34728 Add merger utility and variable replacement
new c360a20 Cache raw and effective model and provide separate methods
new 08649e0 Adjust to new model
new 46b2387 Update to Sling Parent POM 22 with baselining enabled
new 799c129 Move io methods to helper class
new 6fa67eb Move io methods to helper class
new 9292c9f Use provisioning model
new 68bc095 Correct model caching
new 22e62c6 Rename constants
new 2b243e6 Rename artifact handlers and components
new b4cf460 Get artifacts from repositor if overlayed with a different version
new 84605ad Fix special configuration handling and effective model retrival
new 8fb99d7 Make prepare mojo subclassable
new 3aaf03c Correct extension for config files
new 85bf931 SLING-4081 - SlingStart Maven Plugin fails if the organization is not defined in pom.xml
new 3116925 Moved invocation of org.apache.sling:slingstart-maven-plugin:prepare-package to prepare-package lifecycle phase
new 90e5c8f Rename directory to use from models to provisioning
new c0ef68c Use released provisioning model
new dfabbb8 [maven-release-plugin] prepare release slingstart-maven-plugin-1.0.0
new 6c8eeeb [maven-release-plugin] prepare for next development iteration
new 968d118 Switch to snapshot until release vote is done
new 1f80af8 Use released provisioning model
new bbd3ef7 SLING-4121 : Bootstrap file is created in wrong directory for webapp
new ef15cd3 SLING-4123 : Wrong packaging used for feature
new 38be5ce [maven-release-plugin] prepare release slingstart-maven-plugin-1.0.2
new 71a346e [maven-release-plugin] prepare for next development iteration
new 194cbd8 SLING-4479 : Inherited models are processed in the wrong order
new f83d1b7 SLING-4479 : Inherited models are processed in the wrong order
new 3272ecb [maven-release-plugin] prepare release slingstart-maven-plugin-1.0.4
new 806532a [maven-release-plugin] prepare for next development iteration
new 037927e fix build (use 1.1.1-SNAPSHOT of org.apache.sling.provisioning.model)
new 8668df1 Use released provisioning model
new b0c766a SLING-4474 : Provide a way to start/stop an instance through maven mojos
new 5a664a1 SLING-4600 : Migrate launchpad/test-bundles to provisioning model
new 4e5f8e1 SLING-4598 : Migrate launchpad testing to provisioning model
new 01ce90b Remove unused code and add failing project to exception
new 7861695 Delay resolving of reactor projects until project is built
new 2cfdf79 Correct type/language of slingstart packaging
new 350917d Get dependent projects from build if build in the same build
new 93c268f Check main artifact and attached artifacts for artifacts from the same build
new e2fb051 Refactor slingstart maven plugin: resolve slingstart/slingfeature projects during setup of maven (reactor) project
new 5e423dd Implement control port option
new fd065be SLING-4620 : Slingstart plugin start goal exits even if launchpad.keep.running is set to true
new d5508d2 Use maven.skip.test as the property for skipping the start/stop goals
new 8e24720 SLING-4620 : Slingstart plugin start goal exits even if launchpad.keep.running is set to true
new a55291e [maven-release-plugin] prepare release slingstart-maven-plugin-1.1.0
new 5664925 [maven-release-plugin] prepare for next development iteration
new 265f5f4 SLING-4677 allow to start Sling in debug mode with a simple mojo parameter
new 89d49b0 SLING-4677 allow to override debug settings of all controlled Sling servers through Mojo parameter
new fbb9c15 SLING-4698 - Set parent.relativePath to empty for all modules
new 320de8f SLING-4766 Provisioning Model does not support adding variables to Sling Settings - allow escaping with \${var}
new f2865de SLING-4790 : Removal of artifacts from inherited model is not possible
new ddd4ba0 SLING-4790 : Removal of artifacts from inherited model is not possible
new 3982e2e Prepare for release
new 6cd730f [maven-release-plugin] prepare release slingstart-maven-plugin-1.2.0
new 29b2e20 [maven-release-plugin] prepare for next development iteration
new 2aa3b8f slingstart-maven-plugin: temporarily depend on SNAPSHOT version for provisioning.model
new ab60b2f Update to Sling Parent 23
new 858d446 set parent version to 24 and add empty relativePath where missing
new 72dfaf3 SLING-4879 Allow to read variables from POM
new cfa9a87 SLING-4880 Allow to get artifact versions from POM
new ce4b2b5 SLING-4880 Fix potential NPEs when resolving artifacts
new 51d72c9 SLING-4879 refactor model processing logic from ModelUtility#getEffectiveModel into separate class to make it reusable
new 55bf1b1 SLING-4879 update variables section in feature for attached artifact instead of using effective model
new f59b06d SLING-4880 apply resolved dependencies to raw model instead of attaching effective model add new optional parameter "allowUnresolvedPomDependencies" (default: false)
new b239b9c SLING-4889 : Provide a mojo to create a maven like structure of the referenced artifacts
new c2041da SLING-4889 : Provide a mojo to create a maven like structure of the referenced artifacts
new f93e40b SLING-4912 : Support inlining the model in the pom
new 34fac94 Use latest provisioning model
new 567d94e [maven-release-plugin] prepare release slingstart-maven-plugin-1.3.0
new 91768e0 [maven-release-plugin] prepare for next development iteration
new eba7ffa Switch to latest snapshot for the release vote time
new c0d83a9 Use released prov model
new 250f6a0 Use released prov model
new 0acafe1 SLING-4945 : Model files are missing from created repository SLING-4946 : Model dependencies are not followed transitively
new 9321ca4 [maven-release-plugin] prepare release slingstart-maven-plugin-1.3.2
new 0808f14 [maven-release-plugin] prepare for next development iteration
new e3c6967 SLING-4969 : Store aggregated model as artifact
new e52e8a2 SLING-4969 : Store aggregated model as artifact
new b0ca3ad [maven-release-plugin] prepare release slingstart-maven-plugin-1.3.4
new 9bd2b5e [maven-release-plugin] prepare for next development iteration
new 71a7942 SLING-4970 : Potential NPE with transitive models
new 30c2bf7 [maven-release-plugin] prepare release slingstart-maven-plugin-1.3.6
new 60c436f [maven-release-plugin] prepare for next development iteration
new 49d48b5 Update the main reactor to parent 25
new c3b709a SLING-5170 : Make dependency handling code more reusable
new b98555a SLING-5149 - Generate OSGi subsystem intermediary file in slingstart-maven-plugin
new f6075f8 SLING-5379 - support renaming of bundles in maven-slingstart-plugin. Contributed by David Bosschaert, thanks!
new fcda963 SLING-5379 - use BundleFileProcessor
new e8fd2c9 SLING-5379 - add BSNRenamer
new b703b6b Use latest prov model snapshot version
new f2ac4d9 Use provisioning model 1.4.2
new 9fb072d Switch to parent pom 26
new 16ca65a Use latest commons osgi release
new f679285 [maven-release-plugin] prepare release slingstart-maven-plugin-1.4.0
new 27b495b [maven-release-plugin] prepare for next development iteration
new 2e41a1d Switch to commons osgi 2.4.1 snapshot
new 590bd42 SLING-5414 - embed the full text of the provisioning model in the Sling jar, under /resources/provisioning/model.txt
new 854f279 SLING-5476 : target/classes should not be used by the plugin
new 80b5f02 SLING-5477 : Allow to add an artifact of the slingstart project to the model
new ebae600 Use released commons osgi
new 7ae1ea8 [maven-release-plugin] prepare release slingstart-maven-plugin-1.4.2
new aec1d36 [maven-release-plugin] prepare for next development iteration
new ca0b9d0 SLING-4677 clarify javadoc on debugging options
new af5befd SLING-5738 : Add support for configuring a pattern for the model files to be read
new d1ca2b2 Use provisioning model 1.4.4
new f6bbec6 [maven-release-plugin] prepare release slingstart-maven-plugin-1.4.4
new 4cf08cc [maven-release-plugin] prepare for next development iteration
new 0804217 Switch to provisioning model 1.4.5-SNAPSHOT during release vote
new 40ad7a7 SLING-6068 allow to build and start a quickstart even for non "slingstart" packaging projects.
new 21e28cf SLING-6212 : Create more meaningful exception if no model is found for attach goal
new 93f9f38 SLING-6213 : Provide a way to add artifacts from the current project to the provisioning model
new e017516 SLING-6219 : Provide configuration to add project version to feature
new 7b6e3d0 Clean up code
new 537fdb3 Use latest provisioning model snapshot
new fec71fe SLING-6068 : slingstart-maven-plugin: Allow to start a quickstart JAR based on a provisioning model even for non slingstart packagings
new e0e89f2 SLING-6068 : slingstart-maven-plugin: Allow to start a quickstart JAR based on a provisioning model even for non slingstart packagings
new 25c4c59 SLING-6068 : slingstart-maven-plugin: Allow to start a quickstart JAR based on a provisioning model even for non slingstart packagings
new fb3ba19 SLING-6068 fix javadoc
new 6179279 Use latest provisioning model
new 5d911a2 [maven-release-plugin] prepare release slingstart-maven-plugin-1.5.0
new 1211119 [maven-release-plugin] prepare for next development iteration
new 0fddded SLING-6266 : Feature version should be converted to OSGi version
new 4df72a8 Use provisioning model 1.7.0
new 9df43d8 [maven-release-plugin] prepare release slingstart-maven-plugin-1.6.0
new 762ae72 [maven-release-plugin] prepare for next development iteration
new c11342a Switch the prov model 1.7.1-SNAPSHOT during release
new 5f8e80b SLING-6278 : Provide tooling to create an archive with the provisioning model and all artifacts
new 8943fbf SLING-6284 - PreparePackageMojo.testSubsystemBaseGeneration often fails on Jenkins
new e09af72 SLING-6370 slingstart: start goal failes if not executed together with install
new ee0d1c5 SLING-6393 : Set project final name as default model archive name. Apply patch from Roy Teeuwen
new 7e9b0fb Use prov model 1.8.0 for release
new 64507bd [maven-release-plugin] prepare release slingstart-maven-plugin-1.7.0
new ae237fe [maven-release-plugin] prepare for next development iteration
new fdd7708 Switch back to prov model 1.8.1-SNAPSHOT
new c44069c Use prov model 1.8.0
new d789e72 SLING-6540 support m2e (https://www.eclipse.org/m2e/documentation/m2e-making-maven-plugins-compat.html)
new d19ad4b include the repository location in the log
new 74bc049 SLING-6540 ignore all mojos in m2e
new 252a9c1 SLING-6545 allow to redirect stdout/stderr to dedicated file
new 2ba07f1 SLING-6541 allow to disable the Maven classpath enrichment
new 819d014 SLING-6544 allow to block until user presses Enter
new 4794fe9 SLING-6544 add missing dependency
new 891ecd0 SLING-6556 allow to reference the main artifact of the build within the model (in case it has been built already)
new e7fa7be [maven-release-plugin] prepare release slingstart-maven-plugin-1.7.2
new 1683fe9 [maven-release-plugin] prepare for next development iteration
new 058ea4d SLING-6573 : Repository goal should not require a launchpad feature
new 8e58576 use Sling Parent 30
new 98ad37a enable maven plugin site generation
new e312c6d exclude site markdown files from RAT
new 05798e8 Improve goal descriptions (which are used in the Maven site)
new a3b3f51 version of maven-scm-publish-plugin already defined in parent pom
new f9ccd47 clarify logging (to make clearer on which port the server has been started)
new b23cac5 SLING-6792 : Attached provisioning model should be the raw model
new 00ab61f [maven-release-plugin] prepare release slingstart-maven-plugin-1.7.4
new c19f7f7 [maven-release-plugin] copy for tag slingstart-maven-plugin-1.7.4
The 163 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
--
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].
[sling-slingstart-maven-plugin] 02/11: SLING-6573 : Repository goal
should not require a launchpad feature
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag slingstart-maven-plugin-1.7.4
in repository https://gitbox.apache.org/repos/asf/sling-slingstart-maven-plugin.git
commit 058ea4dcaa6720ea2a2949dec627f4a3ecda9bc5
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Feb 28 10:35:00 2017 +0000
SLING-6573 : Repository goal should not require a launchpad feature
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/slingstart-maven-plugin@1784720 13f79535-47bb-0310-9956-ffa450edef68
---
.../sling/maven/slingstart/RepositoryMojo.java | 45 ++++++++++++++++------
1 file changed, 33 insertions(+), 12 deletions(-)
diff --git a/src/main/java/org/apache/sling/maven/slingstart/RepositoryMojo.java b/src/main/java/org/apache/sling/maven/slingstart/RepositoryMojo.java
index 845c67a..1bc601b 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/RepositoryMojo.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/RepositoryMojo.java
@@ -32,10 +32,12 @@ import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.sling.provisioning.model.ArtifactGroup;
import org.apache.sling.provisioning.model.Feature;
import org.apache.sling.provisioning.model.Model;
+import org.apache.sling.provisioning.model.ModelConstants;
import org.apache.sling.provisioning.model.ModelUtility;
import org.apache.sling.provisioning.model.RunMode;
import org.apache.sling.provisioning.model.io.ModelWriter;
@@ -62,6 +64,12 @@ public class RepositoryMojo extends AbstractSlingStartMojo {
@Component
private ArtifactResolver resolver;
+ /**
+ * This is the name of the final model as written to the target directory.
+ */
+ @Parameter(defaultValue="slingstart.txt")
+ private String repositoryModelName;
+
@Override
public void execute() throws MojoExecutionException, MojoFailureException {
final File artifactDir = new File(this.project.getBuild().getDirectory(), DIR_NAME);
@@ -79,18 +87,20 @@ public class RepositoryMojo extends AbstractSlingStartMojo {
}
}
}
- // base artifact
- try {
- final org.apache.sling.provisioning.model.Artifact baseArtifact = ModelUtils.findBaseArtifact(model);
- final org.apache.sling.provisioning.model.Artifact appArtifact =
- new org.apache.sling.provisioning.model.Artifact(baseArtifact.getGroupId(),
- baseArtifact.getArtifactId(),
- baseArtifact.getVersion(),
- BuildConstants.CLASSIFIER_APP,
- BuildConstants.TYPE_JAR);
- copyArtifactToRepository(appArtifact, artifactDir);
- } catch ( final MavenExecutionException mee) {
- throw new MojoExecutionException(mee.getMessage(), mee.getCause());
+ // base artifact - only if launchpad feature is available
+ if (model.getFeature(ModelConstants.FEATURE_LAUNCHPAD) != null) {
+ try {
+ final org.apache.sling.provisioning.model.Artifact baseArtifact = ModelUtils.findBaseArtifact(model);
+ final org.apache.sling.provisioning.model.Artifact appArtifact =
+ new org.apache.sling.provisioning.model.Artifact(baseArtifact.getGroupId(),
+ baseArtifact.getArtifactId(),
+ baseArtifact.getVersion(),
+ BuildConstants.CLASSIFIER_APP,
+ BuildConstants.TYPE_JAR);
+ copyArtifactToRepository(appArtifact, artifactDir);
+ } catch ( final MavenExecutionException mee) {
+ throw new MojoExecutionException(mee.getMessage(), mee.getCause());
+ }
}
// models
Model rawModel = ProjectHelper.getRawModel(this.project);
@@ -121,6 +131,17 @@ public class RepositoryMojo extends AbstractSlingStartMojo {
IOUtils.closeQuietly(writer);
}
+ // and write model to target
+ writer = null;
+ try {
+ writer = new FileWriter(new File(this.project.getBuild().getDirectory(), repositoryModelName));
+ ModelWriter.write(writer, rawModel);
+ } catch (IOException e) {
+ throw new MojoExecutionException("Unable to write model to " + rawModelFile, e);
+ } finally {
+ IOUtils.closeQuietly(writer);
+ }
+
for(final Map.Entry<String, String> entry : ProjectHelper.getDependencyModel(this.project).entrySet()) {
final org.apache.sling.provisioning.model.Artifact modelDepArtifact = org.apache.sling.provisioning.model.Artifact.fromMvnUrl(entry.getKey());
final String modelClassifier = (modelDepArtifact.getType().equals(BuildConstants.PACKAGING_SLINGSTART) ? BuildConstants.PACKAGING_PARTIAL_SYSTEM : modelDepArtifact.getClassifier());
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-slingstart-maven-plugin] 05/11: exclude site markdown files
from RAT
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag slingstart-maven-plugin-1.7.4
in repository https://gitbox.apache.org/repos/asf/sling-slingstart-maven-plugin.git
commit e312c6d43201f60a11cf8441862a085af8f272e1
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Thu Mar 9 23:39:31 2017 +0000
exclude site markdown files from RAT
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/slingstart-maven-plugin@1786258 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/pom.xml b/pom.xml
index 9ec202f..f707dba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,6 +95,15 @@
<tryUpdate>true</tryUpdate>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>src/site/markdown/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-slingstart-maven-plugin] 06/11: Improve goal descriptions
(which are used in the Maven site)
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag slingstart-maven-plugin-1.7.4
in repository https://gitbox.apache.org/repos/asf/sling-slingstart-maven-plugin.git
commit 05798e832459dc3657411b185fde817cdfdf8799
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Fri Mar 10 09:47:12 2017 +0000
Improve goal descriptions (which are used in the Maven site)
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/slingstart-maven-plugin@1786315 13f79535-47bb-0310-9956-ffa450edef68
---
.../java/org/apache/sling/maven/slingstart/AttachModelArchive.java | 2 +-
.../java/org/apache/sling/maven/slingstart/AttachSlingStartModel.java | 2 +-
src/main/java/org/apache/sling/maven/slingstart/PackageMojo.java | 3 +--
.../java/org/apache/sling/maven/slingstart/PreparePackageMojo.java | 2 +-
src/main/java/org/apache/sling/maven/slingstart/RepositoryMojo.java | 2 +-
src/main/java/org/apache/sling/maven/slingstart/run/StartMojo.java | 3 +--
src/main/java/org/apache/sling/maven/slingstart/run/StopMojo.java | 2 +-
7 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/apache/sling/maven/slingstart/AttachModelArchive.java b/src/main/java/org/apache/sling/maven/slingstart/AttachModelArchive.java
index c91b5dc..6e644d0 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/AttachModelArchive.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/AttachModelArchive.java
@@ -39,7 +39,7 @@ import org.apache.sling.provisioning.model.ModelUtility;
import org.apache.sling.provisioning.model.io.ModelArchiveWriter;
/**
- * Attaches the model archive as a project artifact.
+ * Attach the model archive as a project artifact.
*/
@Mojo(
name = "attach-modelarchive",
diff --git a/src/main/java/org/apache/sling/maven/slingstart/AttachSlingStartModel.java b/src/main/java/org/apache/sling/maven/slingstart/AttachSlingStartModel.java
index 4db991a..fd79cf6 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/AttachSlingStartModel.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/AttachSlingStartModel.java
@@ -31,7 +31,7 @@ import org.apache.sling.provisioning.model.ModelUtility;
import org.apache.sling.provisioning.model.io.ModelWriter;
/**
- * Attaches the model as a project artifact.
+ * Attach the model as a project artifact.
*/
@Mojo(
name = "attach-slingfeature",
diff --git a/src/main/java/org/apache/sling/maven/slingstart/PackageMojo.java b/src/main/java/org/apache/sling/maven/slingstart/PackageMojo.java
index 5853a22..6a88ef8 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/PackageMojo.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/PackageMojo.java
@@ -33,8 +33,7 @@ import org.apache.maven.plugins.annotations.ResolutionScope;
import org.codehaus.plexus.archiver.jar.JarArchiver;
/**
- * Initialize a Sling application project by extracting bundles into the correct
- * locations.
+ * Create a Sling quickstart package (either JAR or WAR) based on the referenced model.
*/
@Mojo(
name = "package",
diff --git a/src/main/java/org/apache/sling/maven/slingstart/PreparePackageMojo.java b/src/main/java/org/apache/sling/maven/slingstart/PreparePackageMojo.java
index 292bfc9..e73f611 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/PreparePackageMojo.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/PreparePackageMojo.java
@@ -67,7 +67,7 @@ import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
import org.codehaus.plexus.util.FileUtils;
/**
- * Prepare the sling start applications.
+ * Prepare the packaging of the Sling quickstart artifact (either JAR or WAR).
*/
@Mojo(
name = "prepare-package",
diff --git a/src/main/java/org/apache/sling/maven/slingstart/RepositoryMojo.java b/src/main/java/org/apache/sling/maven/slingstart/RepositoryMojo.java
index 1bc601b..b0298b2 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/RepositoryMojo.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/RepositoryMojo.java
@@ -43,7 +43,7 @@ import org.apache.sling.provisioning.model.RunMode;
import org.apache.sling.provisioning.model.io.ModelWriter;
/**
- * Create a mvn repository structure from the artifacts
+ * Create a Maven repository structure from the referenced artifacts in the model.
*/
@Mojo(
name = "repository",
diff --git a/src/main/java/org/apache/sling/maven/slingstart/run/StartMojo.java b/src/main/java/org/apache/sling/maven/slingstart/run/StartMojo.java
index d9271c8..c4912e2 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/run/StartMojo.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/run/StartMojo.java
@@ -42,7 +42,6 @@ import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Dependency;
-import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.Component;
@@ -53,7 +52,7 @@ import org.apache.maven.project.MavenProject;
import org.apache.sling.maven.slingstart.BuildConstants;
/**
- * Mojo for starting launchpad.
+ * Start one or multiple launchpad instance(s).
*/
@Mojo(
name = "start",
diff --git a/src/main/java/org/apache/sling/maven/slingstart/run/StopMojo.java b/src/main/java/org/apache/sling/maven/slingstart/run/StopMojo.java
index daf3e49..1b9ab7d 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/run/StopMojo.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/run/StopMojo.java
@@ -30,7 +30,7 @@ import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
/**
- * Stops the running launchpad instances.
+ * Stop one or multiple running launchpad instance(s).
*
*/
@Mojo(
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-slingstart-maven-plugin] 01/11: [maven-release-plugin]
prepare for next development iteration
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag slingstart-maven-plugin-1.7.4
in repository https://gitbox.apache.org/repos/asf/sling-slingstart-maven-plugin.git
commit 1683fe90b32d78bef6090e1950b0f188b6430201
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Fri Feb 24 08:28:00 2017 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/slingstart-maven-plugin@1784240 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 513d6ea..fd469d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
</parent>
<artifactId>slingstart-maven-plugin</artifactId>
- <version>1.7.2</version>
+ <version>1.7.3-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Apache Sling SlingStart Maven Plugin</name>
@@ -35,9 +35,9 @@
</properties>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/slingstart-maven-plugin-1.7.2</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/slingstart-maven-plugin-1.7.2</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/slingstart-maven-plugin-1.7.2</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/tooling/maven/slingstart-maven-plugin</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/slingstart-maven-plugin</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/tooling/maven/slingstart-maven-plugin</url>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-slingstart-maven-plugin] 11/11: [maven-release-plugin] copy
for tag slingstart-maven-plugin-1.7.4
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag slingstart-maven-plugin-1.7.4
in repository https://gitbox.apache.org/repos/asf/sling-slingstart-maven-plugin.git
commit c19f7f7da7b13eccf7f1333e016872a000dd00a4
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Apr 26 06:58:24 2017 +0000
[maven-release-plugin] copy for tag slingstart-maven-plugin-1.7.4
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/slingstart-maven-plugin-1.7.4@1792700 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-slingstart-maven-plugin] 08/11: clarify logging (to make
clearer on which port the server has been started)
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag slingstart-maven-plugin-1.7.4
in repository https://gitbox.apache.org/repos/asf/sling-slingstart-maven-plugin.git
commit f9ccd4713f521e83bb7a3772efc9f3dd5195eb9b
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Tue Mar 21 13:47:35 2017 +0000
clarify logging (to make clearer on which port the server has been started)
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/slingstart-maven-plugin@1787970 13f79535-47bb-0310-9956-ffa450edef68
---
.../org/apache/sling/maven/slingstart/run/LauncherCallable.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/sling/maven/slingstart/run/LauncherCallable.java b/src/main/java/org/apache/sling/maven/slingstart/run/LauncherCallable.java
index 33f4429..d4fb2cc 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/run/LauncherCallable.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/run/LauncherCallable.java
@@ -102,8 +102,8 @@ public class LauncherCallable implements Callable<ProcessDescription> {
if ( !started ) {
throw new Exception("Launchpad did not start successfully in " + this.environment.getReadyTimeOutSec() + " seconds.");
}
- this.logger.info("Started Launchpad " + configuration.getId() +
- " [" + configuration.getRunmode() + ", " + configuration.getPort() + "]");
+ this.logger.info("Started Launchpad '" + configuration.getId() +
+ "' at port " + configuration.getPort()+ " [run modes: " + configuration.getRunmode()+ "]");
} finally {
// stop control port
cfg.getControlListener().stop();
@@ -212,7 +212,7 @@ public class LauncherCallable implements Callable<ProcessDescription> {
boolean isNew = false;
if (cfg.getProcess() != null || isNew ) {
- LOG.info("Stopping Launchpad " + cfg.getId());
+ LOG.info("Stopping Launchpad '" + cfg.getId() + "'");
boolean destroy = true;
final int twoMinutes = 2 * 60 * 1000;
final File controlPortFile = getControlPortFile(cfg.getDirectory());
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-slingstart-maven-plugin] 04/11: enable maven plugin site
generation
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag slingstart-maven-plugin-1.7.4
in repository https://gitbox.apache.org/repos/asf/sling-slingstart-maven-plugin.git
commit 98ad37a6772455fcc02a7a103fdc59437fe31714
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Thu Mar 9 23:10:03 2017 +0000
enable maven plugin site generation
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/slingstart-maven-plugin@1786255 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 28 ++++++++++++++++++++++++++++
src/site/markdown/index.md | 8 ++++++++
src/site/site.xml | 35 +++++++++++++++++++++++++++++++++++
3 files changed, 71 insertions(+)
diff --git a/pom.xml b/pom.xml
index 162ed2e..9ec202f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,6 +32,7 @@
<properties>
<maven.version>3.0.5</maven.version>
+ <maven.site.path>${project.artifactId}-archives/${project.artifactId}-LATEST</maven.site.path>
</properties>
<scm>
@@ -40,6 +41,14 @@
<url>http://svn.apache.org/viewvc/sling/trunk/tooling/maven/slingstart-maven-plugin</url>
</scm>
+ <!-- Support for publishing the mvn site. -->
+ <distributionManagement>
+ <site>
+ <id>apache.website</id>
+ <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/sling/content/components/${maven.site.path}</url>
+ </site>
+ </distributionManagement>
+
<build>
<plugins>
<plugin>
@@ -77,6 +86,15 @@
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-publish-plugin</artifactId>
+ <version>1.1</version>
+ <configuration>
+ <checkoutDirectory>${user.home}/maven-sites/${maven.site.path}</checkoutDirectory>
+ <tryUpdate>true</tryUpdate>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -210,4 +228,14 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
+
</project>
diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md
new file mode 100644
index 0000000..f404c69
--- /dev/null
+++ b/src/site/markdown/index.md
@@ -0,0 +1,8 @@
+SlingStart Maven Plugin
+=======================
+
+Maven Plugin supporting Sling Launchpad.
+
+See [The Apache Sling Provisioning Model and Apache SlingStart](https://sling.apache.org/documentation/development/slingstart.html) for a documentation about the provisioning model and the general SlingStart concepts.
+
+See [Goals](plugin-info.html) for a list of supported goals.
diff --git a/src/site/site.xml b/src/site/site.xml
new file mode 100644
index 0000000..9abab11
--- /dev/null
+++ b/src/site/site.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.6</version>
+ </skin>
+ <body>
+ <menu name="Overview">
+ <item name="Introduction" href="index.html"/>
+ <item name="Goals" href="plugin-info.html"/>
+ </menu>
+ <menu ref="reports"/>
+ </body>
+</project>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-slingstart-maven-plugin] 03/11: use Sling Parent 30
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag slingstart-maven-plugin-1.7.4
in repository https://gitbox.apache.org/repos/asf/sling-slingstart-maven-plugin.git
commit 8e5857612602e3ca77ed9dad415c740bac3c40e4
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Mar 6 10:22:30 2017 +0000
use Sling Parent 30
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/slingstart-maven-plugin@1785621 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index fd469d9..162ed2e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>29</version>
+ <version>30</version>
<relativePath />
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-slingstart-maven-plugin] 07/11: version of
maven-scm-publish-plugin already defined in parent pom
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag slingstart-maven-plugin-1.7.4
in repository https://gitbox.apache.org/repos/asf/sling-slingstart-maven-plugin.git
commit a3b3f519e6340583b14244672b9f5c986aa4ba55
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Fri Mar 10 17:02:04 2017 +0000
version of maven-scm-publish-plugin already defined in parent pom
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/slingstart-maven-plugin@1786386 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index f707dba..17f67bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
- <version>1.1</version>
<configuration>
<checkoutDirectory>${user.home}/maven-sites/${maven.site.path}</checkoutDirectory>
<tryUpdate>true</tryUpdate>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-slingstart-maven-plugin] 10/11: [maven-release-plugin]
prepare release slingstart-maven-plugin-1.7.4
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag slingstart-maven-plugin-1.7.4
in repository https://gitbox.apache.org/repos/asf/sling-slingstart-maven-plugin.git
commit 00ab61fca3f09e1c909f48abd07028304d154271
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Apr 26 06:58:11 2017 +0000
[maven-release-plugin] prepare release slingstart-maven-plugin-1.7.4
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/slingstart-maven-plugin@1792699 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 17f67bc..74bcc9f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
</parent>
<artifactId>slingstart-maven-plugin</artifactId>
- <version>1.7.3-SNAPSHOT</version>
+ <version>1.7.4</version>
<packaging>maven-plugin</packaging>
<name>Apache Sling SlingStart Maven Plugin</name>
@@ -36,9 +36,9 @@
</properties>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/tooling/maven/slingstart-maven-plugin</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/slingstart-maven-plugin</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/tooling/maven/slingstart-maven-plugin</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/slingstart-maven-plugin-1.7.4</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/slingstart-maven-plugin-1.7.4</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/slingstart-maven-plugin-1.7.4</url>
</scm>
<!-- Support for publishing the mvn site. -->
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-slingstart-maven-plugin] 09/11: SLING-6792 : Attached
provisioning model should be the raw model
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag slingstart-maven-plugin-1.7.4
in repository https://gitbox.apache.org/repos/asf/sling-slingstart-maven-plugin.git
commit b23cac5cf8935c4d983cd15b942c90a00bdf74a0
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Apr 26 06:56:13 2017 +0000
SLING-6792 : Attached provisioning model should be the raw model
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/slingstart-maven-plugin@1792698 13f79535-47bb-0310-9956-ffa450edef68
---
.../apache/sling/maven/slingstart/ModelPreprocessor.java | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/apache/sling/maven/slingstart/ModelPreprocessor.java b/src/main/java/org/apache/sling/maven/slingstart/ModelPreprocessor.java
index d275fb9..73770de 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/ModelPreprocessor.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/ModelPreprocessor.java
@@ -52,7 +52,6 @@ import org.apache.sling.provisioning.model.ModelUtility.ResolverOptions;
import org.apache.sling.provisioning.model.RunMode;
import org.apache.sling.provisioning.model.Traceable;
import org.apache.sling.provisioning.model.io.ModelReader;
-import org.codehaus.plexus.component.configurator.converters.basic.BooleanConverter;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.xml.Xpp3Dom;
@@ -66,7 +65,7 @@ public class ModelPreprocessor {
public boolean done = false;
public Model model;
public boolean extendMavenClassPath = true;
- public final Map<org.apache.sling.provisioning.model.Artifact, Model> includedModels = new HashMap<org.apache.sling.provisioning.model.Artifact, Model>();
+ public final Map<org.apache.sling.provisioning.model.Artifact, Model> includedModels = new HashMap<>();
}
@@ -75,7 +74,7 @@ public class ModelPreprocessor {
public ArtifactResolver resolver;
public MavenSession session;
public Logger logger;
- public final Map<String, ProjectInfo> modelProjects = new HashMap<String, ProjectInfo>();
+ public final Map<String, ProjectInfo> modelProjects = new HashMap<>();
}
/**
@@ -137,7 +136,7 @@ public class ModelPreprocessor {
// process attachments
processAttachments(env, info);
-
+
// is the maven classpath supposed to be extended?
info.extendMavenClassPath = !nodeBooleanValue(info.plugin, AbstractSlingStartMojo.CONFIGURATION_NAME_DISABLE_EXTENDING_CLASSPATH, false);
@@ -169,7 +168,6 @@ public class ModelPreprocessor {
this.mergeModels(info.model, d);
}
this.mergeModels(info.model, info.localModel);
- info.localModel = info.model;
info.model = ModelUtility.getEffectiveModel(info.model, resolverOptions);
final Map<Traceable, String> errors = ModelUtility.validate(info.model);
@@ -269,12 +267,12 @@ public class ModelPreprocessor {
final Model effectiveModel)
throws MavenExecutionException {
// slingstart or slingfeature
- final List<Model> dependencies = new ArrayList<Model>();
+ final List<Model> dependencies = new ArrayList<>();
for(final Feature feature : effectiveModel.getFeatures()) {
for(final RunMode runMode : feature.getRunModes()) {
for(final ArtifactGroup group : runMode.getArtifactGroups()) {
- final List<org.apache.sling.provisioning.model.Artifact> removeList = new ArrayList<org.apache.sling.provisioning.model.Artifact>();
+ final List<org.apache.sling.provisioning.model.Artifact> removeList = new ArrayList<>();
for(final org.apache.sling.provisioning.model.Artifact a : group) {
if ( a.getType().equals(BuildConstants.PACKAGING_SLINGSTART)
|| a.getType().equals(BuildConstants.PACKAGING_PARTIAL_SYSTEM)) {
@@ -515,7 +513,7 @@ public class ModelPreprocessor {
final Logger logger)
throws MavenExecutionException, IOException {
final Pattern p = Pattern.compile(pattern);
- final List<String> candidates = new ArrayList<String>();
+ final List<String> candidates = new ArrayList<>();
if ( modelDirectory != null && modelDirectory.exists() ) {
for(final File f : modelDirectory.listFiles() ) {
if ( f.isFile() && !f.getName().startsWith(".") ) {
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.