svn commit: r1783474 - in /aries/trunk/blueprint/plugin: blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/bean/ blueprint-maven-plugin/ blueprint-maven-plugin/src/
Author: alien11689 Date: Fri Feb 17 22:08:50 2017 New Revision: 1783474 URL: http://svn.apache.org/viewvc?rev=1783474=rev Log: [ARIES-1685] Add integration tests for BMP Added: aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/bean/packageinfo - copied unchanged from r1781298, aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/referencelistener/packageinfo aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/custom-destination/ (with props) aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/custom-destination/pom.xml aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/custom-destination/src/ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/custom-destination/src/main/ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/custom-destination/src/main/java/ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/custom-destination/src/main/java/p1/ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/custom-destination/src/main/java/p1/T1.java aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/custom-destination/verify.groovy aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/multiple-invocation/ (with props) aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/multiple-invocation/pom.xml aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/multiple-invocation/src/ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/multiple-invocation/src/main/ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/multiple-invocation/src/main/java/ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/multiple-invocation/src/main/java/p1/ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/multiple-invocation/src/main/java/p1/T1.java aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/multiple-invocation/src/main/java/p2/ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/multiple-invocation/src/main/java/p2/T2.java aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/multiple-invocation/verify.groovy aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/scanpath-restrict/ (with props) aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/scanpath-restrict/pom.xml aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/scanpath-restrict/src/ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/scanpath-restrict/src/main/ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/scanpath-restrict/src/main/java/ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/scanpath-restrict/src/main/java/p1/ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/scanpath-restrict/src/main/java/p1/T1.java aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/scanpath-restrict/src/main/java/p2/ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/scanpath-restrict/src/main/java/p2/T2.java aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/scanpath-restrict/src/main/java/p2/inner/ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/scanpath-restrict/src/main/java/p2/inner/T3.java aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/scanpath-restrict/verify.groovy aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/simple-project/ (with props) aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/simple-project/pom.xml aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/simple-project/src/ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/simple-project/src/main/ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/simple-project/src/main/java/ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/simple-project/src/main/java/p1/ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/simple-project/src/main/java/p1/T1.java aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/simple-project/src/main/java/p1/T2.java aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/it/simple-project/verify.groovy Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/ResourceInitializer.java aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/bean/BeanHandler.java aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanRefStore.java aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceWithTypedParameters.java
svn commit: r1783450 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java
Author: alien11689 Date: Fri Feb 17 18:50:43 2017 New Revision: 1783450 URL: http://svn.apache.org/viewvc?rev=1783450=rev Log: [ARIES-1687] Fix recognizing sources change in BMP Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java?rev=1783450=1783449=1783450=diff == --- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java Fri Feb 17 18:50:43 2017 @@ -124,7 +124,7 @@ public class GenerateMojo extends Abstra } private boolean sourcesChanged() { -return !buildContext.hasDelta(new File(project.getCompileSourceRoots().iterator().next())); +return buildContext.hasDelta(new File(project.getCompileSourceRoots().iterator().next())); } private void writeBlueprint(Blueprint blueprint) throws Exception {
svn commit: r1783449 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java
Author: alien11689 Date: Fri Feb 17 18:47:43 2017 New Revision: 1783449 URL: http://svn.apache.org/viewvc?rev=1783449=rev Log: [ARIES-1686] Revert blueprint maven plugin goal Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java?rev=1783449=1783448=1783449=diff == --- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java Fri Feb 17 18:47:43 2017 @@ -47,7 +47,7 @@ import java.util.Set; /** * Generates blueprint from CDI annotations */ -@Mojo(name = "blueprint-write", requiresDependencyResolution = ResolutionScope.COMPILE, +@Mojo(name = "blueprint-generate", requiresDependencyResolution = ResolutionScope.COMPILE, defaultPhase = LifecyclePhase.PROCESS_CLASSES, inheritByDefault = false) public class GenerateMojo extends AbstractMojo {
svn commit: r1783446 - in /aries/trunk/blueprint/plugin: blueprint-maven-plugin-annotation/pom.xml blueprint-maven-plugin/pom.xml
Author: alien11689 Date: Fri Feb 17 18:29:03 2017 New Revision: 1783446 URL: http://svn.apache.org/viewvc?rev=1783446=rev Log: [REVERT] Revert blueprint plugin annotations and blueprint plugin release I have found errors and incompatible changes Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml?rev=1783446=1783445=1783446=diff == --- aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml Fri Feb 17 18:29:03 2017 @@ -28,7 +28,7 @@ org.apache.aries.blueprint blueprint-maven-plugin-annotation bundle -1.1.1-SNAPSHOT +1.1.0-SNAPSHOT Apache Aries Blueprint Maven Plugin Annotations Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml?rev=1783446=1783445=1783446=diff == --- aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml Fri Feb 17 18:29:03 2017 @@ -31,7 +31,7 @@ org.apache.aries.blueprint blueprint-maven-plugin maven-plugin -1.6.1-SNAPSHOT +1.5.1-SNAPSHOT Apache Aries Blueprint Maven Plugin Maven plugin to create blueprint files from annotations @@ -184,7 +184,7 @@ org.apache.aries.blueprint blueprint-maven-plugin-annotation -1.1.0 +1.1.0-SNAPSHOT org.apache.maven
svn commit: r1783443 - /aries/tags/blueprint-maven-plugin-1.6.0/
Author: alien11689 Date: Fri Feb 17 18:20:49 2017 New Revision: 1783443 URL: http://svn.apache.org/viewvc?rev=1783443=rev Log: Rollback release Removed: aries/tags/blueprint-maven-plugin-1.6.0/
svn commit: r1783442 - /aries/tags/blueprint-maven-plugin-annotation-1.1.0/
Author: alien11689 Date: Fri Feb 17 18:20:30 2017 New Revision: 1783442 URL: http://svn.apache.org/viewvc?rev=1783442=rev Log: Rollback release Removed: aries/tags/blueprint-maven-plugin-annotation-1.1.0/
svn commit: r1783437 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml
Author: alien11689 Date: Fri Feb 17 17:33:18 2017 New Revision: 1783437 URL: http://svn.apache.org/viewvc?rev=1783437=rev Log: [maven-release-plugin] prepare for next development iteration Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml?rev=1783437=1783436=1783437=diff == --- aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml Fri Feb 17 17:33:18 2017 @@ -31,7 +31,7 @@ org.apache.aries.blueprint blueprint-maven-plugin maven-plugin -1.6.0 +1.6.1-SNAPSHOT Apache Aries Blueprint Maven Plugin Maven plugin to create blueprint files from annotations @@ -43,12 +43,12 @@ - scm:svn:http://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-1.6.0 + scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin - scm:svn:https://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-1.6.0 + scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin - http://svn.apache.org/viewvc/aries/tags/blueprint-maven-plugin-1.6.0 + http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin
svn commit: r1783435 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml
Author: alien11689 Date: Fri Feb 17 17:33:10 2017 New Revision: 1783435 URL: http://svn.apache.org/viewvc?rev=1783435=rev Log: [maven-release-plugin] prepare release blueprint-maven-plugin-1.6.0 Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml?rev=1783435=1783434=1783435=diff == --- aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml Fri Feb 17 17:33:10 2017 @@ -17,8 +17,7 @@ specific language governing permissions and limitations under the License. --> -http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 @@ -26,13 +25,13 @@ org.apache.aries parent 2.0.1 - + org.apache.aries.blueprint blueprint-maven-plugin maven-plugin -1.5.1-SNAPSHOT +1.6.0 Apache Aries Blueprint Maven Plugin Maven plugin to create blueprint files from annotations @@ -44,12 +43,12 @@ - scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin + scm:svn:http://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-1.6.0 - scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin + scm:svn:https://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-1.6.0 - http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin + http://svn.apache.org/viewvc/aries/tags/blueprint-maven-plugin-1.6.0 @@ -128,7 +127,7 @@ - +
svn commit: r1783436 - /aries/tags/blueprint-maven-plugin-1.6.0/
Author: alien11689 Date: Fri Feb 17 17:33:15 2017 New Revision: 1783436 URL: http://svn.apache.org/viewvc?rev=1783436=rev Log: [maven-release-plugin] copy for tag blueprint-maven-plugin-1.6.0 Added: aries/tags/blueprint-maven-plugin-1.6.0/ (props changed) - copied from r1783435, aries/trunk/blueprint/plugin/blueprint-maven-plugin/ Propchange: aries/tags/blueprint-maven-plugin-1.6.0/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Feb 17 17:33:15 2017 @@ -0,0 +1 @@ +/aries/branches/1.0-prototype/blueprint/plugin/blueprint-maven-plugin:1306564-1337594
svn commit: r1783433 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml
Author: alien11689 Date: Fri Feb 17 17:32:16 2017 New Revision: 1783433 URL: http://svn.apache.org/viewvc?rev=1783433=rev Log: [RELEASE] Bump blueprint annotation version in BMP Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml?rev=1783433=1783432=1783433=diff == --- aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml Fri Feb 17 17:32:16 2017 @@ -185,7 +185,7 @@ org.apache.aries.blueprint blueprint-maven-plugin-annotation -1.0.1-SNAPSHOT +1.1.0 org.apache.maven
svn commit: r1783431 - /aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml
Author: alien11689 Date: Fri Feb 17 17:23:36 2017 New Revision: 1783431 URL: http://svn.apache.org/viewvc?rev=1783431=rev Log: [maven-release-plugin] prepare for next development iteration Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml?rev=1783431=1783430=1783431=diff == --- aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml Fri Feb 17 17:23:36 2017 @@ -28,14 +28,14 @@ org.apache.aries.blueprint blueprint-maven-plugin-annotation bundle -1.1.0 +1.1.1-SNAPSHOT Apache Aries Blueprint Maven Plugin Annotations - scm:svn:http://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-annotation-1.1.0 - scm:svn:https://svn.apache.org/repos/asf/aries/tags/blueprint-maven-plugin-annotation-1.1.0 + scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation + scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation - http://svn.apache.org/viewvc/aries/tags/blueprint-maven-plugin-annotation-1.1.0 + http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation
aries-rsa git commit: [ARIES-1684] Rolling back zookeeper version as it has a known serious issue
Repository: aries-rsa Updated Branches: refs/heads/master 33577884d -> 1c4974c84 [ARIES-1684] Rolling back zookeeper version as it has a known serious issue Project: http://git-wip-us.apache.org/repos/asf/aries-rsa/repo Commit: http://git-wip-us.apache.org/repos/asf/aries-rsa/commit/1c4974c8 Tree: http://git-wip-us.apache.org/repos/asf/aries-rsa/tree/1c4974c8 Diff: http://git-wip-us.apache.org/repos/asf/aries-rsa/diff/1c4974c8 Branch: refs/heads/master Commit: 1c4974c842c8414f138e115ce460d12b3641cc9a Parents: 3357788 Author: Christian SchneiderAuthored: Fri Feb 17 09:20:44 2017 +0100 Committer: Christian Schneider Committed: Fri Feb 17 09:20:44 2017 +0100 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/1c4974c8/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 0dfeeb2..e59a121 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -29,7 +29,7 @@ UTF-8 1.9.0 true -3.4.9 +3.4.7 1.0.0 1.7.14 1.2.6
aries-rsa git commit: [ARIES-1684] Upgrade zookeeper to 3.4.9
Repository: aries-rsa Updated Branches: refs/heads/master 43cb04a08 -> 33577884d [ARIES-1684] Upgrade zookeeper to 3.4.9 Project: http://git-wip-us.apache.org/repos/asf/aries-rsa/repo Commit: http://git-wip-us.apache.org/repos/asf/aries-rsa/commit/33577884 Tree: http://git-wip-us.apache.org/repos/asf/aries-rsa/tree/33577884 Diff: http://git-wip-us.apache.org/repos/asf/aries-rsa/diff/33577884 Branch: refs/heads/master Commit: 33577884d19833780c38d61b7fb2f403044d0804 Parents: 43cb04a Author: Christian SchneiderAuthored: Fri Feb 17 09:01:39 2017 +0100 Committer: Christian Schneider Committed: Fri Feb 17 09:01:39 2017 +0100 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/33577884/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index e59a121..0dfeeb2 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -29,7 +29,7 @@ UTF-8 1.9.0 true -3.4.7 +3.4.9 1.0.0 1.7.14 1.2.6