This is an automated email from the ASF dual-hosted git repository. alien11689 pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/aries.git
commit a5830ec27f77b0f145b56bb0f425a17e14c1b22f Author: Dominik Przybysz <[email protected]> AuthorDate: Mon May 5 20:14:58 2025 +0200 ARIES-2180: Remove dev profile in blueprint --- blueprint/blueprint-authz/pom.xml | 14 ++------ blueprint/blueprint-bundle/pom.xml | 16 ++++----- blueprint/blueprint-cm/pom.xml | 27 +++------------ blueprint/blueprint-compatibility/pom.xml | 4 ++- blueprint/blueprint-core-compatibility/pom.xml | 8 +---- blueprint/blueprint-core/pom.xml | 22 ++---------- blueprint/blueprint-jexl-evaluator/pom.xml | 21 +----------- blueprint/blueprint-noosgi/pom.xml | 40 +++------------------- blueprint/blueprint-parent/pom.xml | 17 --------- blueprint/blueprint-parser/pom.xml | 20 +---------- blueprint/blueprint-repository/pom.xml | 24 ++----------- blueprint/blueprint-spring-camel/pom.xml | 24 ++----------- blueprint/blueprint-spring-extender/pom.xml | 24 ++----------- blueprint/blueprint-spring/pom.xml | 24 ++----------- blueprint/blueprint-web-osgi/pom.xml | 20 +---------- blueprint/blueprint-web/pom.xml | 24 ++----------- blueprint/examples/blueprint-sample-war/pom.xml | 11 +----- blueprint/examples/blueprint-sample/pom.xml | 11 +----- blueprint/itests/blueprint-itests/pom.xml | 19 +++++----- .../blueprint/itests/authz/AuthorizationTest.java | 4 ++- blueprint/itests/pom.xml | 14 ++------ 21 files changed, 57 insertions(+), 331 deletions(-) diff --git a/blueprint/blueprint-authz/pom.xml b/blueprint/blueprint-authz/pom.xml index 69f61614a..1e8b688df 100644 --- a/blueprint/blueprint-authz/pom.xml +++ b/blueprint/blueprint-authz/pom.xml @@ -44,24 +44,14 @@ <!-- 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> + <blueprint.api.version>1.0.2-SNAPSHOT</blueprint.api.version> + <blueprint.parser.version>1.6.2-SNAPSHOT</blueprint.parser.version> <javax.annotation-api.version>1.3.2</javax.annotation-api.version> <osgi.cmpn.version>4.3.1</osgi.cmpn.version> <osgi.core.version>4.3.1</osgi.core.version> <slf4j.version>2.0.17</slf4j.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:git:https://gitbox.apache.org/repos/asf/aries.git</connection> <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/aries.git</developerConnection> diff --git a/blueprint/blueprint-bundle/pom.xml b/blueprint/blueprint-bundle/pom.xml index cec70f97d..78049c3fe 100644 --- a/blueprint/blueprint-bundle/pom.xml +++ b/blueprint/blueprint-bundle/pom.xml @@ -103,14 +103,14 @@ <lastReleaseVersion>1.1.0</lastReleaseVersion> <asm.version>9.8</asm.version> - <blueprint.api.version>${blueprint.api.dev.version}</blueprint.api.version> - <blueprint.authz.version>${blueprint.authz.dev.version}</blueprint.authz.version> - <blueprint.cm.version>${blueprint.cm.dev.version}</blueprint.cm.version> - <blueprint.core.version>${blueprint.core.dev.version}</blueprint.core.version> - <blueprint.jexl.evaluator.version>${blueprint.jexl.evaluator.dev.version}</blueprint.jexl.evaluator.version> - <blueprint.parser.version>${blueprint.parser.dev.version}</blueprint.parser.version> - <blueprint.spring.extender.version>${blueprint.spring.extender.dev.version}</blueprint.spring.extender.version> - <blueprint.spring.version>${blueprint.spring.dev.version}</blueprint.spring.version> + <blueprint.api.version>1.0.2-SNAPSHOT</blueprint.api.version> + <blueprint.authz.version>1.0.1-SNAPSHOT</blueprint.authz.version> + <blueprint.cm.version>1.3.3-SNAPSHOT</blueprint.cm.version> + <blueprint.core.version>1.10.4-SNAPSHOT</blueprint.core.version> + <blueprint.jexl.evaluator.version>1.1.1-SNAPSHOT</blueprint.jexl.evaluator.version> + <blueprint.parser.version>1.6.2-SNAPSHOT</blueprint.parser.version> + <blueprint.spring.extender.version>1.0.0-SNAPSHOT</blueprint.spring.extender.version> + <blueprint.spring.version>1.0.0-SNAPSHOT</blueprint.spring.version> <org.apache.aries.proxy.api.version>1.0.0</org.apache.aries.proxy.api.version> <org.apache.aries.proxy.impl.version>1.0.6</org.apache.aries.proxy.impl.version> <org.apache.aries.quiesce.api.version>1.0.0</org.apache.aries.quiesce.api.version> diff --git a/blueprint/blueprint-cm/pom.xml b/blueprint/blueprint-cm/pom.xml index 4b5f77c72..bbf25d9f2 100644 --- a/blueprint/blueprint-cm/pom.xml +++ b/blueprint/blueprint-cm/pom.xml @@ -57,34 +57,15 @@ </aries.osgi.private.pkg> <lastReleaseVersion>1.1.0</lastReleaseVersion> - <blueprint.api.version>1.0.1</blueprint.api.version> - <blueprint.core.version>1.10.3</blueprint.core.version> - <blueprint.parser.version>1.6.0</blueprint.parser.version> + <blueprint.api.version>1.0.2-SNAPSHOT</blueprint.api.version> + <blueprint.core.version>1.10.4-SNAPSHOT</blueprint.core.version> + <blueprint.parser.version>1.6.2-SNAPSHOT</blueprint.parser.version> <maven-release-plugin.version>3.1.1</maven-release-plugin.version> - <org.apache.aries.blueprint.core.version>1.10.0</org.apache.aries.blueprint.core.version> <osgi.cmpn.version>5.0.0</osgi.cmpn.version> <osgi.core.version>4.3.1</osgi.core.version> <slf4j.version>2.0.17</slf4j.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> - <dependencies> <dependency> <groupId>org.apache.aries.blueprint</groupId> @@ -100,7 +81,7 @@ <dependency> <groupId>org.apache.aries.blueprint</groupId> <artifactId>org.apache.aries.blueprint.core</artifactId> - <version>${org.apache.aries.blueprint.core.version}</version> + <version>${blueprint.core.version}</version> <exclusions> <exclusion> <groupId>org.apache.aries</groupId> diff --git a/blueprint/blueprint-compatibility/pom.xml b/blueprint/blueprint-compatibility/pom.xml index 1f38eeb8c..ab56117ab 100644 --- a/blueprint/blueprint-compatibility/pom.xml +++ b/blueprint/blueprint-compatibility/pom.xml @@ -52,13 +52,15 @@ org.apache.aries.blueprint.compendium.cm;deprecated="true", </aries.osgi.export> <lastReleaseVersion>1.0.0</lastReleaseVersion> + + <org.apache.aries.blueprint.version>1.3.0-SNAPSHOT</org.apache.aries.blueprint.version> </properties> <dependencies> <dependency> <groupId>org.apache.aries.blueprint</groupId> <artifactId>org.apache.aries.blueprint</artifactId> - <version>${blueprint.bundle.dev.version}</version> + <version>${org.apache.aries.blueprint.version}</version> <scope>provided</scope> </dependency> </dependencies> diff --git a/blueprint/blueprint-core-compatibility/pom.xml b/blueprint/blueprint-core-compatibility/pom.xml index 312d9b342..5e276a9ac 100644 --- a/blueprint/blueprint-core-compatibility/pom.xml +++ b/blueprint/blueprint-core-compatibility/pom.xml @@ -52,7 +52,7 @@ </aries.osgi.export> <lastReleaseVersion>1.0.0</lastReleaseVersion> - <blueprint.core.version>1.0.0</blueprint.core.version> + <blueprint.core.version>1.10.4-SNAPSHOT</blueprint.core.version> </properties> <dependencies> @@ -101,12 +101,6 @@ </build> <profiles> - <profile> - <id>dev</id> - <properties> - <blueprint.core.version>${blueprint.core.dev.version}</blueprint.core.version> - </properties> - </profile> <profile> <id>deploy</id> <properties> diff --git a/blueprint/blueprint-core/pom.xml b/blueprint/blueprint-core/pom.xml index ebc6ea19b..ecaf6003a 100644 --- a/blueprint/blueprint-core/pom.xml +++ b/blueprint/blueprint-core/pom.xml @@ -94,8 +94,8 @@ <lastReleaseVersion>1.6.0</lastReleaseVersion> <asm.version>9.8</asm.version> - <blueprint.api.version>1.0.1</blueprint.api.version> - <blueprint.parser.version>1.6.0</blueprint.parser.version> + <blueprint.api.version>1.0.2-SNAPSHOT</blueprint.api.version> + <blueprint.parser.version>1.6.2-SNAPSHOT</blueprint.parser.version> <easymock.version>5.5.0</easymock.version> <maven-release-plugin.version>3.1.1</maven-release-plugin.version> <org.apache.aries.versioning.plugin.version>0.3.1</org.apache.aries.versioning.plugin.version> @@ -109,24 +109,6 @@ <slf4j.version>2.0.17</slf4j.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> - <dependencies> <dependency> <groupId>org.apache.aries.blueprint</groupId> diff --git a/blueprint/blueprint-jexl-evaluator/pom.xml b/blueprint/blueprint-jexl-evaluator/pom.xml index 27bc7f986..3daa69189 100644 --- a/blueprint/blueprint-jexl-evaluator/pom.xml +++ b/blueprint/blueprint-jexl-evaluator/pom.xml @@ -57,30 +57,11 @@ </aries.osgi.private.pkg> <lastReleaseVersion>1.0.0</lastReleaseVersion> - <blueprint.core.version>1.10.0</blueprint.core.version> + <blueprint.core.version>1.10.4-SNAPSHOT</blueprint.core.version> <commons-jexl.version>2.1.1</commons-jexl.version> <slf4j.version>2.0.17</slf4j.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> - - <dependencies> <dependency> <groupId>org.apache.aries.blueprint</groupId> diff --git a/blueprint/blueprint-noosgi/pom.xml b/blueprint/blueprint-noosgi/pom.xml index ece0fe9f5..5ad08a5a0 100644 --- a/blueprint/blueprint-noosgi/pom.xml +++ b/blueprint/blueprint-noosgi/pom.xml @@ -44,39 +44,14 @@ </scm> <properties> - <blueprint-parser.version>1.6.0</blueprint-parser.version> - <blueprint.api.version>1.0.1</blueprint.api.version> - <blueprint.core.version>1.10.0</blueprint.core.version> - <blueprint.parser.version>1.6.0</blueprint.parser.version> + <blueprint.api.version>1.0.2-SNAPSHOT</blueprint.api.version> + <blueprint.core.version>1.10.4-SNAPSHOT</blueprint.core.version> + <blueprint.parser.version>1.6.2-SNAPSHOT</blueprint.parser.version> <org.apache.felix.utils.version>1.11.8</org.apache.felix.utils.version> <proxy.impl.version>1.0.3</proxy.impl.version> <slf4j.version>2.0.17</slf4j.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> - <profile> - <id>apache-release</id> - <properties> - <createSourcesJar>true</createSourcesJar> - </properties> - </profile> - </profiles> - <dependencies> <dependency> <groupId>org.apache.aries.blueprint</groupId> @@ -86,7 +61,7 @@ <dependency> <groupId>org.apache.aries.blueprint</groupId> <artifactId>blueprint-parser</artifactId> - <version>${blueprint-parser.version}</version> + <version>${blueprint.parser.version}</version> <scope>provided</scope> </dependency> <dependency> @@ -104,13 +79,6 @@ </exclusion> </exclusions> </dependency> - <!-- - <dependency> - <groupId>org.apache.aries.proxy</groupId> - <artifactId>org.apache.aries.proxy.impl</artifactId> - <version>${proxy.impl.version}</version> - </dependency> - --> <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.utils</artifactId> diff --git a/blueprint/blueprint-parent/pom.xml b/blueprint/blueprint-parent/pom.xml index 660fcbfae..7bed1b644 100644 --- a/blueprint/blueprint-parent/pom.xml +++ b/blueprint/blueprint-parent/pom.xml @@ -45,23 +45,6 @@ <properties> <apache-rat-plugin.version>0.16.1</apache-rat-plugin.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> - <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.api.dev.version>1.0.2-SNAPSHOT</blueprint.api.dev.version> - <blueprint.authz.dev.version>1.0.1-SNAPSHOT</blueprint.authz.dev.version> - <blueprint.bundle.dev.version>1.3.0-SNAPSHOT</blueprint.bundle.dev.version> - <blueprint.cm.dev.version>1.3.3-SNAPSHOT</blueprint.cm.dev.version> - <blueprint.core.dev.version>1.10.4-SNAPSHOT</blueprint.core.dev.version> - <blueprint.jexl.evaluator.dev.version>1.1.1-SNAPSHOT</blueprint.jexl.evaluator.dev.version> - <blueprint.noosgi.dev.version>2.0.0-SNAPSHOT</blueprint.noosgi.dev.version> - <blueprint.parser.dev.version>1.6.2-SNAPSHOT</blueprint.parser.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.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.web.dev.version>1.1.2-SNAPSHOT</blueprint.web.dev.version> </properties> <build> diff --git a/blueprint/blueprint-parser/pom.xml b/blueprint/blueprint-parser/pom.xml index a579a89ad..051e02a41 100644 --- a/blueprint/blueprint-parser/pom.xml +++ b/blueprint/blueprint-parser/pom.xml @@ -47,28 +47,10 @@ <properties> <lastReleaseVersion>1.4.0</lastReleaseVersion> - <blueprint.api.version>1.0.0</blueprint.api.version> + <blueprint.api.version>1.0.2-SNAPSHOT</blueprint.api.version> <osgi.core.version>4.3.1</osgi.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> - <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> diff --git a/blueprint/blueprint-repository/pom.xml b/blueprint/blueprint-repository/pom.xml index 763046f62..2c7b92ae0 100644 --- a/blueprint/blueprint-repository/pom.xml +++ b/blueprint/blueprint-repository/pom.xml @@ -36,33 +36,15 @@ <local.index.policy>ALLOWED</local.index.policy> <asm.version>9.8</asm.version> - <blueprint.api.version>1.0.1</blueprint.api.version> - <blueprint.cm.version>1.0.9</blueprint.cm.version> - <blueprint.core.version>1.5.0</blueprint.core.version> + <blueprint.api.version>1.0.2-SNAPSHOT</blueprint.api.version> + <blueprint.cm.version>1.3.3-SNAPSHOT</blueprint.cm.version> + <blueprint.core.version>1.10.4-SNAPSHOT</blueprint.core.version> <bnd-indexer-maven-plugin.version>6.4.0</bnd-indexer-maven-plugin.version> <org.apache.aries.proxy.api.version>1.0.1</org.apache.aries.proxy.api.version> <org.apache.aries.proxy.impl.version>1.0.6</org.apache.aries.proxy.impl.version> <org.apache.aries.util.version>2.0.0-SNAPSHOT</org.apache.aries.util.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> diff --git a/blueprint/blueprint-spring-camel/pom.xml b/blueprint/blueprint-spring-camel/pom.xml index 3fd5d6e00..0a61eb9b5 100644 --- a/blueprint/blueprint-spring-camel/pom.xml +++ b/blueprint/blueprint-spring-camel/pom.xml @@ -48,31 +48,13 @@ <lastReleaseVersion>1.0.4</lastReleaseVersion> --> - <blueprint.api.version>1.0.0</blueprint.api.version> - <blueprint.core.version>1.6.2</blueprint.core.version> - <blueprint.parser.version>1.4.0</blueprint.parser.version> + <blueprint.api.version>1.0.2-SNAPSHOT</blueprint.api.version> + <blueprint.core.version>1.10.4-SNAPSHOT</blueprint.core.version> + <blueprint.parser.version>1.6.2-SNAPSHOT</blueprint.parser.version> <camel.version>2.19.0</camel.version> <osgi.core.version>4.3.1</osgi.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> - <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.camel</groupId> diff --git a/blueprint/blueprint-spring-extender/pom.xml b/blueprint/blueprint-spring-extender/pom.xml index 35684782b..3704ec864 100644 --- a/blueprint/blueprint-spring-extender/pom.xml +++ b/blueprint/blueprint-spring-extender/pom.xml @@ -62,9 +62,9 @@ <lastReleaseVersion>1.0.4</lastReleaseVersion> --> - <blueprint.api.version>1.0.0</blueprint.api.version> - <blueprint.core.version>1.6.2</blueprint.core.version> - <blueprint.parser.version>1.4.0</blueprint.parser.version> + <blueprint.api.version>1.0.2-SNAPSHOT</blueprint.api.version> + <blueprint.core.version>1.10.4-SNAPSHOT</blueprint.core.version> + <blueprint.parser.version>1.6.2-SNAPSHOT</blueprint.parser.version> <junit.version>4.13.2</junit.version> <org.apache.felix.utils.version>1.11.8</org.apache.felix.utils.version> <osgi.cmpn.version>5.0.0</osgi.cmpn.version> @@ -73,24 +73,6 @@ <spring.version>5.3.39</spring.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> - <dependencies> <dependency> <groupId>org.apache.aries.blueprint</groupId> diff --git a/blueprint/blueprint-spring/pom.xml b/blueprint/blueprint-spring/pom.xml index 0df4a762b..db4992e22 100644 --- a/blueprint/blueprint-spring/pom.xml +++ b/blueprint/blueprint-spring/pom.xml @@ -62,9 +62,9 @@ <lastReleaseVersion>1.0.4</lastReleaseVersion> --> - <blueprint.api.version>1.0.0</blueprint.api.version> - <blueprint.core.version>1.9.0</blueprint.core.version> - <blueprint.parser.version>1.5.0</blueprint.parser.version> + <blueprint.api.version>1.0.2-SNAPSHOT</blueprint.api.version> + <blueprint.core.version>1.10.4-SNAPSHOT</blueprint.core.version> + <blueprint.parser.version>1.6.2-SNAPSHOT</blueprint.parser.version> <org.apache.felix.utils.version>1.11.8</org.apache.felix.utils.version> <osgi.cmpn.version>4.3.1</osgi.cmpn.version> <osgi.core.version>4.3.1</osgi.core.version> @@ -72,24 +72,6 @@ <spring.version>5.3.39</spring.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> - <dependencies> <dependency> <groupId>org.apache.aries.blueprint</groupId> diff --git a/blueprint/blueprint-web-osgi/pom.xml b/blueprint/blueprint-web-osgi/pom.xml index cab541575..7d95ed1c8 100644 --- a/blueprint/blueprint-web-osgi/pom.xml +++ b/blueprint/blueprint-web-osgi/pom.xml @@ -55,29 +55,11 @@ javax.servlet*;version="[0.0,4)" </aries.osgi.import.pkg> - <blueprint.core.version>1.3.0</blueprint.core.version> + <blueprint.core.version>1.10.4-SNAPSHOT</blueprint.core.version> <geronimo-servlet_2.5_spec.version>1.2</geronimo-servlet_2.5_spec.version> <osgi.core.version>4.3.1</osgi.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> - <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> diff --git a/blueprint/blueprint-web/pom.xml b/blueprint/blueprint-web/pom.xml index c455641fb..f65142fba 100644 --- a/blueprint/blueprint-web/pom.xml +++ b/blueprint/blueprint-web/pom.xml @@ -47,32 +47,12 @@ <properties> <lastReleaseVersion>1.1.1</lastReleaseVersion> - <blueprint.noosgi.version>1.1.0</blueprint.noosgi.version> - <blueprint.nosgi.version>2.0.0-SNAPSHOT</blueprint.nosgi.version> - <blueprint.parser.version>1.5.0</blueprint.parser.version> + <blueprint.noosgi.version>1.2.1-SNAPSHOT</blueprint.noosgi.version> + <blueprint.parser.version>1.6.2-SNAPSHOT</blueprint.parser.version> <geronimo-servlet_2.5_spec.version>1.2</geronimo-servlet_2.5_spec.version> <slf4j.version>2.0.17</slf4j.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.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> - <dependencies> <dependency> <groupId>org.apache.aries.blueprint</groupId> diff --git a/blueprint/examples/blueprint-sample-war/pom.xml b/blueprint/examples/blueprint-sample-war/pom.xml index 8da6c5f48..fd79b988d 100644 --- a/blueprint/examples/blueprint-sample-war/pom.xml +++ b/blueprint/examples/blueprint-sample-war/pom.xml @@ -47,7 +47,7 @@ <context>/</context> <httpPort>8080</httpPort> - <blueprint.web.version>1.0.0</blueprint.web.version> + <blueprint.web.version>1.1.2-SNAPSHOT</blueprint.web.version> <geronimo-servlet_2.5_spec.version>1.2</geronimo-servlet_2.5_spec.version> <jetty-maven-plugin.version>8.1.16.v20140903</jetty-maven-plugin.version> <maven-war-plugin.version>3.4.0</maven-war-plugin.version> @@ -55,15 +55,6 @@ <tomcat7-maven-plugin.version>2.2</tomcat7-maven-plugin.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> diff --git a/blueprint/examples/blueprint-sample/pom.xml b/blueprint/examples/blueprint-sample/pom.xml index 45addc46b..f1a4cd708 100644 --- a/blueprint/examples/blueprint-sample/pom.xml +++ b/blueprint/examples/blueprint-sample/pom.xml @@ -57,19 +57,10 @@ </aries.osgi.import.pkg> <aries.osgi.private.pkg/> - <blueprint.api.version>1.0.0</blueprint.api.version> + <blueprint.api.version>1.0.2-SNAPSHOT</blueprint.api.version> <osgi.core.version>4.3.1</osgi.core.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> diff --git a/blueprint/itests/blueprint-itests/pom.xml b/blueprint/itests/blueprint-itests/pom.xml index bced00274..f3d9a5877 100644 --- a/blueprint/itests/blueprint-itests/pom.xml +++ b/blueprint/itests/blueprint-itests/pom.xml @@ -43,16 +43,15 @@ <properties> <asm.version>9.8</asm.version> - <blueprint.api.version>${blueprint.api.dev.version}</blueprint.api.version> - <blueprint.authz.version>${blueprint.authz.dev.version}</blueprint.authz.version> - <blueprint.cm.version>${blueprint.cm.dev.version}</blueprint.cm.version> - <blueprint.core.version>${blueprint.core.dev.version}</blueprint.core.version> - <blueprint.jexl.evaluator.version>${blueprint.jexl.evaluator.dev.version}</blueprint.jexl.evaluator.version> - <blueprint.parser.version>${blueprint.parser.dev.version}</blueprint.parser.version> - <blueprint.sample.fragment.version>${blueprint.sample.fragment.dev.version}</blueprint.sample.fragment.version> - <blueprint.sample.version>${blueprint.sample.dev.version}</blueprint.sample.version> - <blueprint.spring.extender.version>${blueprint.spring.extender.dev.version}</blueprint.spring.extender.version> - <blueprint.spring.version>${blueprint.spring.dev.version}</blueprint.spring.version> + <blueprint.api.version>1.0.2-SNAPSHOT</blueprint.api.version> + <blueprint.authz.version>1.0.1-SNAPSHOT</blueprint.authz.version> + <blueprint.cm.version>1.3.3-SNAPSHOT</blueprint.cm.version> + <blueprint.core.version>1.10.4-SNAPSHOT</blueprint.core.version> + <blueprint.jexl.evaluator.version>1.1.1-SNAPSHOT</blueprint.jexl.evaluator.version> + <blueprint.parser.version>1.6.2-SNAPSHOT</blueprint.parser.version> + <blueprint.spring.extender.version>1.0.0-SNAPSHOT</blueprint.spring.extender.version> + <blueprint.spring.version>1.0.0-SNAPSHOT</blueprint.spring.version> + <blueprint.sample.version>1.0.1-SNAPSHOT</blueprint.sample.version> <commons-jexl.version>2.1.1</commons-jexl.version> <depends-maven-plugin.version>1.5.0</depends-maven-plugin.version> <maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version> diff --git a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/authz/AuthorizationTest.java b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/authz/AuthorizationTest.java index c73fd774f..0bca8d792 100644 --- a/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/authz/AuthorizationTest.java +++ b/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/authz/AuthorizationTest.java @@ -32,7 +32,9 @@ import javax.security.auth.login.LoginException; import org.apache.aries.blueprint.itests.AbstractBlueprintIntegrationTest; import org.apache.aries.blueprint.itests.Helper; import org.apache.aries.blueprint.itests.authz.helper.JAASHelper; -import org.apache.aries.blueprint.itests.authz.testbundle.SecuredService; +import org.apache.aries.blueprint.itests.authz.testbundle. + + SecuredService; import org.apache.aries.blueprint.itests.authz.testbundle.impl.SecuredServiceImpl; import org.junit.Test; import org.ops4j.pax.exam.CoreOptions; diff --git a/blueprint/itests/pom.xml b/blueprint/itests/pom.xml index 682d84ec2..9ae59a961 100644 --- a/blueprint/itests/pom.xml +++ b/blueprint/itests/pom.xml @@ -47,21 +47,11 @@ </modules> <properties> - <blueprint.api.version>1.0.0</blueprint.api.version> - <blueprint.core.version>1.0.0</blueprint.core.version> + <blueprint.api.version>1.0.2-SNAPSHOT</blueprint.api.version> + <blueprint.core.version>1.10.4-SNAPSHOT</blueprint.core.version> <osgi.core.version>4.3.1</osgi.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>
