You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by dj...@apache.org on 2011/12/03 00:36:21 UTC
svn commit: r1209780 - in /aries/trunk/blueprint: blueprint-cm/pom.xml
blueprint-core-compatibility/ blueprint-core-compatibility/pom.xml
blueprint-core/pom.xml pom.xml
Author: djencks
Date: Fri Dec 2 23:36:21 2011
New Revision: 1209780
URL: http://svn.apache.org/viewvc?rev=1209780&view=rev
Log:
ARIES-797 introduce a o.a.a.b.core.compatibility fragment bundle, revert the cm export of ...compendium.cm which I think xbean-blueprint won't need
Added:
aries/trunk/blueprint/blueprint-core-compatibility/
- copied from r1209699, aries/trunk/blueprint/blueprint-compatibility/
aries/trunk/blueprint/blueprint-core-compatibility/pom.xml
- copied, changed from r1209710, aries/trunk/blueprint/blueprint-compatibility/pom.xml
Modified:
aries/trunk/blueprint/blueprint-cm/pom.xml
aries/trunk/blueprint/blueprint-core/pom.xml
aries/trunk/blueprint/pom.xml
Modified: aries/trunk/blueprint/blueprint-cm/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-cm/pom.xml?rev=1209780&r1=1209779&r2=1209780&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-cm/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-cm/pom.xml Fri Dec 2 23:36:21 2011
@@ -41,18 +41,18 @@
</scm>
<properties>
- <aries.osgi.import>
+ <!-- Export package versions are maintained in packageinfo files -->
+ <aries.osgi.export.pkg/>
+ <aries.osgi.import.pkg>
org.apache.aries.*;version="$<range;[==,=+)>",
*
- </aries.osgi.import>
- <!-- Export package versions are maintained in packageinfo files -->
- <aries.osgi.export.pkg>
- org.apache.aries.blueprint.compendium.cm*
- </aries.osgi.export.pkg>
- <aries.osgi.private.pkg />
- </properties>
+ </aries.osgi.import.pkg>
+ <aries.osgi.private.pkg>
+ org.apache.aries.blueprint.compendium.cm
+ </aries.osgi.private.pkg>
+ </properties>
- <dependencies>
+ <dependencies>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.api</artifactId>
Copied: aries/trunk/blueprint/blueprint-core-compatibility/pom.xml (from r1209710, aries/trunk/blueprint/blueprint-compatibility/pom.xml)
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core-compatibility/pom.xml?p2=aries/trunk/blueprint/blueprint-core-compatibility/pom.xml&p1=aries/trunk/blueprint/blueprint-compatibility/pom.xml&r1=1209710&r2=1209780&rev=1209780&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-compatibility/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-core-compatibility/pom.xml Fri Dec 2 23:36:21 2011
@@ -24,19 +24,19 @@
</parent>
<groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint.compatibility</artifactId>
+ <artifactId>org.apache.aries.blueprint.core.compatibility</artifactId>
<packaging>jar</packaging>
- <name>Apache Aries Blueprint Compatiblity Fragment Bundle</name>
+ <name>Apache Aries Blueprint Core Compatiblity Fragment Bundle</name>
<version>0.4.1-SNAPSHOT</version>
<description>
- This bundle contains extra classes and exports to allow Blueprint to be compatible
+ This bundle contains extra classes and exports to allow Blueprint core to be compatible
with previous versions of Blueprint.
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-compatibility</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-compatibility</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-compatibility</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-core-compatibility</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-core-compatibility</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core-compatibility</url>
</scm>
<properties>
@@ -44,14 +44,13 @@
org.apache.aries.blueprint.container;deprecated="true",
org.apache.aries.blueprint.di;deprecated="true",
org.apache.aries.blueprint.reflect;deprecated="true",
- org.apache.aries.blueprint.compendium.cm;deprecated="true",
</aries.osgi.export>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint</artifactId>
+ <artifactId>org.apache.aries.blueprint.core</artifactId>
<version>0.4.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -71,7 +70,7 @@
</executions>
<configuration>
<instructions>
- <Fragment-Host>org.apache.aries.blueprint</Fragment-Host>
+ <Fragment-Host>org.apache.aries.blueprint.core</Fragment-Host>
<Export-Package>${aries.osgi.export}</Export-Package>
<Import-Package>!*</Import-Package>
</instructions>
Modified: aries/trunk/blueprint/blueprint-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/pom.xml?rev=1209780&r1=1209779&r2=1209780&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-core/pom.xml Fri Dec 2 23:36:21 2011
@@ -53,9 +53,6 @@
org.apache.aries.blueprint.ext.evaluator,
org.apache.aries.blueprint.services,
org.apache.aries.blueprint.utils,
- org.apache.aries.blueprint.container;deprecated="true",
- org.apache.aries.blueprint.di;deprecated="true",
- org.apache.aries.blueprint.reflect;deprecated="true",
org.osgi.service.blueprint;version=1.0.0
</aries.osgi.export.pkg>
<!--
Modified: aries/trunk/blueprint/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/pom.xml?rev=1209780&r1=1209779&r2=1209780&view=diff
==============================================================================
--- aries/trunk/blueprint/pom.xml (original)
+++ aries/trunk/blueprint/pom.xml Fri Dec 2 23:36:21 2011
@@ -44,6 +44,7 @@
<module>blueprint-cm</module>
<module>blueprint-bundle</module>
<module>blueprint-compatibility</module>
+ <module>blueprint-core-compatibility</module>
<module>blueprint-jexl-evaluator</module>
<module>blueprint-sample</module>
<module>blueprint-annotation-api</module>