You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by zo...@apache.org on 2011/03/18 21:47:11 UTC
svn commit: r1083059 [2/4] - in /aries/trunk: ./ application/
application/application-api/ application/application-bundle/
application/application-converters/
application/application-default-local-platform/
application/application-deployment-management...
Modified: aries/trunk/blueprint/blueprint-annotation-impl/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-annotation-impl/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-annotation-impl/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-annotation-impl/pom.xml Fri Mar 18 20:47:07 2011
@@ -19,19 +19,28 @@
<project xmlns="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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>blueprint</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java5-parent</artifactId>
+ <version>0.4</version>
+ <relativePath />
</parent>
+ <groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.annotation.impl</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries Blueprint Annotation Impl</name>
+ <version>0.3.2-SNAPSHOT</version>
<description>
This bundle contains the core implementation of Blueprint
along with the "ext" namespace handler.
</description>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-annotation-impl</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-annotation-impl</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-annotation-impl</url>
+ </scm>
+
<properties>
<aries.osgi.activator>
org.apache.aries.blueprint.annotation.impl.Activator
@@ -41,24 +50,25 @@
org.apache.aries.blueprint.annotation.impl
</aries.osgi.export.pkg>
<aries.osgi.import>
- !org.apache.aries.blueprint.jaxb.*,
- !org.apache.aries.blueprint.annotation.impl,
org.apache.aries.blueprint.annotation,
*
</aries.osgi.import>
<aries.osgi.export.service>
org.apache.aries.blueprint.annotation.AnnotationScannerService
</aries.osgi.export.service>
+ <aries.osgi.private.pkg />
</properties>
<dependencies>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.annotation.api</artifactId>
+ <version>0.3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
+ <version>0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -88,11 +98,19 @@
<groupId>asm</groupId>
<artifactId>asm-all</artifactId>
<optional>true</optional>
+ <version>3.2</version>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-finder</artifactId>
+ <version>3.7</version>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</project>
Modified: aries/trunk/blueprint/blueprint-annotation-itest/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-annotation-itest/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-annotation-itest/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-annotation-itest/pom.xml Fri Mar 18 20:47:07 2011
@@ -19,18 +19,27 @@
<project xmlns="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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>blueprint</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java5-parent</artifactId>
+ <version>0.4</version>
+ <relativePath />
</parent>
+ <groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.annotation.itests</artifactId>
<name>Apache Aries Blueprint Annotation iTests</name>
+ <version>0.3.2-SNAPSHOT</version>
<description>
Integration tests using the standalone blueprint-bundle for the implementation
and blueprint-sample-annotation for the blueprint application to be tested.
</description>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-annotation-itests</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-annotation-itests</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-annotation-itests</url>
+ </scm>
+
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
@@ -51,36 +60,42 @@
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
<scope>test</scope>
+ <version>0.3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
<scope>test</scope>
+ <version>0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.sample</artifactId>
<scope>test</scope>
+ <version>0.3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.sample-annotation</artifactId>
- <version>${project.version}</version>
+ <version>0.3.2-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.testbundlea</artifactId>
<scope>test</scope>
+ <version>0.3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.testbundleb</artifactId>
<scope>test</scope>
+ <version>0.3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
@@ -112,9 +127,19 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
+ <version>1.2.4</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
@@ -135,19 +160,23 @@
<groupId>asm</groupId>
<artifactId>asm-all</artifactId>
<scope>test</scope>
+ <version>3.2</version>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-finder</artifactId>
<scope>test</scope>
+ <version>3.7</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.annotation.api</artifactId>
+ <version>0.3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.annotation.impl</artifactId>
+ <version>0.3.2-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: aries/trunk/blueprint/blueprint-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-api/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-api/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-api/pom.xml Fri Mar 18 20:47:07 2011
@@ -17,27 +17,36 @@
<project xmlns="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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>blueprint</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java5-parent</artifactId>
+ <version>0.4</version>
+ <relativePath />
</parent>
+ <groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.api</artifactId>
<packaging>bundle</packaging>
+ <version>0.3.2-SNAPSHOT</version>
<name>Apache Aries Blueprint API</name>
<description>
This bundle contains the blueprint api 1.0.1 and the corresponding xml schema.
</description>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-api</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-api</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-api</url>
+ </scm>
+
<properties>
<!-- Export package versions are maintained in packageinfo files -->
<aries.osgi.export.pkg>
org.osgi.service.blueprint*
</aries.osgi.export.pkg>
<aries.osgi.import>
- !org.osgi.service.blueprint*,
*
</aries.osgi.import>
+ <aries.osgi.private.pkg />
</properties>
<dependencies>
Modified: aries/trunk/blueprint/blueprint-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-bundle/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-bundle/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-bundle/pom.xml Fri Mar 18 20:47:07 2011
@@ -17,19 +17,28 @@
<project xmlns="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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>blueprint</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java5-parent</artifactId>
+ <version>0.4</version>
+ <relativePath />
</parent>
+ <groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries Blueprint Bundle</name>
+ <version>0.3.2-SNAPSHOT</version>
<description>
This bundle contains the standalone implementation along with the API.
It's composed of the blueprint-api, blueprint-core and blueprint-cm modules.
</description>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint</url>
+ </scm>
+
<properties>
<aries.osgi.symbolic.name>
${project.artifactId};blueprint.graceperiod:=false
@@ -81,18 +90,22 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.api</artifactId>
+ <version>0.3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
+ <version>0.3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.cm</artifactId>
+ <version>0.3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -100,6 +113,7 @@
<artifactId>asm-all</artifactId>
<scope>test</scope>
<optional>true</optional>
+ <version>3.2</version>
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
@@ -115,6 +129,7 @@
<groupId>org.apache.aries.quiesce</groupId>
<artifactId>org.apache.aries.quiesce.api</artifactId>
<scope>provided</scope>
+ <version>0.3.1-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: aries/trunk/blueprint/blueprint-cm/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-cm/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-cm/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-cm/pom.xml Fri Mar 18 20:47:07 2011
@@ -19,29 +19,40 @@
<project xmlns="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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>blueprint</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java5-parent</artifactId>
+ <version>0.4</version>
+ <relativePath />
</parent>
+ <groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.cm</artifactId>
<packaging>bundle</packaging>
+ <version>0.3.2-SNAPSHOT</version>
<name>Apache Aries Blueprint CM</name>
<description>
This bundle contains the ConfigAdmin namespace for blueprint.
</description>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-cm</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-cm</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-cm</url>
+ </scm>
+
<properties>
<!-- 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>
<dependencies>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
+ <version>0.3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Modified: aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/packageinfo?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/packageinfo (original)
+++ aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/packageinfo Fri Mar 18 20:47:07 2011
@@ -16,4 +16,4 @@
# specific language governing permissions and limitations
# under the License.
#
-version 0.4.0
+version 0.3.2
Modified: aries/trunk/blueprint/blueprint-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-core/pom.xml Fri Mar 18 20:47:07 2011
@@ -19,19 +19,27 @@
<project xmlns="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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>blueprint</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java5-parent</artifactId>
+ <version>0.4</version>
+ <relativePath />
</parent>
+ <groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries Blueprint Core</name>
+ <version>0.3.2-SNAPSHOT</version>
<description>
This bundle contains the core implementation of Blueprint
along with the "ext" namespace handler.
</description>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-core</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-core</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core</url>
+ </scm>
<properties>
<aries.osgi.activator>
org.apache.aries.blueprint.container.BlueprintExtender
@@ -51,6 +59,7 @@
org.apache.aries.quiesce.participant;version="[0.2,1.0)";resolution:=optional,
*
</aries.osgi.import>
+ <aries.osgi.private.pkg />
<aries.osgi.export.service>
org.apache.aries.blueprint.ParserService
</aries.osgi.export.service>
@@ -60,15 +69,18 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.api</artifactId>
+ <version>0.3</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.annotation.api</artifactId>
<optional>true</optional>
+ <version>0.3</version>
</dependency>
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
+ <version>0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -98,20 +110,30 @@
<groupId>asm</groupId>
<artifactId>asm-all</artifactId>
<optional>true</optional>
+ <version>3.2</version>
</dependency>
<dependency>
<groupId>org.apache.aries.quiesce</groupId>
<artifactId>org.apache.aries.quiesce.api</artifactId>
<scope>provided</scope>
+ <version>0.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
+ <version>0.3</version>
</dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy.api</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
Modified: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/di/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/di/packageinfo?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/di/packageinfo (original)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/di/packageinfo Fri Mar 18 20:47:07 2011
@@ -16,4 +16,4 @@
# specific language governing permissions and limitations
# under the License.
#
-version 0.4.0
+version 0.3.0
Modified: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/packageinfo?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/packageinfo (original)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/packageinfo Fri Mar 18 20:47:07 2011
@@ -16,4 +16,4 @@
# specific language governing permissions and limitations
# under the License.
#
-version 0.4.0
+version 0.3.0
Modified: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/mutable/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/mutable/packageinfo?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/mutable/packageinfo (original)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/mutable/packageinfo Fri Mar 18 20:47:07 2011
@@ -16,4 +16,4 @@
# specific language governing permissions and limitations
# under the License.
#
-version 0.4.0
+version 0.3.2
Modified: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/namespace/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/namespace/packageinfo?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/namespace/packageinfo (original)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/namespace/packageinfo Fri Mar 18 20:47:07 2011
@@ -16,4 +16,4 @@
# specific language governing permissions and limitations
# under the License.
#
-version 0.4.0
+version 0.3.2
Modified: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/packageinfo?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/packageinfo (original)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/packageinfo Fri Mar 18 20:47:07 2011
@@ -16,4 +16,4 @@
# specific language governing permissions and limitations
# under the License.
#
-version 0.4.0
+version 0.3.2
Modified: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/packageinfo?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/packageinfo (original)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/packageinfo Fri Mar 18 20:47:07 2011
@@ -16,4 +16,4 @@
# specific language governing permissions and limitations
# under the License.
#
-version 0.4.0
+version 0.3.0
Modified: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/reflect/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/reflect/packageinfo?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/reflect/packageinfo (original)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/reflect/packageinfo Fri Mar 18 20:47:07 2011
@@ -16,4 +16,4 @@
# specific language governing permissions and limitations
# under the License.
#
-version 0.4.0
+version 0.3.2
Modified: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/packageinfo?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/packageinfo (original)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/packageinfo Fri Mar 18 20:47:07 2011
@@ -16,4 +16,4 @@
# specific language governing permissions and limitations
# under the License.
#
-version 0.4.0
+version 0.3.2
Modified: aries/trunk/blueprint/blueprint-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-itests/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-itests/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-itests/pom.xml Fri Mar 18 20:47:07 2011
@@ -19,18 +19,27 @@
<project xmlns="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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>blueprint</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java5-parent</artifactId>
+ <version>0.4</version>
+ <relativePath />
</parent>
+ <groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.itests</artifactId>
<name>Apache Aries Blueprint iTests</name>
+ <version>0.3.2-SNAPSHOT</version>
<description>
Integration tests using the standalone blueprint-bundle for the implementation
and blueprint-sample for the blueprint application to be tested.
</description>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-itests</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-itests</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-itests</url>
+ </scm>
+
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
@@ -51,31 +60,37 @@
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
<scope>test</scope>
+ <version>0.3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
<scope>test</scope>
+ <version>0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.sample</artifactId>
<scope>test</scope>
+ <version>0.3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.testbundlea</artifactId>
<scope>test</scope>
+ <version>0.3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.testbundleb</artifactId>
<scope>test</scope>
+ <version>0.3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<scope>test</scope>
+ <version>0.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
@@ -110,6 +125,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
<scope>test</scope>
+ <version>1.2.4</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
@@ -130,35 +146,38 @@
<groupId>asm</groupId>
<artifactId>asm-all</artifactId>
<scope>test</scope>
+ <version>3.2</version>
</dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.quiesce</groupId>
<artifactId>org.apache.aries.quiesce.api</artifactId>
<type>bundle</type>
<scope>provided</scope>
+ <version>0.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.testquiescebundle</artifactId>
- <version>${project.version}</version>
+ <version>0.3.2-SNAPSHOT</version>
<type>bundle</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
- <version>${project.version}</version>
+ <version>0.3.2-SNAPSHOT</version>
<type>bundle</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.cm</artifactId>
- <version>${project.version}</version>
+ <version>0.3.2-SNAPSHOT</version>
<type>bundle</type>
<scope>compile</scope>
</dependency>
Modified: aries/trunk/blueprint/blueprint-sample-annotation/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-sample-annotation/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-sample-annotation/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-sample-annotation/pom.xml Fri Mar 18 20:47:07 2011
@@ -17,18 +17,27 @@
<project xmlns="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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>blueprint</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java5-parent</artifactId>
+ <version>0.4</version>
+ <relativePath />
</parent>
+ <groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.sample-annotation</artifactId>
<name>Apache Aries Blueprint Sample for Testing Annotation</name>
+ <version>0.3.2-SNAPSHOT</version>
<packaging>bundle</packaging>
<description>
Example blueprint application, mostly used for annotation tests.
</description>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-sample-annotation</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-sample-annotation</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-sample-annotation</url>
+ </scm>
+
<properties>
<aries.osgi.export>
org.apache.aries.blueprint.sample;-noimport:=true
@@ -40,6 +49,7 @@
org.apache.aries.blueprint.annotation,
*
</aries.osgi.import>
+ <aries.osgi.private.pkg />
</properties>
<dependencies>
@@ -51,11 +61,12 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.api</artifactId>
+ <version>0.3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.annotation.api</artifactId>
- <version>${project.version}</version>
+ <version>0.3.2-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: aries/trunk/blueprint/blueprint-sample/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-sample/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-sample/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-sample/pom.xml Fri Mar 18 20:47:07 2011
@@ -17,18 +17,27 @@
<project xmlns="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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>blueprint</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java5-parent</artifactId>
+ <version>0.4</version>
+ <relativePath />
</parent>
+ <groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.sample</artifactId>
<name>Apache Aries Blueprint Sample</name>
<packaging>bundle</packaging>
+ <version>0.3.2-SNAPSHOT</version>
<description>
Example blueprint application, mostly used for integration tests.
</description>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-sample</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-sample</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-sample</url>
+ </scm>
+
<properties>
<aries.osgi.export>
org.apache.aries.blueprint.sample;-noimport:=true
@@ -36,6 +45,9 @@
<aries.osgi.activator>
org.apache.aries.blueprint.sample.Activator
</aries.osgi.activator>
+ <aries.osgi.private.pkg />
+ <aries.osgi.import.pkg > *
+ </aries.osgi.import.pkg>
</properties>
<dependencies>
@@ -47,6 +59,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.api</artifactId>
+ <version>0.3.2-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: aries/trunk/blueprint/blueprint-testbundlea/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-testbundlea/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-testbundlea/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-testbundlea/pom.xml Fri Mar 18 20:47:07 2011
@@ -18,19 +18,30 @@
<modelVersion>4.0.0</modelVersion>
<description>Blueprint Test Bundle A, provides NamespaceHandler, BeanProcessor etc implementations for Test Bundle B</description>
<parent>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>blueprint</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java5-parent</artifactId>
+ <version>0.4</version>
+ <relativePath />
</parent>
+ <groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.testbundlea</artifactId>
<name>Apache Aries Blueprint Test Bundle A</name>
+ <version>0.3.2-SNAPSHOT</version>
<packaging>bundle</packaging>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/testbundlea</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/testbundlea</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/blueprint/testbundlea</url>
+ </scm>
+
<properties>
<aries.osgi.activator>
org.apache.aries.blueprint.testbundlea.Activator
</aries.osgi.activator>
+ <aries.osgi.private.pkg />
+ <aries.osgi.export.pkg>${project.artifactId}*</aries.osgi.export.pkg>
</properties>
<dependencies>
@@ -42,10 +53,12 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.api</artifactId>
+ <version>0.3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
+ <version>0.3.2-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: aries/trunk/blueprint/blueprint-testbundleb/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-testbundleb/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-testbundleb/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-testbundleb/pom.xml Fri Mar 18 20:47:07 2011
@@ -18,19 +18,30 @@
<modelVersion>4.0.0</modelVersion>
<description>Blueprint Test Bundle B, tests namespace handlers, bean processors etc provided by Test Bundle A</description>
<parent>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>blueprint</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java5-parent</artifactId>
+ <version>0.4</version>
+ <relativePath />
</parent>
+ <groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.testbundleb</artifactId>
<name>Apache Aries Blueprint Test Bundle B</name>
+ <version>0.3.2-SNAPSHOT</version>
<packaging>bundle</packaging>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/testbundleb</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/testbundleb</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/blueprint/testbundleb</url>
+ </scm>
+
<properties>
<aries.osgi.activator>
org.apache.aries.blueprint.testbundleb.Activator
</aries.osgi.activator>
+ <aries.osgi.private.pkg />
+ <aries.osgi.export.pkg>${project.artifactId}*</aries.osgi.export.pkg>
</properties>
<dependencies>
@@ -42,14 +53,17 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.api</artifactId>
+ <version>0.3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.testbundlea</artifactId>
+ <version>0.3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
+ <version>0.3.2-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: aries/trunk/blueprint/blueprint-testquiescebundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-testquiescebundle/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-testquiescebundle/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-testquiescebundle/pom.xml Fri Mar 18 20:47:07 2011
@@ -18,19 +18,31 @@
<modelVersion>4.0.0</modelVersion>
<description>Blueprint Test Quiesce Bundle, tests the blueprint participant for the quiesce functionality.</description>
<parent>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>blueprint</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java5-parent</artifactId>
+ <version>0.4</version>
+ <relativePath />
</parent>
+ <groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.testquiescebundle</artifactId>
<name>Apache Aries Blueprint Test Quiesce Bundle</name>
<packaging>bundle</packaging>
+ <version>0.3.2-SNAPSHOT</version>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/testquiescebundle</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/testquiescebundle</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/blueprint/testquiescebundle</url>
+ </scm>
<properties>
<aries.osgi.activator>
org.apache.aries.blueprint.testquiescebundle.Activator
</aries.osgi.activator>
+ <aries.osgi.private.pkg />
+ <aries.osgi.import.pkg> *
+ </aries.osgi.import.pkg>
+ <aries.osgi.export.pkg>${project.artifactId}*</aries.osgi.export.pkg>
</properties>
<dependencies>
@@ -42,10 +54,12 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.api</artifactId>
+ <version>0.3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
+ <version>0.3.2-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: aries/trunk/blueprint/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/blueprint/pom.xml (original)
+++ aries/trunk/blueprint/pom.xml Fri Mar 18 20:47:07 2011
@@ -20,181 +20,21 @@
<parent>
<groupId>org.apache.aries</groupId>
- <artifactId>java6-parent</artifactId>
+ <artifactId>java5-parent</artifactId>
<version>0.4</version>
- <relativePath>../parent/default-parent/java5-parent/pom.xml</relativePath>
+ <relativePath />
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>blueprint</artifactId>
<name>Apache Aries Blueprint</name>
- <version>0.4-SNAPSHOT</version>
<packaging>pom</packaging>
<description>
Implementation of the Blueprint Container Specification
</description>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/blueprint</url>
- </scm>
-
- <dependencyManagement>
- <dependencies>
- <!-- internal dependencies -->
- <dependency>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint.api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint.core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint.cm</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint.annotation.api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint.annotation.impl</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint.sample</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint.testbundlea</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint.testbundleb</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint.testquiescebundle</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint.itests</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <!-- external dependencies -->
- <dependency>
- <groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.util</artifactId>
- <version>0.4-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.quiesce</groupId>
- <artifactId>org.apache.aries.quiesce.api</artifactId>
- <version>0.4-SNAPSHOT</version>
- <type>bundle</type>
- <scope>provided</scope>
- </dependency>
-
- <!-- TODO: We need felix 2.0.0 which is not supported by pax exam yet,
- so tests are only enabled on equinox for now
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.main</artifactId>
- <version>2.0.0</version>
- </dependency>-->
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.2.4</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm-all</artifactId>
- <version>3.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-finder</artifactId>
- <version>3.7</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.quiesce</groupId>
- <artifactId>org.apache.aries.quiesce.api</artifactId>
- <version>0.4-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.testsupport</groupId>
- <artifactId>org.apache.aries.testsupport.unit</artifactId>
- <version>0.4-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.proxy</groupId>
- <artifactId>org.apache.aries.proxy.api</artifactId>
- <version>0.4-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.proxy</groupId>
- <artifactId>org.apache.aries.proxy</artifactId>
- <version>0.4-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.0</version>
- <configuration>
- <useReleaseProfile>false</useReleaseProfile>
- <goals>deploy</goals>
- <arguments>-Papache-release -DskipTests=true</arguments>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
<modules>
<module>blueprint-api</module>
Modified: aries/trunk/eba-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/eba-maven-plugin/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/eba-maven-plugin/pom.xml (original)
+++ aries/trunk/eba-maven-plugin/pom.xml Fri Mar 18 20:47:07 2011
@@ -26,11 +26,11 @@ under the License.
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
<version>0.4</version>
- <relativePath />
+ <relativePath>../parent/default-parent/java5-parent/pom.xml</relativePath>
</parent>
<artifactId>eba-maven-plugin</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Aries Maven EBA Plugin</name>
Modified: aries/trunk/jmx/jmx-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-api/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-api/pom.xml (original)
+++ aries/trunk/jmx/jmx-api/pom.xml Fri Mar 18 20:47:07 2011
@@ -17,18 +17,26 @@
<project xmlns="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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries.jmx</groupId>
- <artifactId>jmx</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java5-parent</artifactId>
+ <version>0.4</version>
+ <relativePath />
</parent>
+ <groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.api</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries JMX API</name>
+ <version>0.3.1-SNAPSHOT</version>
<description>
This bundle contains the JMX 1.0.0 API
</description>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jmx/jmx-api</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jmx/jmx-api</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-api</url>
+ </scm>
<properties>
<!-- Export package versions are maintained in packageinfo files -->
@@ -41,9 +49,9 @@
org.osgi.jmx.service.useradmin;uses:="org.osgi.jmx,javax.management.openmbean"
</aries.osgi.export.pkg>
<aries.osgi.import>
- !org.osgi.jmx*,
*
</aries.osgi.import>
+ <aries.osgi.private.pkg />
</properties>
</project>
Modified: aries/trunk/jmx/jmx-blueprint-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-blueprint-api/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-blueprint-api/pom.xml (original)
+++ aries/trunk/jmx/jmx-blueprint-api/pom.xml Fri Mar 18 20:47:07 2011
@@ -17,23 +17,35 @@
<project xmlns="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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries.jmx</groupId>
- <artifactId>jmx</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java5-parent</artifactId>
+ <version>0.4</version>
+ <relativePath />
</parent>
+ <groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.blueprint.api</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries JMX Blueprint API</name>
+ <version>0.3.1-SNAPSHOT</version>
<description>
This bundle contains the JMX Blueprint API
</description>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jmx/jmx-blueprint-api</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jmx/jmx-blueprint-api</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-blueprint-api</url>
+ </scm>
+
<properties>
<!-- Export package versions are maintained in packageinfo files -->
<aries.osgi.export.pkg>
org.apache.aries.jmx.blueprint
</aries.osgi.export.pkg>
+ <aries.osgi.import.pkg> *
+ </aries.osgi.import.pkg>
+ <aries.osgi.private.pkg />
</properties>
</project>
Modified: aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/packageinfo?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/packageinfo (original)
+++ aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/packageinfo Fri Mar 18 20:47:07 2011
@@ -16,4 +16,4 @@
# specific language governing permissions and limitations
# under the License.
#
-version 0.4.0
+version 0.3.0
Modified: aries/trunk/jmx/jmx-blueprint-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-blueprint-bundle/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-blueprint-bundle/pom.xml (original)
+++ aries/trunk/jmx/jmx-blueprint-bundle/pom.xml Fri Mar 18 20:47:07 2011
@@ -17,18 +17,27 @@
<project xmlns="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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries.jmx</groupId>
- <artifactId>jmx</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java5-parent</artifactId>
+ <version>0.4</version>
+ <relativePath />
</parent>
+ <groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.blueprint</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries JMX Blueprint Bundle</name>
+ <version>0.3.1-SNAPSHOT</version>
<description>
This bundle contains the standalone implementation of the along with the API.
</description>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jmx/jmx-blueprint</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jmx/jmx-blueprint</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-blueprint</url>
+ </scm>
+
<properties>
<aries.osgi.activator>
org.apache.aries.jmx.blueprint.impl.Activator
@@ -60,10 +69,12 @@
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.blueprint.api</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.blueprint.core</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Modified: aries/trunk/jmx/jmx-blueprint-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-blueprint-core/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-blueprint-core/pom.xml (original)
+++ aries/trunk/jmx/jmx-blueprint-core/pom.xml Fri Mar 18 20:47:07 2011
@@ -17,18 +17,27 @@
<project xmlns="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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries.jmx</groupId>
- <artifactId>jmx</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java5-parent</artifactId>
+ <version>0.4</version>
+ <relativePath />
</parent>
+ <groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.blueprint.core</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries JMX Blueprint Core</name>
+ <version>0.3.1-SNAPSHOT</version>
<description>
This bundle contains the core implementation of the JMX Blueprint API
</description>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jmx/jmx-blueprint-core</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jmx/jmx-blueprint-core</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-blueprint-core</url>
+ </scm>
+
<properties>
<aries.osgi.activator>
org.apache.aries.jmx.blueprint.impl.Activator
@@ -49,10 +58,12 @@
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.blueprint.api</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
+ <version>0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -81,11 +92,13 @@
<dependency>
<groupId>org.jmock</groupId>
<artifactId>jmock-junit4</artifactId>
+ <version>2.5.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jmock</groupId>
<artifactId>jmock-legacy</artifactId>
+ <version>2.5.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: aries/trunk/jmx/jmx-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-bundle/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-bundle/pom.xml (original)
+++ aries/trunk/jmx/jmx-bundle/pom.xml Fri Mar 18 20:47:07 2011
@@ -17,18 +17,26 @@
<project xmlns="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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries.jmx</groupId>
- <artifactId>jmx</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java5-parent</artifactId>
+ <version>0.4</version>
+ <relativePath />
</parent>
+ <groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries JMX Bundle</name>
+ <version>0.3.1-SNAPSHOT</version>
<description>
This bundle contains the standalone implementation of the along with the API.
</description>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jmx/jmx</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jmx/jmx</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/jmx/jmx</url>
+ </scm>
<properties>
<aries.osgi.activator>
org.apache.aries.jmx.Activator
@@ -76,10 +84,12 @@
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.api</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.core</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Modified: aries/trunk/jmx/jmx-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-core/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-core/pom.xml (original)
+++ aries/trunk/jmx/jmx-core/pom.xml Fri Mar 18 20:47:07 2011
@@ -17,19 +17,28 @@
<project xmlns="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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries.jmx</groupId>
- <artifactId>jmx</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java5-parent</artifactId>
+ <version>0.4</version>
+ <relativePath />
</parent>
+ <groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.core</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries JMX Core</name>
+ <version>0.3.1-SNAPSHOT</version>
<description>
This bundle contains the core implementation
of the JMX Control specification
</description>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jmx/jmx-core</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jmx/jmx-core</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-core</url>
+ </scm>
+
<properties>
<aries.osgi.activator>
org.apache.aries.jmx.Activator
@@ -67,6 +76,7 @@
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.api</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -81,12 +91,20 @@
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
+ <version>0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<scope>test</scope>
+ <version>1.8.2</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
+
</dependencies>
</project>
Modified: aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/packageinfo?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/packageinfo (original)
+++ aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/packageinfo Fri Mar 18 20:47:07 2011
@@ -16,4 +16,4 @@
# specific language governing permissions and limitations
# under the License.
#
-version 0.4.0
+version 0.3.0
Modified: aries/trunk/jmx/jmx-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-itests/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-itests/pom.xml (original)
+++ aries/trunk/jmx/jmx-itests/pom.xml Fri Mar 18 20:47:07 2011
@@ -17,33 +17,38 @@
<project xmlns="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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries.jmx</groupId>
- <artifactId>jmx</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java5-parent</artifactId>
+ <version>0.4</version>
+ <relativePath />
</parent>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.itests</artifactId>
<packaging>jar</packaging>
<name>Apache Aries JMX integration tests</name>
+ <version>0.3.1-SNAPSHOT</version>
<description>
Integration tests for the JMX component (using the standalone composite jmx-bundle)
</description>
- <!--
- pluginRepositories> <pluginRepository> <id>ops4j.releases</id>
- <url>http://repository.ops4j.org/maven2</url> <snapshots> <enabled>false</enabled>
- </snapshots> </pluginRepository> </pluginRepositories -->
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jmx/jmx-itests</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jmx/jmx-itests</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-itests</url>
+ </scm>
<dependencies>
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.blueprint</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -59,31 +64,46 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.sample</artifactId>
+ <version>0.3.2-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>asm</groupId>
<artifactId>asm-all</artifactId>
+ <version>3.2</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
+ <version>1.2.4</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
+ <version>0.4-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
+ <version>0.3.2-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: aries/trunk/jmx/jmx-whiteboard/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-whiteboard/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-whiteboard/pom.xml (original)
+++ aries/trunk/jmx/jmx-whiteboard/pom.xml Fri Mar 18 20:47:07 2011
@@ -17,14 +17,17 @@
<project xmlns="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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries.jmx</groupId>
- <artifactId>jmx</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java5-parent</artifactId>
+ <version>0.4</version>
+ <relativePath />
</parent>
+ <groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.whiteboard</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries Whiteboard support for JMX DynamicMBean services</name>
+ <version>0.3.1-SNAPSHOT</version>
<description>
This bundle implements whiteboard pattern support for DynamicMBean
services registered with the OSGi service registry. Each DynamicMBean
Modified: aries/trunk/jmx/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/jmx/pom.xml (original)
+++ aries/trunk/jmx/pom.xml Fri Mar 18 20:47:07 2011
@@ -22,142 +22,17 @@
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
<version>0.4</version>
- <relativePath>../parent/default-parent/java5-parent/pom.xml</relativePath>
+ <relativePath />
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>jmx</artifactId>
<name>Apache Aries JMX</name>
- <version>0.4-SNAPSHOT</version>
<packaging>pom</packaging>
- <description>Implementation of the JMX Management Model Specification</description>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jmx</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jmx</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/jmx</url>
- </scm>
-
- <dependencyManagement>
- <dependencies>
- <!-- internal dependencies -->
- <dependency>
- <groupId>org.apache.aries.jmx</groupId>
- <artifactId>org.apache.aries.jmx.api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jmx</groupId>
- <artifactId>org.apache.aries.jmx.core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jmx</groupId>
- <artifactId>org.apache.aries.jmx.blueprint.api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jmx</groupId>
- <artifactId>org.apache.aries.jmx.blueprint.core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jmx</groupId>
- <artifactId>org.apache.aries.jmx</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jmx</groupId>
- <artifactId>org.apache.aries.jmx.blueprint</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <!-- external dependencies -->
- <dependency>
- <groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.util</artifactId>
- <version>0.4-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.proxy</groupId>
- <artifactId>org.apache.aries.proxy</artifactId>
- <version>0.4-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm-all</artifactId>
- <version>3.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint</artifactId>
- <version>0.4-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint.sample</artifactId>
- <version>0.4-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.2.4</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock-junit4</artifactId>
- <version>2.5.1</version>
- </dependency>
- <dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock-legacy</artifactId>
- <version>2.5.1</version>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.8.2</version>
- </dependency>
-
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.0</version>
- <configuration>
- <useReleaseProfile>false</useReleaseProfile>
- <goals>deploy</goals>
- <arguments>-Papache-release -DskipTests=true</arguments>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
+ <description>Implementation of the JMX Management Model Specification - reactor pom</description>
<modules>
<module>jmx-api</module>
Modified: aries/trunk/jndi/jndi-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-api/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-api/pom.xml (original)
+++ aries/trunk/jndi/jndi-api/pom.xml Fri Mar 18 20:47:07 2011
@@ -17,14 +17,23 @@
<project xmlns="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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>jndi</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java5-parent</artifactId>
+ <version>0.4</version>
+ <relativePath />
</parent>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-api</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-api</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-api</url>
+ </scm>
+
+ <groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.api</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries JNDI API</name>
+ <version>0.3.1-SNAPSHOT</version>
<description>
This bundle contains the JNDI 1.0.0 API
</description>
@@ -39,9 +48,9 @@
org.apache.aries.jndi.spi
</aries.osgi.export.pkg>
<aries.osgi.import>
- !org.osgi.service.jndi*,
*
</aries.osgi.import>
+ <aries.osgi.private.pkg />
</properties>
</project>
Modified: aries/trunk/jndi/jndi-api/src/main/java/org/apache/aries/jndi/api/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-api/src/main/java/org/apache/aries/jndi/api/packageinfo?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-api/src/main/java/org/apache/aries/jndi/api/packageinfo (original)
+++ aries/trunk/jndi/jndi-api/src/main/java/org/apache/aries/jndi/api/packageinfo Fri Mar 18 20:47:07 2011
@@ -16,4 +16,4 @@
# specific language governing permissions and limitations
# under the License.
#
-version 0.4.0
+version 0.3.0
Modified: aries/trunk/jndi/jndi-api/src/main/java/org/apache/aries/jndi/spi/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-api/src/main/java/org/apache/aries/jndi/spi/packageinfo?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-api/src/main/java/org/apache/aries/jndi/spi/packageinfo (original)
+++ aries/trunk/jndi/jndi-api/src/main/java/org/apache/aries/jndi/spi/packageinfo Fri Mar 18 20:47:07 2011
@@ -16,4 +16,4 @@
# specific language governing permissions and limitations
# under the License.
#
-version 0.4.0
+version 0.3.0
Modified: aries/trunk/jndi/jndi-api/src/main/java/org/apache/aries/jndi/urls/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-api/src/main/java/org/apache/aries/jndi/urls/packageinfo?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-api/src/main/java/org/apache/aries/jndi/urls/packageinfo (original)
+++ aries/trunk/jndi/jndi-api/src/main/java/org/apache/aries/jndi/urls/packageinfo Fri Mar 18 20:47:07 2011
@@ -16,4 +16,4 @@
# specific language governing permissions and limitations
# under the License.
#
-version 0.4.0
+version 0.3.0
Modified: aries/trunk/jndi/jndi-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-bundle/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-bundle/pom.xml (original)
+++ aries/trunk/jndi/jndi-bundle/pom.xml Fri Mar 18 20:47:07 2011
@@ -17,19 +17,28 @@
<project xmlns="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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>jndi</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java5-parent</artifactId>
+ <version>0.4</version>
+ <relativePath />
</parent>
+ <groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries JNDI Bundle</name>
+ <version>0.3.1-SNAPSHOT</version>
<description>
This bundle contains the core JNDI along with the OSGi url handler.
It's composed of the jndi-api, jndi-core and jndi-url modules.
</description>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jndi/jndi</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jndi/jndi</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/jndi/jndi</url>
+ </scm>
+
<properties>
<!-- Export package versions are maintained in packageinfo files -->
<aries.osgi.export.pkg>
@@ -53,18 +62,17 @@
<dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.core</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.url</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
</dependency>
-<!-- <dependency>
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>org.apache.aries.jndi.rmi</artifactId>
- </dependency>-->
<dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.api</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Modified: aries/trunk/jndi/jndi-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-core/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-core/pom.xml (original)
+++ aries/trunk/jndi/jndi-core/pom.xml Fri Mar 18 20:47:07 2011
@@ -19,18 +19,27 @@
<project xmlns="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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>jndi</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java5-parent</artifactId>
+ <version>0.4</version>
+ <relativePath />
</parent>
+ <groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.core</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries JNDI Core</name>
+ <version>0.3.1-SNAPSHOT</version>
<description>
This bundle contains the core of JNDI support for OSGi.
</description>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-core</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-core</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-core</url>
+ </scm>
+
<properties>
<aries.osgi.private.pkg>
org.apache.aries.jndi,
@@ -40,6 +49,7 @@
<aries.osgi.activator>
org.apache.aries.jndi.startup.Activator
</aries.osgi.activator>
+ <aries.osgi.export.pkg />
</properties>
<dependencies>
@@ -47,6 +57,7 @@
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.api</artifactId>
<scope>provided</scope>
+ <version>0.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -66,12 +77,19 @@
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<scope>test</scope>
+ <version>0.3</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</project>