You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by gn...@apache.org on 2018/02/16 06:57:07 UTC
svn commit: r1824424 - in /aries/trunk/blueprint: blueprint-authz/
blueprint-bundle/ blueprint-cm/ blueprint-compatibility/
blueprint-core-compatibility/ blueprint-core/ blueprint-jexl-evaluator/
blueprint-noosgi/ blueprint-parser/ blueprint-repository...
Author: gnodet
Date: Fri Feb 16 06:57:07 2018
New Revision: 1824424
URL: http://svn.apache.org/viewvc?rev=1824424&view=rev
Log:
Simply and align dev versions
Modified:
aries/trunk/blueprint/blueprint-authz/pom.xml
aries/trunk/blueprint/blueprint-bundle/pom.xml
aries/trunk/blueprint/blueprint-cm/pom.xml
aries/trunk/blueprint/blueprint-compatibility/pom.xml
aries/trunk/blueprint/blueprint-core-compatibility/pom.xml
aries/trunk/blueprint/blueprint-core/pom.xml
aries/trunk/blueprint/blueprint-jexl-evaluator/pom.xml
aries/trunk/blueprint/blueprint-noosgi/pom.xml
aries/trunk/blueprint/blueprint-parser/pom.xml
aries/trunk/blueprint/blueprint-repository/pom.xml
aries/trunk/blueprint/blueprint-spring-extender/pom.xml
aries/trunk/blueprint/blueprint-spring/pom.xml
aries/trunk/blueprint/blueprint-web-osgi/pom.xml
aries/trunk/blueprint/blueprint-web/pom.xml
aries/trunk/blueprint/examples/blueprint-sample-fragment/pom.xml
aries/trunk/blueprint/examples/blueprint-sample-war/pom.xml
aries/trunk/blueprint/examples/blueprint-sample/pom.xml
aries/trunk/blueprint/itests/blueprint-itests/pom.xml
aries/trunk/blueprint/itests/pom.xml
aries/trunk/blueprint/parent/pom.xml
aries/trunk/blueprint/plugin/blueprint-maven-plugin-pax-cdi-handlers/pom.xml
aries/trunk/blueprint/plugin/blueprint-maven-plugin-spring-handlers/pom.xml
aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/BlueprintFileWriterTest.java
Modified: aries/trunk/blueprint/blueprint-authz/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-authz/pom.xml?rev=1824424&r1=1824423&r2=1824424&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-authz/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-authz/pom.xml Fri Feb 16 06:57:07 2018
@@ -43,8 +43,21 @@
<!-- Not exporting any packages -->
<aries.skip.version.check>true</aries.skip.version.check>
+
+ <blueprint.api.version>1.0.0</blueprint.api.version>
+ <blueprint.parser.version>1.0.0</blueprint.parser.version>
</properties>
+ <profiles>
+ <profile>
+ <id>dev</id>
+ <properties>
+ <blueprint.api.version>${blueprint.api.dev.version}</blueprint.api.version>
+ <blueprint.parser.version>${blueprint.parser.dev.version}</blueprint.parser.version>
+ </properties>
+ </profile>
+ </profiles>
+
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-authz</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-authz</developerConnection>
@@ -65,13 +78,13 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.api</artifactId>
- <version>1.0.0</version>
+ <version>${blueprint.api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>blueprint-parser</artifactId>
- <version>1.0.0</version>
+ <version>${blueprint.parser.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: aries/trunk/blueprint/blueprint-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-bundle/pom.xml?rev=1824424&r1=1824423&r2=1824424&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-bundle/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-bundle/pom.xml Fri Feb 16 06:57:07 2018
@@ -104,31 +104,33 @@
</aries.osgi.failok>
<lastReleaseVersion>1.1.0</lastReleaseVersion>
+ <blueprint.api.version>${blueprint.api.dev.version}</blueprint.api.version>
+ <blueprint.core.version>${blueprint.core.dev.version}</blueprint.core.version>
+ <blueprint.cm.version>${blueprint.cm.dev.version}</blueprint.cm.version>
+ <blueprint.parser.version>${blueprint.parser.dev.version}</blueprint.parser.version>
+ <blueprint.authz.version>${blueprint.authz.dev.version}</blueprint.authz.version>
+ <blueprint.spring.version>${blueprint.spring.dev.version}</blueprint.spring.version>
+ <blueprint.spring.extender.version>${blueprint.spring.extender.dev.version}</blueprint.spring.extender.version>
+ <blueprint.jexl.evaluator.version>${blueprint.jexl.evaluator.dev.version}</blueprint.jexl.evaluator.version>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.api</artifactId>
- <version>1.0.2-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint.annotation.api</artifactId>
- <version>1.0.0</version>
+ <version>${blueprint.api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>${blueprint.core.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.cm</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>${blueprint.cm.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: aries/trunk/blueprint/blueprint-cm/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-cm/pom.xml?rev=1824424&r1=1824423&r2=1824424&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-cm/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-cm/pom.xml Fri Feb 16 06:57:07 2018
@@ -56,7 +56,7 @@
</aries.osgi.private.pkg>
<blueprint.api.version>1.0.0</blueprint.api.version>
- <blueprint.core.version>1.8.4-SNAPSHOT</blueprint.core.version>
+ <blueprint.core.version>1.7.0</blueprint.core.version>
<blueprint.parser.version>1.4.0</blueprint.parser.version>
<lastReleaseVersion>1.1.0</lastReleaseVersion>
</properties>
@@ -65,9 +65,16 @@
<profile>
<id>dev</id>
<properties>
- <blueprint.api.version>1.0.1</blueprint.api.version>
- <blueprint.core.version>1.9.0-SNAPSHOT</blueprint.core.version>
- <blueprint.parser.version>1.4.0</blueprint.parser.version>
+ <blueprint.api.version>${blueprint.api.dev.version}</blueprint.api.version>
+ <blueprint.core.version>${blueprint.core.dev.version}</blueprint.core.version>
+ <blueprint.cm.version>${blueprint.cm.dev.version}</blueprint.cm.version>
+ <blueprint.parser.version>${blueprint.parser.dev.version}</blueprint.parser.version>
+ <blueprint.authz.version>${blueprint.authz.dev.version}</blueprint.authz.version>
+ <blueprint.spring.version>${blueprint.spring.dev.version}</blueprint.spring.version>
+ <blueprint.spring.extender.version>${blueprint.spring.extender.dev.version}</blueprint.spring.extender.version>
+ <blueprint.jexl.evaluator.version>${blueprint.jexl.evaluator.dev.version}</blueprint.jexl.evaluator.version>
+ <blueprint.sample.version>${blueprint.sample.dev.version}</blueprint.sample.version>
+ <blueprint.sample.fragment.version>${blueprint.sample.fragment.dev.version}</blueprint.sample.fragment.version>
</properties>
</profile>
</profiles>
@@ -87,7 +94,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
- <version>1.7.0</version>
+ <version>${blueprint.core.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.aries</groupId>
Modified: aries/trunk/blueprint/blueprint-compatibility/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-compatibility/pom.xml?rev=1824424&r1=1824423&r2=1824424&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-compatibility/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-compatibility/pom.xml Fri Feb 16 06:57:07 2018
@@ -58,7 +58,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${blueprint.bundle.dev.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: aries/trunk/blueprint/blueprint-core-compatibility/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core-compatibility/pom.xml?rev=1824424&r1=1824423&r2=1824424&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core-compatibility/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-core-compatibility/pom.xml Fri Feb 16 06:57:07 2018
@@ -51,13 +51,15 @@
org.apache.aries.blueprint.reflect;deprecated="true",
</aries.osgi.export>
<lastReleaseVersion>1.0.0</lastReleaseVersion>
+
+ <blueprint.core.version>1.0.0</blueprint.core.version>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
- <version>1.0.0</version>
+ <version>${blueprint.core.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -100,6 +102,12 @@
<profiles>
<profile>
+ <id>dev</id>
+ <properties>
+ <blueprint.core.version>${blueprint.core.dev.version}</blueprint.core.version>
+ </properties>
+ </profile>
+ <profile>
<id>deploy</id>
<properties>
<createSourcesJar>true</createSourcesJar>
Modified: aries/trunk/blueprint/blueprint-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/pom.xml?rev=1824424&r1=1824423&r2=1824424&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-core/pom.xml Fri Feb 16 06:57:07 2018
@@ -93,7 +93,7 @@
</aries.osgi.include.resource>
<blueprint.annotation.api.version>1.0.0</blueprint.annotation.api.version>
<blueprint.api.version>1.0.0</blueprint.api.version>
- <blueprint.parser.version>1.5.0-SNAPSHOT</blueprint.parser.version>
+ <blueprint.parser.version>1.5.0</blueprint.parser.version>
<proxy.api.version>1.1.0</proxy.api.version>
<proxy.impl.version>1.1.0</proxy.impl.version>
<quiesce.api.version>1.0.0</quiesce.api.version>
@@ -105,13 +105,16 @@
<profile>
<id>dev</id>
<properties>
- <blueprint.annotation.api.version>1.0.1</blueprint.annotation.api.version>
- <blueprint.api.version>1.0.1</blueprint.api.version>
- <blueprint.parser.version>1.5.0-SNAPSHOT</blueprint.parser.version>
- <proxy.api.version>1.1.0</proxy.api.version>
- <proxy.impl.version>1.1.0</proxy.impl.version>
- <quiesce.api.version>1.0.0</quiesce.api.version>
- <util.version>1.1.3</util.version>
+ <blueprint.api.version>${blueprint.api.dev.version}</blueprint.api.version>
+ <blueprint.core.version>${blueprint.core.dev.version}</blueprint.core.version>
+ <blueprint.cm.version>${blueprint.cm.dev.version}</blueprint.cm.version>
+ <blueprint.parser.version>${blueprint.parser.dev.version}</blueprint.parser.version>
+ <blueprint.authz.version>${blueprint.authz.dev.version}</blueprint.authz.version>
+ <blueprint.spring.version>${blueprint.spring.dev.version}</blueprint.spring.version>
+ <blueprint.spring.extender.version>${blueprint.spring.extender.dev.version}</blueprint.spring.extender.version>
+ <blueprint.jexl.evaluator.version>${blueprint.jexl.evaluator.dev.version}</blueprint.jexl.evaluator.version>
+ <blueprint.sample.version>${blueprint.sample.dev.version}</blueprint.sample.version>
+ <blueprint.sample.fragment.version>${blueprint.sample.fragment.dev.version}</blueprint.sample.fragment.version>
</properties>
</profile>
</profiles>
@@ -131,7 +134,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>blueprint-parser</artifactId>
- <version>1.5.0</version>
+ <version>${blueprint.parser.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: aries/trunk/blueprint/blueprint-jexl-evaluator/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-jexl-evaluator/pom.xml?rev=1824424&r1=1824423&r2=1824424&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-jexl-evaluator/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-jexl-evaluator/pom.xml Fri Feb 16 06:57:07 2018
@@ -63,11 +63,21 @@
<profile>
<id>dev</id>
<properties>
- <blueprint.core.version>1.2.0</blueprint.core.version>
+ <blueprint.api.version>${blueprint.api.dev.version}</blueprint.api.version>
+ <blueprint.core.version>${blueprint.core.dev.version}</blueprint.core.version>
+ <blueprint.cm.version>${blueprint.cm.dev.version}</blueprint.cm.version>
+ <blueprint.parser.version>${blueprint.parser.dev.version}</blueprint.parser.version>
+ <blueprint.authz.version>${blueprint.authz.dev.version}</blueprint.authz.version>
+ <blueprint.spring.version>${blueprint.spring.dev.version}</blueprint.spring.version>
+ <blueprint.spring.extender.version>${blueprint.spring.extender.dev.version}</blueprint.spring.extender.version>
+ <blueprint.jexl.evaluator.version>${blueprint.jexl.evaluator.dev.version}</blueprint.jexl.evaluator.version>
+ <blueprint.sample.version>${blueprint.sample.dev.version}</blueprint.sample.version>
+ <blueprint.sample.fragment.version>${blueprint.sample.fragment.dev.version}</blueprint.sample.fragment.version>
</properties>
</profile>
</profiles>
+
<dependencies>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
Modified: aries/trunk/blueprint/blueprint-noosgi/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-noosgi/pom.xml?rev=1824424&r1=1824423&r2=1824424&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-noosgi/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-noosgi/pom.xml Fri Feb 16 06:57:07 2018
@@ -54,9 +54,16 @@
<profile>
<id>dev</id>
<properties>
- <blueprint.api.version>1.0.2-SNAPSHOT</blueprint.api.version>
- <blueprint.core.version>1.8.4-SNAPSHOT</blueprint.core.version>
- <blueprint.parser.version>1.5.0-SNAPSHOT</blueprint.parser.version>
+ <blueprint.api.version>${blueprint.api.dev.version}</blueprint.api.version>
+ <blueprint.core.version>${blueprint.core.dev.version}</blueprint.core.version>
+ <blueprint.cm.version>${blueprint.cm.dev.version}</blueprint.cm.version>
+ <blueprint.parser.version>${blueprint.parser.dev.version}</blueprint.parser.version>
+ <blueprint.authz.version>${blueprint.authz.dev.version}</blueprint.authz.version>
+ <blueprint.spring.version>${blueprint.spring.dev.version}</blueprint.spring.version>
+ <blueprint.spring.extender.version>${blueprint.spring.extender.dev.version}</blueprint.spring.extender.version>
+ <blueprint.jexl.evaluator.version>${blueprint.jexl.evaluator.dev.version}</blueprint.jexl.evaluator.version>
+ <blueprint.sample.version>${blueprint.sample.dev.version}</blueprint.sample.version>
+ <blueprint.sample.fragment.version>${blueprint.sample.fragment.dev.version}</blueprint.sample.fragment.version>
</properties>
</profile>
<profile>
Modified: aries/trunk/blueprint/blueprint-parser/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-parser/pom.xml?rev=1824424&r1=1824423&r2=1824424&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-parser/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-parser/pom.xml Fri Feb 16 06:57:07 2018
@@ -52,7 +52,16 @@
<profile>
<id>dev</id>
<properties>
- <blueprint.api.version>1.0.2-SNAPSHOT</blueprint.api.version>
+ <blueprint.api.version>${blueprint.api.dev.version}</blueprint.api.version>
+ <blueprint.core.version>${blueprint.core.dev.version}</blueprint.core.version>
+ <blueprint.cm.version>${blueprint.cm.dev.version}</blueprint.cm.version>
+ <blueprint.parser.version>${blueprint.parser.dev.version}</blueprint.parser.version>
+ <blueprint.authz.version>${blueprint.authz.dev.version}</blueprint.authz.version>
+ <blueprint.spring.version>${blueprint.spring.dev.version}</blueprint.spring.version>
+ <blueprint.spring.extender.version>${blueprint.spring.extender.dev.version}</blueprint.spring.extender.version>
+ <blueprint.jexl.evaluator.version>${blueprint.jexl.evaluator.dev.version}</blueprint.jexl.evaluator.version>
+ <blueprint.sample.version>${blueprint.sample.dev.version}</blueprint.sample.version>
+ <blueprint.sample.fragment.version>${blueprint.sample.fragment.dev.version}</blueprint.sample.fragment.version>
</properties>
</profile>
</profiles>
Modified: aries/trunk/blueprint/blueprint-repository/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-repository/pom.xml?rev=1824424&r1=1824423&r2=1824424&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-repository/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-repository/pom.xml Fri Feb 16 06:57:07 2018
@@ -35,7 +35,30 @@
<bnd.version>3.1.0</bnd.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<local.index.policy>ALLOWED</local.index.policy>
+
+ <blueprint.api.version>1.0.1</blueprint.api.version>
+ <blueprint.core.version>1.5.0</blueprint.core.version>
+ <blueprint.cm.version>1.0.9</blueprint.cm.version>
</properties>
+
+ <profiles>
+ <profile>
+ <id>dev</id>
+ <properties>
+ <blueprint.api.version>${blueprint.api.dev.version}</blueprint.api.version>
+ <blueprint.core.version>${blueprint.core.dev.version}</blueprint.core.version>
+ <blueprint.cm.version>${blueprint.cm.dev.version}</blueprint.cm.version>
+ <blueprint.parser.version>${blueprint.parser.dev.version}</blueprint.parser.version>
+ <blueprint.authz.version>${blueprint.authz.dev.version}</blueprint.authz.version>
+ <blueprint.spring.version>${blueprint.spring.dev.version}</blueprint.spring.version>
+ <blueprint.spring.extender.version>${blueprint.spring.extender.dev.version}</blueprint.spring.extender.version>
+ <blueprint.jexl.evaluator.version>${blueprint.jexl.evaluator.dev.version}</blueprint.jexl.evaluator.version>
+ <blueprint.sample.version>${blueprint.sample.dev.version}</blueprint.sample.version>
+ <blueprint.sample.fragment.version>${blueprint.sample.fragment.dev.version}</blueprint.sample.fragment.version>
+ </properties>
+ </profile>
+ </profiles>
+
<build>
<plugins>
<plugin>
@@ -84,17 +107,17 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.api</artifactId>
- <version>1.0.1</version>
+ <version>${blueprint.api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
- <version>1.5.0</version>
+ <version>${blueprint.core.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.cm</artifactId>
- <version>1.0.9</version>
+ <version>${blueprint.cm.version}</version>
</dependency>
</dependencies>
</project>
Modified: aries/trunk/blueprint/blueprint-spring-extender/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-spring-extender/pom.xml?rev=1824424&r1=1824423&r2=1824424&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-spring-extender/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-spring-extender/pom.xml Fri Feb 16 06:57:07 2018
@@ -70,9 +70,16 @@
<profile>
<id>dev</id>
<properties>
- <blueprint.api.version>1.0.1</blueprint.api.version>
- <blueprint.core.version>1.8.4-SNAPSHOT</blueprint.core.version>
- <blueprint.parser.version>1.5.0-SNAPSHOT</blueprint.parser.version>
+ <blueprint.api.version>${blueprint.api.dev.version}</blueprint.api.version>
+ <blueprint.core.version>${blueprint.core.dev.version}</blueprint.core.version>
+ <blueprint.cm.version>${blueprint.cm.dev.version}</blueprint.cm.version>
+ <blueprint.parser.version>${blueprint.parser.dev.version}</blueprint.parser.version>
+ <blueprint.authz.version>${blueprint.authz.dev.version}</blueprint.authz.version>
+ <blueprint.spring.version>${blueprint.spring.dev.version}</blueprint.spring.version>
+ <blueprint.spring.extender.version>${blueprint.spring.extender.dev.version}</blueprint.spring.extender.version>
+ <blueprint.jexl.evaluator.version>${blueprint.jexl.evaluator.dev.version}</blueprint.jexl.evaluator.version>
+ <blueprint.sample.version>${blueprint.sample.dev.version}</blueprint.sample.version>
+ <blueprint.sample.fragment.version>${blueprint.sample.fragment.dev.version}</blueprint.sample.fragment.version>
</properties>
</profile>
</profiles>
Modified: aries/trunk/blueprint/blueprint-spring/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-spring/pom.xml?rev=1824424&r1=1824423&r2=1824424&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-spring/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-spring/pom.xml Fri Feb 16 06:57:07 2018
@@ -59,8 +59,8 @@
org.apache.aries.blueprint.spring.Activator
</aries.osgi.activator>
<blueprint.api.version>1.0.0</blueprint.api.version>
- <blueprint.core.version>1.9.0-SNAPSHOT</blueprint.core.version>
- <blueprint.parser.version>1.5.0-SNAPSHOT</blueprint.parser.version>
+ <blueprint.core.version>1.9.0</blueprint.core.version>
+ <blueprint.parser.version>1.5.0</blueprint.parser.version>
<!--
<lastReleaseVersion>1.0.4</lastReleaseVersion>
-->
@@ -70,9 +70,16 @@
<profile>
<id>dev</id>
<properties>
- <blueprint.api.version>1.0.1</blueprint.api.version>
- <blueprint.core.version>1.9.0-SNAPSHOT</blueprint.core.version>
- <blueprint.parser.version>1.5.0-SNAPSHOT</blueprint.parser.version>
+ <blueprint.api.version>${blueprint.api.dev.version}</blueprint.api.version>
+ <blueprint.core.version>${blueprint.core.dev.version}</blueprint.core.version>
+ <blueprint.cm.version>${blueprint.cm.dev.version}</blueprint.cm.version>
+ <blueprint.parser.version>${blueprint.parser.dev.version}</blueprint.parser.version>
+ <blueprint.authz.version>${blueprint.authz.dev.version}</blueprint.authz.version>
+ <blueprint.spring.version>${blueprint.spring.dev.version}</blueprint.spring.version>
+ <blueprint.spring.extender.version>${blueprint.spring.extender.dev.version}</blueprint.spring.extender.version>
+ <blueprint.jexl.evaluator.version>${blueprint.jexl.evaluator.dev.version}</blueprint.jexl.evaluator.version>
+ <blueprint.sample.version>${blueprint.sample.dev.version}</blueprint.sample.version>
+ <blueprint.sample.fragment.version>${blueprint.sample.fragment.dev.version}</blueprint.sample.fragment.version>
</properties>
</profile>
</profiles>
@@ -86,13 +93,13 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>blueprint-parser</artifactId>
- <version>1.5.0</version>
+ <version>${blueprint.parser.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
- <version>1.9.0</version>
+ <version>${blueprint.core.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Modified: aries/trunk/blueprint/blueprint-web-osgi/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-web-osgi/pom.xml?rev=1824424&r1=1824423&r2=1824424&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-web-osgi/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-web-osgi/pom.xml Fri Feb 16 06:57:07 2018
@@ -61,10 +61,19 @@
<profile>
<id>dev</id>
<properties>
- <blueprint.core.version>1.8.4-SNAPSHOT</blueprint.core.version>
+ <blueprint.api.version>${blueprint.api.dev.version}</blueprint.api.version>
+ <blueprint.core.version>${blueprint.core.dev.version}</blueprint.core.version>
+ <blueprint.cm.version>${blueprint.cm.dev.version}</blueprint.cm.version>
+ <blueprint.parser.version>${blueprint.parser.dev.version}</blueprint.parser.version>
+ <blueprint.authz.version>${blueprint.authz.dev.version}</blueprint.authz.version>
+ <blueprint.spring.version>${blueprint.spring.dev.version}</blueprint.spring.version>
+ <blueprint.spring.extender.version>${blueprint.spring.extender.dev.version}</blueprint.spring.extender.version>
+ <blueprint.jexl.evaluator.version>${blueprint.jexl.evaluator.dev.version}</blueprint.jexl.evaluator.version>
+ <blueprint.sample.version>${blueprint.sample.dev.version}</blueprint.sample.version>
+ <blueprint.sample.fragment.version>${blueprint.sample.fragment.dev.version}</blueprint.sample.fragment.version>
</properties>
</profile>
- </profiles>
+ </profiles>
<dependencies>
<dependency>
Modified: aries/trunk/blueprint/blueprint-web/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-web/pom.xml?rev=1824424&r1=1824423&r2=1824424&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-web/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-web/pom.xml Fri Feb 16 06:57:07 2018
@@ -45,17 +45,27 @@
</scm>
<properties>
- <blueprint.nosgi.version>1.1.1</blueprint.nosgi.version>
- <blueprint.parser.version>1.3.1</blueprint.parser.version>
- <lastReleaseVersion>1.0.0</lastReleaseVersion>
+ <blueprint.nosgi.version>1.2.0-SNAPSHOT</blueprint.nosgi.version>
+ <blueprint.parser.version>1.5.0</blueprint.parser.version>
+ <blueprint.noosgi.version>1.1.0</blueprint.noosgi.version>
+ <lastReleaseVersion>1.1.1</lastReleaseVersion>
</properties>
<profiles>
<profile>
<id>dev</id>
<properties>
- <blueprint.nosgi.version>1.1.2-SNAPSHOT</blueprint.nosgi.version>
- <blueprint.parser.version>1.3.2-SNAPSHOT</blueprint.parser.version>
+ <blueprint.api.version>${blueprint.api.dev.version}</blueprint.api.version>
+ <blueprint.core.version>${blueprint.core.dev.version}</blueprint.core.version>
+ <blueprint.cm.version>${blueprint.cm.dev.version}</blueprint.cm.version>
+ <blueprint.parser.version>${blueprint.parser.dev.version}</blueprint.parser.version>
+ <blueprint.authz.version>${blueprint.authz.dev.version}</blueprint.authz.version>
+ <blueprint.spring.version>${blueprint.spring.dev.version}</blueprint.spring.version>
+ <blueprint.spring.extender.version>${blueprint.spring.extender.dev.version}</blueprint.spring.extender.version>
+ <blueprint.jexl.evaluator.version>${blueprint.jexl.evaluator.dev.version}</blueprint.jexl.evaluator.version>
+ <blueprint.noosgi.version>${blueprint.noosgi.dev.version}</blueprint.noosgi.version>
+ <blueprint.sample.version>${blueprint.sample.dev.version}</blueprint.sample.version>
+ <blueprint.sample.fragment.version>${blueprint.sample.fragment.dev.version}</blueprint.sample.fragment.version>
</properties>
</profile>
</profiles>
@@ -64,7 +74,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.noosgi</artifactId>
- <version>${blueprint.nosgi.version}</version>
+ <version>${blueprint.noosgi.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
Modified: aries/trunk/blueprint/examples/blueprint-sample-fragment/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/examples/blueprint-sample-fragment/pom.xml?rev=1824424&r1=1824423&r2=1824424&view=diff
==============================================================================
--- aries/trunk/blueprint/examples/blueprint-sample-fragment/pom.xml (original)
+++ aries/trunk/blueprint/examples/blueprint-sample-fragment/pom.xml Fri Feb 16 06:57:07 2018
@@ -52,8 +52,19 @@
*
</aries.osgi.import>
<aries.osgi.private.pkg />
+
+ <blueprint.api.version>1.0.1</blueprint.api.version>
</properties>
+ <profiles>
+ <profile>
+ <id>dev</id>
+ <properties>
+ <blueprint.api.version>${blueprint.api.dev.version}</blueprint.api.version>
+ </properties>
+ </profile>
+ </profiles>
+
<dependencies>
<dependency>
<groupId>org.eclipse</groupId>
@@ -64,7 +75,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.api</artifactId>
- <version>1.0.0</version>
+ <version>${blueprint.api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
Modified: aries/trunk/blueprint/examples/blueprint-sample-war/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/examples/blueprint-sample-war/pom.xml?rev=1824424&r1=1824423&r2=1824424&view=diff
==============================================================================
--- aries/trunk/blueprint/examples/blueprint-sample-war/pom.xml (original)
+++ aries/trunk/blueprint/examples/blueprint-sample-war/pom.xml Fri Feb 16 06:57:07 2018
@@ -49,6 +49,15 @@
<blueprint.web.version>1.0.0</blueprint.web.version>
</properties>
+ <profiles>
+ <profile>
+ <id>dev</id>
+ <properties>
+ <blueprint.web.version>${blueprint.web.dev.version}</blueprint.web.version>
+ </properties>
+ </profile>
+ </profiles>
+
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Modified: aries/trunk/blueprint/examples/blueprint-sample/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/examples/blueprint-sample/pom.xml?rev=1824424&r1=1824423&r2=1824424&view=diff
==============================================================================
--- aries/trunk/blueprint/examples/blueprint-sample/pom.xml (original)
+++ aries/trunk/blueprint/examples/blueprint-sample/pom.xml Fri Feb 16 06:57:07 2018
@@ -56,8 +56,19 @@
org.osgi.service.blueprint.container
</aries.osgi.import.pkg>
<aries.osgi.private.pkg />
+
+ <blueprint.api.version>1.0.0</blueprint.api.version>
</properties>
+ <profiles>
+ <profile>
+ <id>dev</id>
+ <properties>
+ <blueprint.api.version>${blueprint.api.dev.version}</blueprint.api.version>
+ </properties>
+ </profile>
+ </profiles>
+
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
@@ -67,7 +78,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.api</artifactId>
- <version>1.0.0</version>
+ <version>${blueprint.api.version}</version>
</dependency>
</dependencies>
Modified: aries/trunk/blueprint/itests/blueprint-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/itests/blueprint-itests/pom.xml?rev=1824424&r1=1824423&r2=1824424&view=diff
==============================================================================
--- aries/trunk/blueprint/itests/blueprint-itests/pom.xml (original)
+++ aries/trunk/blueprint/itests/blueprint-itests/pom.xml Fri Feb 16 06:57:07 2018
@@ -44,6 +44,17 @@
<properties>
<exam.version>4.10.0</exam.version>
<url.version>2.2.0</url.version>
+
+ <blueprint.api.version>${blueprint.api.dev.version}</blueprint.api.version>
+ <blueprint.core.version>${blueprint.core.dev.version}</blueprint.core.version>
+ <blueprint.cm.version>${blueprint.cm.dev.version}</blueprint.cm.version>
+ <blueprint.parser.version>${blueprint.parser.dev.version}</blueprint.parser.version>
+ <blueprint.authz.version>${blueprint.authz.dev.version}</blueprint.authz.version>
+ <blueprint.spring.version>${blueprint.spring.dev.version}</blueprint.spring.version>
+ <blueprint.spring.extender.version>${blueprint.spring.extender.dev.version}</blueprint.spring.extender.version>
+ <blueprint.jexl.evaluator.version>${blueprint.jexl.evaluator.dev.version}</blueprint.jexl.evaluator.version>
+ <blueprint.sample.version>${blueprint.sample.dev.version}</blueprint.sample.version>
+ <blueprint.sample.fragment.version>${blueprint.sample.fragment.dev.version}</blueprint.sample.fragment.version>
</properties>
<dependencies>
@@ -56,27 +67,27 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>${blueprint.core.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>blueprint-parser</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>${blueprint.parser.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.authz</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>${blueprint.authz.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.spring</artifactId>
- <version>0.6.0-SNAPSHOT</version>
+ <version>${blueprint.spring.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.spring.extender</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>${blueprint.spring.extender.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
@@ -133,7 +144,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.cm</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>${blueprint.cm.version}</version>
<type>bundle</type>
<scope>compile</scope>
<exclusions>
@@ -147,7 +158,7 @@
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.jexl.evaluator</artifactId>
<scope>test</scope>
- <version>1.0.1-SNAPSHOT</version>
+ <version>${blueprint.jexl.evaluator.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.aries.blueprint</groupId>
@@ -165,7 +176,7 @@
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.sample</artifactId>
<scope>test</scope>
- <version>1.0.1-SNAPSHOT</version>
+ <version>${blueprint.sample.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
@@ -274,7 +285,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.testquiescebundle</artifactId>
- <version>1.0.0</version>
+ <version>${project.version}</version>
<type>bundle</type>
<scope>compile</scope>
<exclusions>
@@ -287,7 +298,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.api</artifactId>
- <version>1.0.0</version>
+ <version>${blueprint.api.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -299,7 +310,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.sample-fragment</artifactId>
- <version>1.0.0</version>
+ <version>${blueprint.sample.fragment.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: aries/trunk/blueprint/itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/itests/pom.xml?rev=1824424&r1=1824423&r2=1824424&view=diff
==============================================================================
--- aries/trunk/blueprint/itests/pom.xml (original)
+++ aries/trunk/blueprint/itests/pom.xml Fri Feb 16 06:57:07 2018
@@ -46,6 +46,21 @@
<module>blueprint-itests</module>
</modules>
+ <properties>
+ <blueprint.api.version>1.0.0</blueprint.api.version>
+ <blueprint.core.version>1.0.0</blueprint.core.version>
+ </properties>
+
+ <profiles>
+ <profile>
+ <id>dev</id>
+ <properties>
+ <blueprint.api.version>${blueprint.api.dev.version}</blueprint.api.version>
+ <blueprint.core.version>${blueprint.core.dev.version}</blueprint.core.version>
+ </properties>
+ </profile>
+ </profiles>
+
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
@@ -54,12 +69,12 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.api</artifactId>
- <version>1.0.0</version>
+ <version>${blueprint.api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
- <version>1.0.0</version>
+ <version>${blueprint.core.version}</version>
</dependency>
</dependencies>
Modified: aries/trunk/blueprint/parent/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/parent/pom.xml?rev=1824424&r1=1824423&r2=1824424&view=diff
==============================================================================
--- aries/trunk/blueprint/parent/pom.xml (original)
+++ aries/trunk/blueprint/parent/pom.xml Fri Feb 16 06:57:07 2018
@@ -43,6 +43,26 @@
<url>http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-parent</url>
</scm>
+ <properties>
+ <blueprint.api.dev.version>1.0.2-SNAPSHOT</blueprint.api.dev.version>
+ <blueprint.core.dev.version>1.9.1-SNAPSHOT</blueprint.core.dev.version>
+ <blueprint.cm.dev.version>1.2.1-SNAPSHOT</blueprint.cm.dev.version>
+ <blueprint.parser.dev.version>1.6.0-SNAPSHOT</blueprint.parser.dev.version>
+ <blueprint.authz.dev.version>1.0.1-SNAPSHOT</blueprint.authz.dev.version>
+ <blueprint.spring.dev.version>1.0.0-SNAPSHOT</blueprint.spring.dev.version>
+ <blueprint.spring.extender.dev.version>1.0.0-SNAPSHOT</blueprint.spring.extender.dev.version>
+ <blueprint.jexl.evaluator.dev.version>1.0.1-SNAPSHOT</blueprint.jexl.evaluator.dev.version>
+ <blueprint.sample.dev.version>1.0.1-SNAPSHOT</blueprint.sample.dev.version>
+ <blueprint.sample.fragment.dev.version>1.0.1-SNAPSHOT</blueprint.sample.fragment.dev.version>
+ <blueprint.noosgi.dev.version>1.2.0-SNAPSHOT</blueprint.noosgi.dev.version>
+ <blueprint.bundle.dev.version>1.3.0-SNAPSHOT</blueprint.bundle.dev.version>
+ <blueprint.web.dev.version>1.1.2-SNAPSHOT</blueprint.web.dev.version>
+ <blueprint-maven-plugin-spi.dev-version>1.1.1-SNAPSHOT</blueprint-maven-plugin-spi.dev-version>
+ <blueprint-maven-plugin-spring-handlers.dev-version>1.0.1-SNAPSHOT</blueprint-maven-plugin-spring-handlers.dev-version>
+ <blueprint-maven-plugin-annotation.dev-version>1.3.1-SNAPSHOT</blueprint-maven-plugin-annotation.dev-version>
+ <blueprint-maven-plugin-pax-cdi-handlers.dev-version>1.0.1-SNAPSHOT</blueprint-maven-plugin-pax-cdi-handlers.dev-version>
+ </properties>
+
<build>
<plugins>
<plugin>
Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-pax-cdi-handlers/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-pax-cdi-handlers/pom.xml?rev=1824424&r1=1824423&r2=1824424&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin-pax-cdi-handlers/pom.xml (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-pax-cdi-handlers/pom.xml Fri Feb 16 06:57:07 2018
@@ -34,11 +34,21 @@
<name>Apache Aries Blueprint Maven Plugin Pax Cdi Handlers</name>
<properties>
- <blueprint-maven-plugin-spi.version>1.0.0</blueprint-maven-plugin-spi.version>
<pax-cdi-api.version>0.8.0</pax-cdi-api.version>
<guava.version>19.0</guava.version>
+
+ <blueprint-maven-plugin-spi.version>1.0.0</blueprint-maven-plugin-spi.version>
</properties>
+ <profiles>
+ <profile>
+ <id>dev</id>
+ <properties>
+ <blueprint-maven-plugin-spi.version>${blueprint-maven-plugin-spi.dev-version}</blueprint-maven-plugin-spi.version>
+ </properties>
+ </profile>
+ </profiles>
+
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-pax-cdi-handlers</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin-pax-cdi-handlers</developerConnection>
Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-spring-handlers/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-spring-handlers/pom.xml?rev=1824424&r1=1824423&r2=1824424&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin-spring-handlers/pom.xml (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-spring-handlers/pom.xml Fri Feb 16 06:57:07 2018
@@ -50,12 +50,24 @@
</plugins>
</build>
+ <properties>
+ <blueprint-maven-plugin-spi.version>1.0.0</blueprint-maven-plugin-spi.version>
+ </properties>
+
+ <profiles>
+ <profile>
+ <id>dev</id>
+ <properties>
+ <blueprint-maven-plugin-spi.version>${blueprint-maven-plugin-spi.dev-version}</blueprint-maven-plugin-spi.version>
+ </properties>
+ </profile>
+ </profiles>
<dependencies>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>blueprint-maven-plugin-spi</artifactId>
- <version>1.0.0</version>
+ <version>${blueprint-maven-plugin-spi.version}</version>
</dependency>
<dependency>
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=1824424&r1=1824423&r2=1824424&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml Fri Feb 16 06:57:07 2018
@@ -64,11 +64,27 @@
<org.apache.aries.blueprint.api.version>1.0.1</org.apache.aries.blueprint.api.version>
<org.apache.aries.blueprint.core.version>1.7.1</org.apache.aries.blueprint.core.version>
+ <org.apache.aries.blueprint.cm.version>1.0.9</org.apache.aries.blueprint.cm.version>
<org.apache.aries.transaction.blueprint.version>1.1.1</org.apache.aries.transaction.blueprint.version>
<org.apache.aries.jpa.blueprint.aries.version>1.0.2</org.apache.aries.jpa.blueprint.aries.version>
- <org.apache.aries.blueprint.cm.version>1.0.9</org.apache.aries.blueprint.cm.version>
</properties>
+ <profiles>
+ <profile>
+ <id>dev</id>
+ <properties>
+ <org.apache.aries.blueprint.api.version>${blueprint.api.dev.version}</org.apache.aries.blueprint.api.version>
+ <org.apache.aries.blueprint.core.version>${blueprint.core.dev.version}</org.apache.aries.blueprint.core.version>
+ <org.apache.aries.blueprint.cm.version>${blueprint.cm.dev.version}</org.apache.aries.blueprint.cm.version>
+
+ <blueprint-maven-plugin-spi.version>${blueprint-maven-plugin-spi.dev-version}</blueprint-maven-plugin-spi.version>
+ <blueprint-maven-plugin-spring-handlers.version>${blueprint-maven-plugin-spring-handlers.dev-version}</blueprint-maven-plugin-spring-handlers.version>
+ <blueprint-maven-plugin-annotation.version>${blueprint-maven-plugin-annotation.dev-version}</blueprint-maven-plugin-annotation.version>
+ <blueprint-maven-plugin-pax-cdi-handlers.version>${blueprint-maven-plugin-pax-cdi-handlers.dev-version}</blueprint-maven-plugin-pax-cdi-handlers.version>
+ </properties>
+ </profile>
+ </profiles>
+
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/plugin/blueprint-maven-plugin</developerConnection>
Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/BlueprintFileWriterTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/BlueprintFileWriterTest.java?rev=1824424&r1=1824423&r2=1824424&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/BlueprintFileWriterTest.java (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/BlueprintFileWriterTest.java Fri Feb 16 06:57:07 2018
@@ -65,11 +65,9 @@ import javax.xml.xpath.XPathFactory;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
import static org.apache.aries.blueprint.plugin.FilteredClassFinder.findClasses;
import static org.junit.Assert.assertEquals;
@@ -641,26 +639,41 @@ public class BlueprintFileWriterTest {
public void generatedXmlIsValid() throws Exception {
Document document = readToDocument(xmlAsBytes, true);
- Source[] schemas = new StreamSource[]{
- new StreamSource(BlueprintFileWriterTest.class.getResourceAsStream("/schema/example.xsd")),
- new StreamSource(BlueprintFileWriterTest.class.getResourceAsStream("/schema/org/apache/aries/blueprint/blueprint.xsd")),
- new StreamSource(BlueprintFileWriterTest.class.getResourceAsStream("/schema/org/apache/aries/blueprint/ext/impl/blueprint-ext.xsd")),
- new StreamSource(BlueprintFileWriterTest.class.getResourceAsStream("/schema/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.1.xsd")),
- new StreamSource(BlueprintFileWriterTest.class.getResourceAsStream("/schema/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.2.xsd")),
- new StreamSource(BlueprintFileWriterTest.class.getResourceAsStream("/schema/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.3.xsd")),
- new StreamSource(BlueprintFileWriterTest.class.getResourceAsStream("/schema/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.4.xsd")),
- new StreamSource(BlueprintFileWriterTest.class.getResourceAsStream("/schema/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.5.xsd")),
- new StreamSource(BlueprintFileWriterTest.class.getResourceAsStream("/schema/org/apache/aries/transaction/parsing/transactionv12.xsd")),
- new StreamSource(BlueprintFileWriterTest.class.getResourceAsStream("/schema/org/apache/aries/jpa/blueprint/namespace/jpa_110.xsd")),
- new StreamSource(BlueprintFileWriterTest.class.getResourceAsStream("/schema/org/apache/aries/blueprint/compendium/cm/blueprint-cm-1.0.0.xsd")),
- new StreamSource(BlueprintFileWriterTest.class.getResourceAsStream("/schema/org/apache/aries/blueprint/compendium/cm/blueprint-cm-1.1.0.xsd")),
- new StreamSource(BlueprintFileWriterTest.class.getResourceAsStream("/schema/org/apache/aries/blueprint/compendium/cm/blueprint-cm-1.3.0.xsd")),
- new StreamSource(BlueprintFileWriterTest.class.getResourceAsStream("/schema/org/apache/aries/blueprint/compendium/cm/blueprint-cm-1.2.0.xsd"))
- };
+ List<String> sources = Arrays.asList(
+ "/schema/example.xsd",
+ "/schema/org/apache/aries/blueprint/blueprint.xsd",
+ "/schema/org/apache/aries/blueprint/ext/impl/blueprint-ext.xsd",
+ "/schema/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.1.xsd",
+ "/schema/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.2.xsd",
+ "/schema/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.3.xsd",
+ "/schema/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.4.xsd",
+ "/schema/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.5.xsd",
+ "/schema/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.0.0.xsd",
+ "/schema/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.1.0.xsd",
+ "/schema/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.2.0.xsd",
+ "/schema/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.3.0.xsd",
+ "/schema/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.4.0.xsd",
+ "/schema/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.5.0.xsd",
+ "/schema/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.6.0.xsd",
+ "/schema/org/apache/aries/blueprint/compendium/cm/blueprint-cm-1.0.0.xsd",
+ "/schema/org/apache/aries/blueprint/compendium/cm/blueprint-cm-1.1.0.xsd",
+ "/schema/org/apache/aries/blueprint/compendium/cm/blueprint-cm-1.2.0.xsd",
+ "/schema/org/apache/aries/blueprint/compendium/cm/blueprint-cm-1.3.0.xsd",
+ "/schema/org/apache/aries/blueprint/compendium/cm/blueprint-cm-1.4.0.xsd",
+ "/schema/org/apache/aries/transaction/parsing/transactionv12.xsd",
+ "/schema/org/apache/aries/jpa/blueprint/namespace/jpa_110.xsd"
+ );
+ List<Source> schemas = new ArrayList<>();
+ for (String source : sources) {
+ InputStream is = BlueprintFileWriterTest.class.getResourceAsStream(source);
+ if (is != null) {
+ schemas.add(new StreamSource(is));
+ }
+ }
Source xmlFile = new DOMSource(document);
SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
- Schema schema = schemaFactory.newSchema(schemas);
+ Schema schema = schemaFactory.newSchema(schemas.toArray(new Source[schemas.size()]));
Validator validator = schema.newValidator();
validator.validate(xmlFile);
}