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:45 UTC
[sling-slingstart-maven-plugin] annotated tag
slingstart-maven-plugin-1.7.6 created (now 18fb517)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to annotated tag slingstart-maven-plugin-1.7.6
in repository https://gitbox.apache.org/repos/asf/sling-slingstart-maven-plugin.git.
at 18fb517 (tag)
tagging 6592bf18531e58ebc843587cae2de72265c04426 (commit)
by Carsten Ziegeler
on Tue May 2 14:46:08 2017 +0000
- Log -----------------------------------------------------------------
slingstart-maven-plugin-1.7.6
-----------------------------------------------------------------------
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 9a2a053 [maven-release-plugin] prepare for next development iteration
new 2a3f62d SLING-6819 : Includes are removed from attached model
new 112eb5d Update to prov model 1.8.2
new dbda3a6 [maven-release-plugin] prepare release slingstart-maven-plugin-1.7.6
new 6592bf1 [maven-release-plugin] copy for tag slingstart-maven-plugin-1.7.6
The 167 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/05: Update to prov model 1.8.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.7.6
in repository https://gitbox.apache.org/repos/asf/sling-slingstart-maven-plugin.git
commit 112eb5db2ec46ae2b91b6b6ed070e79281fed0f5
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue May 2 14:45:31 2017 +0000
Update to prov model 1.8.2
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/slingstart-maven-plugin@1793509 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 7f6c5cf..7afcfbb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,7 +110,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.provisioning.model</artifactId>
- <version>1.8.0</version>
+ <version>1.8.2</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
--
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-6819 : Includes are
removed from attached 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.6
in repository https://gitbox.apache.org/repos/asf/sling-slingstart-maven-plugin.git
commit 2a3f62db10c6e6e1b539e12270bbd1a6ceff5d46
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue May 2 13:55:44 2017 +0000
SLING-6819 : Includes are removed from attached model
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/slingstart-maven-plugin@1793494 13f79535-47bb-0310-9956-ffa450edef68
---
.../org/apache/sling/maven/slingstart/ModelPreprocessor.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 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 73770de..5a81cab 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/ModelPreprocessor.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/ModelPreprocessor.java
@@ -159,15 +159,18 @@ public class ModelPreprocessor {
nodeBooleanValue(info.plugin, "allowUnresolvedPomDependencies", false)));
}
+ final Model copyModel = new Model();
+ this.mergeModels(copyModel, info.localModel);
+
// we have to create an effective model to add the dependencies
- final Model effectiveModel = ModelUtility.getEffectiveModel(info.localModel, resolverOptions);
+ final Model effectiveModel = ModelUtility.getEffectiveModel(copyModel, resolverOptions);
- final List<Model> dependencies = searchSlingstartDependencies(env, info, info.localModel, effectiveModel);
+ final List<Model> dependencies = searchSlingstartDependencies(env, info, copyModel, effectiveModel);
info.model = new Model();
for(final Model d : dependencies) {
this.mergeModels(info.model, d);
}
- this.mergeModels(info.model, info.localModel);
+ this.mergeModels(info.model, copyModel);
info.model = ModelUtility.getEffectiveModel(info.model, resolverOptions);
final Map<Traceable, String> errors = ModelUtility.validate(info.model);
--
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.7.6
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.6
in repository https://gitbox.apache.org/repos/asf/sling-slingstart-maven-plugin.git
commit 6592bf18531e58ebc843587cae2de72265c04426
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue May 2 14:46:08 2017 +0000
[maven-release-plugin] copy for tag slingstart-maven-plugin-1.7.6
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/slingstart-maven-plugin-1.7.6@1793511 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] 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.7.6
in repository https://gitbox.apache.org/repos/asf/sling-slingstart-maven-plugin.git
commit 9a2a0536e81f4fa6be85df710c7a471d08c4214d
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Apr 26 06:58:27 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@1792701 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 74bcc9f..7f6c5cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
</parent>
<artifactId>slingstart-maven-plugin</artifactId>
- <version>1.7.4</version>
+ <version>1.7.5-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.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>
+ <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>
<!-- 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] 04/05: [maven-release-plugin]
prepare release slingstart-maven-plugin-1.7.6
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.6
in repository https://gitbox.apache.org/repos/asf/sling-slingstart-maven-plugin.git
commit dbda3a6a13aba04e37da7d5eaba8db60280ada83
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue May 2 14:45:54 2017 +0000
[maven-release-plugin] prepare release slingstart-maven-plugin-1.7.6
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/slingstart-maven-plugin@1793510 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7afcfbb..dbf93c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
</parent>
<artifactId>slingstart-maven-plugin</artifactId>
- <version>1.7.5-SNAPSHOT</version>
+ <version>1.7.6</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.6</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/slingstart-maven-plugin-1.7.6</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/slingstart-maven-plugin-1.7.6</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>.