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:27:31 UTC
[sling-slingstart-maven-plugin] annotated tag
slingstart-maven-plugin-1.4.2 created (now 4ade130)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to annotated tag slingstart-maven-plugin-1.4.2
in repository https://gitbox.apache.org/repos/asf/sling-slingstart-maven-plugin.git.
at 4ade130 (tag)
tagging 1ca9dcd70820e6acc8402c50d8d8f6f02c4d9a1a (commit)
by Carsten Ziegeler
on Mon Feb 8 13:35:39 2016 +0000
- Log -----------------------------------------------------------------
slingstart-maven-plugin-1.4.2
-----------------------------------------------------------------------
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 1ca9dcd [maven-release-plugin] copy for tag slingstart-maven-plugin-1.4.2
The 110 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] 03/08: SLING-5414 - embed the full
text of the provisioning model in the Sling jar,
under /resources/provisioning/model.txt
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.4.2
in repository https://gitbox.apache.org/repos/asf/sling-slingstart-maven-plugin.git
commit 590bd42c0c493f0651f0970eb7051a8c6f57d27f
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Fri Jan 8 15:31:20 2016 +0000
SLING-5414 - embed the full text of the provisioning model in the Sling jar, under /resources/provisioning/model.txt
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/slingstart-maven-plugin@1723740 13f79535-47bb-0310-9956-ffa450edef68
---
.../sling/maven/slingstart/PreparePackageMojo.java | 28 +++++++++++++++++++++-
1 file changed, 27 insertions(+), 1 deletion(-)
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 cef9ea1..fb4ad2f 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/PreparePackageMojo.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/PreparePackageMojo.java
@@ -57,6 +57,7 @@ import org.apache.sling.provisioning.model.Model;
import org.apache.sling.provisioning.model.ModelConstants;
import org.apache.sling.provisioning.model.RunMode;
import org.apache.sling.provisioning.model.Section;
+import org.apache.sling.provisioning.model.io.ModelWriter;
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.UnArchiver;
import org.codehaus.plexus.archiver.manager.ArchiverManager;
@@ -83,6 +84,10 @@ public class PreparePackageMojo extends AbstractSlingStartMojo {
private static final String CONFIG_DIRECTORY = "config";
+ private static final String PROVISIONING_DIRECTORY = "provisioning";
+
+ private static final String EMBEDDED_MODEL_FILENAME = "model.txt";
+
private static final String BOOTSTRAP_FILE = "sling_bootstrap.txt";
private static final String PROPERTIES_FILE = "sling_install.properties";
@@ -142,9 +147,29 @@ public class PreparePackageMojo extends AbstractSlingStartMojo {
unpackBaseArtifact(model, outputDir, ModelConstants.RUN_MODE_STANDALONE);
this.buildSettings(model, ModelConstants.RUN_MODE_STANDALONE, outputDir);
this.buildBootstrapFile(model, ModelConstants.RUN_MODE_STANDALONE, outputDir);
+ this.embedModel(model, outputDir);
this.buildContentsMap(model, ModelConstants.RUN_MODE_STANDALONE, contentsMap);
}
+
+ /** Embed our model in the created jar file */
+ private void embedModel(Model model, File outputDir) throws MojoExecutionException {
+ final File modelDir = new File(new File(outputDir, BASE_DESTINATION), PROVISIONING_DIRECTORY);
+ modelDir.mkdirs();
+ final File modelFile = new File(modelDir, EMBEDDED_MODEL_FILENAME);
+ try {
+ final FileWriter w = new FileWriter(modelFile);
+ try {
+ w.write("# Aggregated provisioning model embedded by " + getClass().getName() + "\n");
+ ModelWriter.write(w, model);
+ } finally {
+ w.flush();
+ w.close();
+ }
+ } catch(IOException ioe) {
+ throw new MojoExecutionException("Failed to create model file " + modelFile.getAbsolutePath(), ioe);
+ }
+ }
/**
* Prepare the web application.
@@ -177,6 +202,7 @@ public class PreparePackageMojo extends AbstractSlingStartMojo {
}
this.buildSettings(model, ModelConstants.RUN_MODE_WEBAPP, webappDir);
this.buildBootstrapFile(model, ModelConstants.RUN_MODE_WEBAPP, webappDir);
+ this.embedModel(model, webappDir);
this.buildContentsMap(model, ModelConstants.RUN_MODE_WEBAPP, contentsMap);
}
@@ -667,4 +693,4 @@ public class PreparePackageMojo extends AbstractSlingStartMojo {
return text.replaceAll("\\\\\\$", "\\$");
}
-}
+}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-slingstart-maven-plugin] 06/08: Use released commons osgi
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.4.2
in repository https://gitbox.apache.org/repos/asf/sling-slingstart-maven-plugin.git
commit ebae600eb7f33704a5104325b36003e35d574c64
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Feb 8 13:34:55 2016 +0000
Use released commons osgi
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/slingstart-maven-plugin@1729170 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index caa42a2..d21634d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -171,7 +171,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.osgi</artifactId>
- <version>2.4.1-SNAPSHOT</version>
+ <version>2.4.0</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-slingstart-maven-plugin] 08/08: [maven-release-plugin] copy
for tag slingstart-maven-plugin-1.4.2
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.4.2
in repository https://gitbox.apache.org/repos/asf/sling-slingstart-maven-plugin.git
commit 1ca9dcd70820e6acc8402c50d8d8f6f02c4d9a1a
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Feb 8 13:35:39 2016 +0000
[maven-release-plugin] copy for tag slingstart-maven-plugin-1.4.2
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/slingstart-maven-plugin-1.4.2@1729172 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] 04/08: SLING-5476 : target/classes
should not be used by the plugin
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.4.2
in repository https://gitbox.apache.org/repos/asf/sling-slingstart-maven-plugin.git
commit 854f27971a3ff956255193f052e157212496e84a
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Feb 2 13:31:46 2016 +0000
SLING-5476 : target/classes should not be used by the plugin
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/slingstart-maven-plugin@1728116 13f79535-47bb-0310-9956-ffa450edef68
---
.../org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java | 4 ++++
src/main/java/org/apache/sling/maven/slingstart/PackageMojo.java | 2 +-
.../org/apache/sling/maven/slingstart/PreparePackageMojo.java | 8 ++------
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java b/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java
index 04af510..0e84976 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java
@@ -96,4 +96,8 @@ public abstract class AbstractSlingStartMojo extends AbstractMojo {
}
return options;
}
+
+ protected File getStandaloneOutputDirectory() {
+ return new File(this.getTmpDir(), "standalone");
+ }
}
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 0699561..8e19ecd 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/PackageMojo.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/PackageMojo.java
@@ -68,7 +68,7 @@ public class PackageMojo extends AbstractSlingStartMojo {
@SuppressWarnings("unchecked")
final Map<String, File> contentsMap = (Map<String, File>) this.project.getContextValue(BuildConstants.CONTEXT_STANDALONE);
- final File buildOutputDirectory = new File(this.project.getBuild().getOutputDirectory());
+ final File buildOutputDirectory = this.getStandaloneOutputDirectory();
final File manifestFile = new File(buildOutputDirectory, "META-INF/MANIFEST.MF");
FileInputStream fis = null;
try {
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 fb4ad2f..d9197d1 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/PreparePackageMojo.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/PreparePackageMojo.java
@@ -85,7 +85,7 @@ public class PreparePackageMojo extends AbstractSlingStartMojo {
private static final String CONFIG_DIRECTORY = "config";
private static final String PROVISIONING_DIRECTORY = "provisioning";
-
+
private static final String EMBEDDED_MODEL_FILENAME = "model.txt";
private static final String BOOTSTRAP_FILE = "sling_bootstrap.txt";
@@ -121,10 +121,6 @@ public class PreparePackageMojo extends AbstractSlingStartMojo {
this.prepareWebapp(model);
}
- protected File getStandaloneOutputDirectory() {
- return new File(this.project.getBuild().getOutputDirectory());
- }
-
/**
* Prepare the global map for the artifacts.
*/
@@ -151,7 +147,7 @@ public class PreparePackageMojo extends AbstractSlingStartMojo {
this.buildContentsMap(model, ModelConstants.RUN_MODE_STANDALONE, contentsMap);
}
-
+
/** Embed our model in the created jar file */
private void embedModel(Model model, File outputDir) throws MojoExecutionException {
final File modelDir = new File(new File(outputDir, BASE_DESTINATION), PROVISIONING_DIRECTORY);
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-slingstart-maven-plugin] 07/08: [maven-release-plugin]
prepare release slingstart-maven-plugin-1.4.2
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.4.2
in repository https://gitbox.apache.org/repos/asf/sling-slingstart-maven-plugin.git
commit 7ae1ea86f1eafb1c222a8c08f563323a82ce0784
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Feb 8 13:35:24 2016 +0000
[maven-release-plugin] prepare release slingstart-maven-plugin-1.4.2
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/slingstart-maven-plugin@1729171 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index d21634d..be84220 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
</parent>
<artifactId>slingstart-maven-plugin</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.4.2</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.4.2</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/slingstart-maven-plugin-1.4.2</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/slingstart-maven-plugin-1.4.2</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] 01/08: [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.4.2
in repository https://gitbox.apache.org/repos/asf/sling-slingstart-maven-plugin.git
commit 27b495bee61d5cdc1ed7cef8f8f877e057d88c40
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Jan 4 15:28:47 2016 +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@1722898 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0abf975..d21634d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
</parent>
<artifactId>slingstart-maven-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.4.1-SNAPSHOT</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/tags/slingstart-maven-plugin-1.4.0</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/slingstart-maven-plugin-1.4.0</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/slingstart-maven-plugin-1.4.0</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] 05/08: SLING-5477 : Allow to add an
artifact of the slingstart project to the 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.4.2
in repository https://gitbox.apache.org/repos/asf/sling-slingstart-maven-plugin.git
commit 80b5f0270cbd360b4a6b1223e43c4cb5cb7f513a
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Feb 2 14:21:20 2016 +0000
SLING-5477 : Allow to add an artifact of the slingstart project to the model
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/slingstart-maven-plugin@1728125 13f79535-47bb-0310-9956-ffa450edef68
---
.../sling/maven/slingstart/ModelPreprocessor.java | 7 +++++++
.../sling/maven/slingstart/PreparePackageMojo.java | 18 +++++++++++++++++-
2 files changed, 24 insertions(+), 1 deletion(-)
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 26c8b0f..753714d 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/ModelPreprocessor.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/ModelPreprocessor.java
@@ -179,6 +179,13 @@ public class ModelPreprocessor {
for(final RunMode runMode : feature.getRunModes()) {
for(final ArtifactGroup group : runMode.getArtifactGroups()) {
for(final org.apache.sling.provisioning.model.Artifact a : group) {
+ if ( a.getGroupId().equals(info.project.getGroupId())
+ && a.getArtifactId().equals(info.project.getArtifactId())
+ && a.getVersion().equals(info.project.getVersion()) ) {
+ // skip artifact from the same project
+ env.logger.debug("- skipping dependency " + a.toMvnUrl());
+ continue;
+ }
final Dependency dep = new Dependency();
dep.setGroupId(a.getGroupId());
dep.setArtifactId(a.getArtifactId());
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 d9197d1..f15863e 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/PreparePackageMojo.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/PreparePackageMojo.java
@@ -74,6 +74,7 @@ import org.codehaus.plexus.util.FileUtils;
threadSafe = true
)
public class PreparePackageMojo extends AbstractSlingStartMojo {
+
private static final String ALL_RUNMODES_KEY = "_all_";
private static final String BASE_DESTINATION = "resources";
@@ -252,8 +253,23 @@ public class PreparePackageMojo extends AbstractSlingStartMojo {
throws MojoExecutionException{
for(final ArtifactGroup group : runMode.getArtifactGroups()) {
for(final org.apache.sling.provisioning.model.Artifact a : group) {
- final Artifact artifact = ModelUtils.getArtifact(this.project, this.mavenSession, this.artifactHandlerManager, this.resolver,
+ Artifact artifact = null;
+ if ( a.getGroupId().equals(this.project.getGroupId())
+ && a.getArtifactId().equals(this.project.getArtifactId())
+ && a.getVersion().equals(this.project.getVersion()) ) {
+ for(final Artifact projectArtifact : this.project.getAttachedArtifacts()) {
+ if ( projectArtifact.getClassifier().equals(a.getClassifier()) ) {
+ artifact = projectArtifact;
+ break;
+ }
+ }
+ if ( artifact == null ) {
+ throw new MojoExecutionException("Unable to find artifact from same project: " + a.toMvnUrl());
+ }
+ } else {
+ artifact = ModelUtils.getArtifact(this.project, this.mavenSession, this.artifactHandlerManager, this.resolver,
a.getGroupId(), a.getArtifactId(), a.getVersion(), a.getType(), a.getClassifier());
+ }
File artifactFile = artifact.getFile();
String newBSN = a.getMetadata().get("bundle:rename-bsn");
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-slingstart-maven-plugin] 02/08: Switch to commons osgi 2.4.1
snapshot
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.4.2
in repository https://gitbox.apache.org/repos/asf/sling-slingstart-maven-plugin.git
commit 2e41a1db2820b27ef5ca50c152d1a0c2d8b07c74
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Jan 4 16:12:31 2016 +0000
Switch to commons osgi 2.4.1 snapshot
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/slingstart-maven-plugin@1722908 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index d21634d..caa42a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -171,7 +171,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.osgi</artifactId>
- <version>2.4.0</version>
+ <version>2.4.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.