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:06 UTC
[sling-slingstart-maven-plugin] annotated tag
slingstart-maven-plugin-1.3.4 created (now 4eec7be)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to annotated tag slingstart-maven-plugin-1.3.4
in repository https://gitbox.apache.org/repos/asf/sling-slingstart-maven-plugin.git.
at 4eec7be (tag)
tagging 5a4dbee4862a382666816910a085f15f08422eff (commit)
by Carsten Ziegeler
on Wed Aug 26 14:43:02 2015 +0000
- Log -----------------------------------------------------------------
slingstart-maven-plugin-1.3.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 5a4dbee [maven-release-plugin] copy for tag slingstart-maven-plugin-1.3.4
The 88 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] 01/05: [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.3.4
in repository https://gitbox.apache.org/repos/asf/sling-slingstart-maven-plugin.git
commit 0808f1414c5b37432bf7e8c66fbd8983c99aa872
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Aug 14 08:25:38 2015 +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@1695838 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4939e04..faaa4e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
</parent>
<artifactId>slingstart-maven-plugin</artifactId>
- <version>1.3.2</version>
+ <version>1.3.3-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.3.2</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/slingstart-maven-plugin-1.3.2</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/slingstart-maven-plugin-1.3.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] 04/05: [maven-release-plugin]
prepare release slingstart-maven-plugin-1.3.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.3.4
in repository https://gitbox.apache.org/repos/asf/sling-slingstart-maven-plugin.git
commit b0ca3ad34aed1c18b30504304675ec36e226bd6a
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Aug 26 14:42:49 2015 +0000
[maven-release-plugin] prepare release slingstart-maven-plugin-1.3.4
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/slingstart-maven-plugin@1697948 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index faaa4e9..4bc9715 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
</parent>
<artifactId>slingstart-maven-plugin</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.3.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.3.4</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/slingstart-maven-plugin-1.3.4</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/slingstart-maven-plugin-1.3.4</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] 03/05: SLING-4969 : Store
aggregated model as artifact
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.3.4
in repository https://gitbox.apache.org/repos/asf/sling-slingstart-maven-plugin.git
commit e52e8a2943cc27c2b26705075c1d55b91f167949
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Aug 26 14:32:28 2015 +0000
SLING-4969 : Store aggregated model as artifact
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/slingstart-maven-plugin@1697946 13f79535-47bb-0310-9956-ffa450edef68
---
.../sling/maven/slingstart/DependencyLifecycleParticipant.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java b/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java
index 07651e5..692bc56 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java
@@ -353,10 +353,9 @@ public class DependencyLifecycleParticipant extends AbstractMavenLifecyclePartic
for(final Model d : dependencies) {
ModelUtility.merge(mergingModel, d);
}
- ModelUtility.merge(mergingModel, effectiveModel);
- mergingModel = ModelUtility.getEffectiveModel(mergingModel, new ResolverOptions());
+ ModelUtility.merge(mergingModel, rawModel);
- final Map<Traceable, String> errors = ModelUtility.validate(mergingModel);
+ final Map<Traceable, String> errors = ModelUtility.validate(ModelUtility.getEffectiveModel(mergingModel, new ResolverOptions()));
if ( errors != null ) {
throw new MavenExecutionException("Unable to create model file for " + dep + " : " + errors, (File)null);
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-slingstart-maven-plugin] 02/05: SLING-4969 : Store
aggregated model as artifact
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.3.4
in repository https://gitbox.apache.org/repos/asf/sling-slingstart-maven-plugin.git
commit e3c69675959eff12416b5299fd1d7c1cbb83831a
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Aug 26 14:04:12 2015 +0000
SLING-4969 : Store aggregated model as artifact
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/slingstart-maven-plugin@1697936 13f79535-47bb-0310-9956-ffa450edef68
---
.../apache/sling/maven/slingstart/DependencyLifecycleParticipant.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java b/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java
index 31e2d93..07651e5 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java
@@ -171,7 +171,8 @@ public class DependencyLifecycleParticipant extends AbstractMavenLifecyclePartic
for(final Model d : dependencies) {
ModelUtility.merge(info.model, d);
}
- ModelUtility.merge(info.model, effectiveModel);
+ ModelUtility.merge(info.model, info.localModel);
+ info.localModel = info.model;
info.model = ModelUtility.getEffectiveModel(info.model, resolverOptions);
final Map<Traceable, String> errors = ModelUtility.validate(info.model);
@@ -331,6 +332,7 @@ public class DependencyLifecycleParticipant extends AbstractMavenLifecyclePartic
}
for(final org.apache.sling.provisioning.model.Artifact r : removeList) {
group.remove(r);
+ info.localModel.getFeature(feature.getName()).getRunMode(runMode.getNames()).getArtifactGroup(group.getStartLevel()).remove(r);
}
}
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-slingstart-maven-plugin] 05/05: [maven-release-plugin] copy
for tag slingstart-maven-plugin-1.3.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.3.4
in repository https://gitbox.apache.org/repos/asf/sling-slingstart-maven-plugin.git
commit 5a4dbee4862a382666816910a085f15f08422eff
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Aug 26 14:43:02 2015 +0000
[maven-release-plugin] copy for tag slingstart-maven-plugin-1.3.4
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/slingstart-maven-plugin-1.3.4@1697949 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.