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 [3/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/jndi/jndi-legacy-support/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-legacy-support/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-legacy-support/pom.xml (original)
+++ aries/trunk/jndi/jndi-legacy-support/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.legacy.support</artifactId>
<packaging>bundle</packaging>
+ <version>0.3.1-SNAPSHOT</version>
<name>Apache Aries JNDI Support for Legacy Runtimes</name>
<description>
This bundle contains support for legacy runtimes which rely on the thread context classloader to load JNDI implementations. It is intended for use with OSGi Web Container implementations which do not correctly work with the OSGi JNDI Service specification.
</description>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-legacy-support</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-legacy-support</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-legacy-support</url>
+ </scm>
+
<properties>
<aries.osgi.export.pkg/>
<aries.osgi.private.pkg>
@@ -39,6 +48,8 @@
<aries.osgi.activator>
org.apache.aries.jndi.legacy.support.Activator
</aries.osgi.activator>
+ <aries.osgi.import.pkg> *
+ </aries.osgi.import.pkg>
</properties>
<dependencies>
Modified: aries/trunk/jndi/jndi-rmi/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-rmi/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-rmi/pom.xml (original)
+++ aries/trunk/jndi/jndi-rmi/pom.xml Fri Mar 18 20:47:07 2011
@@ -19,22 +19,33 @@
<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.rmi</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries JNDI RMI Handler</name>
+ <version>0.3.1-SNAPSHOT</version>
<description>
This bundle contains the JNDI RMI handler
</description>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-rmi</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-rmi</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-rmi</url>
+ </scm>
+
<properties>
<aries.osgi.activator>
org.apache.aries.jndi.rmi.Activator
</aries.osgi.activator>
+ <aries.osgi.private.pkg />
+ <aries.osgi.export.pkg>${project.artifactId}*</aries.osgi.export.pkg>
</properties>
<dependencies>
@@ -42,10 +53,12 @@
<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.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
+ <version>0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Added: aries/trunk/jndi/jndi-rmi/src/main/java/org/apache/aries/jndi/rmi/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-rmi/src/main/java/org/apache/aries/jndi/rmi/packageinfo?rev=1083059&view=auto
==============================================================================
--- aries/trunk/jndi/jndi-rmi/src/main/java/org/apache/aries/jndi/rmi/packageinfo (added)
+++ aries/trunk/jndi/jndi-rmi/src/main/java/org/apache/aries/jndi/rmi/packageinfo Fri Mar 18 20:47:07 2011
@@ -0,0 +1,19 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+version 0.3.1
Modified: aries/trunk/jndi/jndi-url-itest-biz/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url-itest-biz/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-url-itest-biz/pom.xml (original)
+++ aries/trunk/jndi/jndi-url-itest-biz/pom.xml Fri Mar 18 20:47:07 2011
@@ -22,28 +22,30 @@
<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.url.itest.biz</artifactId>
<name>Apache Aries JNDI "business logic" test bundle for Aries jndi-url iTests</name>
+ <version>0.3.1-SNAPSHOT</version>
<packaging>bundle</packaging>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-url-itest-biz</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-url-itest-biz</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url-itest-biz</url>
+ </scm>
+
+ <properties>
+ <aries.osgi.import.pkg>*
+ </aries.osgi.import.pkg>
+ <aries.osgi.private.pkg>*
+ </aries.osgi.private.pkg>
+ <aries.osgi.export />
+ </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Private-Package>*</Private-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Modified: aries/trunk/jndi/jndi-url-itest-web/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url-itest-web/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-url-itest-web/pom.xml (original)
+++ aries/trunk/jndi/jndi-url-itest-web/pom.xml Fri Mar 18 20:47:07 2011
@@ -22,20 +22,41 @@
<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.url.itest.web</artifactId>
<name>Apache Aries JNDI Test Bundle for Aries jndi-url iTests</name>
+ <version>0.3.1-SNAPSHOT</version>
<packaging>bundle</packaging>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-url-itest-web</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-url-itest-web</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url-itest-web</url>
+ </scm>
+
+ <properties>
+ <aries.osgi.private.pkg>
+ org.apache.aries.jndiurl.itest,
+ org.apache.aries.jndiurl.itest.beans
+ </aries.osgi.private.pkg>
+ <aries.osgi.import.pkg>
+ javax.servlet*;version=2.5,
+ *
+ </aries.osgi.import.pkg>
+ <aries.osgi.export.pkg />
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <version>1.2</version>
</dependency>
</dependencies>
@@ -47,15 +68,6 @@
<configuration>
<instructions>
<Web-ContextPath>/jndiUrlItest</Web-ContextPath>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Private-Package>
- org.apache.aries.jndiurl.itest,
- org.apache.aries.jndiurl.itest.beans
- </Private-Package>
- <Import-Package>
- javax.servlet*;version=2.5,
- *
- </Import-Package>
</instructions>
</configuration>
</plugin>
Modified: aries/trunk/jndi/jndi-url-itest/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url-itest/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-url-itest/pom.xml (original)
+++ aries/trunk/jndi/jndi-url-itest/pom.xml Fri Mar 18 20:47:07 2011
@@ -19,17 +19,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.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.url.itest</artifactId>
<name>Apache Aries JNDI iTests for jndi-url</name>
+ <version>0.3.1-SNAPSHOT</version>
<description>
Integration test for JNDI
</description>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-url-itest</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-url-itest</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url-itest</url>
+ </scm>
+
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
@@ -53,29 +62,34 @@
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
<scope>test</scope>
+ <version>0.3</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</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.url.itest.web</artifactId>
<scope>test</scope>
+ <version>0.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.url.itest.biz</artifactId>
<scope>test</scope>
+ <version>0.3.1-SNAPSHOT</version>
</dependency>
<dependency>
@@ -140,12 +154,14 @@
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.cglib</artifactId>
<scope>test</scope>
+ <version>2.1_3_4</version>
</dependency>
<dependency>
<groupId>asm</groupId>
<artifactId>asm-all</artifactId>
<scope>test</scope>
+ <version>3.2</version>
</dependency>
<dependency>
@@ -170,47 +186,41 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
<scope>test</scope>
+ <version>1.2</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.web</groupId>
<artifactId>pax-web-extender-war</artifactId>
<scope>test</scope>
+ <version>0.8.1</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.web</groupId>
<artifactId>pax-web-jetty-bundle</artifactId>
<scope>test</scope>
+ <version>0.8.1</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.fileinstall</artifactId>
<scope>test</scope>
+ <version>2.0.8</version>
</dependency>
<dependency>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.util</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi</artifactId>
<scope>test</scope>
+ <version>0.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.url</artifactId>
<scope>test</scope>
+ <version>0.3.1-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: aries/trunk/jndi/jndi-url/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-url/pom.xml (original)
+++ aries/trunk/jndi/jndi-url/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.url</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries JNDI URL Handler</name>
+ <version>0.3.1-SNAPSHOT</version>
<description>
This bundle contains the JNDI URL handler for OSGi
</description>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-url</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-url</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url</url>
+ </scm>
+
<properties>
<!-- Export package versions are maintained in packageinfo files -->
<aries.osgi.export.pkg>
@@ -53,14 +62,17 @@
<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.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.api</artifactId>
+ <version>0.3</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -76,17 +88,25 @@
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.core</artifactId>
<scope>test</scope>
+ <version>0.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<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>
Modified: aries/trunk/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/packageinfo?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/packageinfo (original)
+++ aries/trunk/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/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.1
Modified: aries/trunk/jndi/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/jndi/pom.xml (original)
+++ aries/trunk/jndi/pom.xml Fri Mar 18 20:47:07 2011
@@ -22,132 +22,19 @@
<groupId>org.apache.aries</groupId>
<artifactId>java6-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.jndi</groupId>
<artifactId>jndi</artifactId>
<name>Apache Aries JNDI</name>
- <version>0.4-SNAPSHOT</version>
<packaging>pom</packaging>
<description>
- JNDI support for OSGi
+ JNDI support for OSGi - Reactor POM
</description>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jndi</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jndi</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/jndi</url>
- </scm>
-
-
- <dependencyManagement>
- <dependencies>
- <!-- internal dependencies -->
- <dependency>
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>org.apache.aries.jndi.api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>org.apache.aries.jndi.core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>org.apache.aries.jndi.url</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>org.apache.aries.jndi.rmi</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>org.apache.aries.jndi</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>org.apache.aries.jndi.url.itest.web</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>org.apache.aries.jndi.url.itest.biz</artifactId>
- <version>${project.version}</version>
- </dependency>
- <!-- external dependencies -->
- <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</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.api</artifactId>
- <version>0.4-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm-all</artifactId>
- <version>3.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
- <version>2.1_3_4</version>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.web</groupId>
- <artifactId>pax-web-extender-war</artifactId>
- <version>0.8.1</version>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.web</groupId>
- <artifactId>pax-web-jetty-bundle</artifactId>
- <version>0.8.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.fileinstall</artifactId>
- <version>2.0.8</version>
- </dependency>
-
- <!-- other aries subproject dependency management -->
- <dependency>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint</artifactId>
- <version>0.4-SNAPSHOT</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
-
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
<modules>
<module>jndi-api</module>
<module>jndi-core</module>
Modified: aries/trunk/jpa/jpa-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-api/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-api/pom.xml (original)
+++ aries/trunk/jpa/jpa-api/pom.xml Fri Mar 18 20:47:07 2011
@@ -19,14 +19,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">
<parent>
- <artifactId>jpa</artifactId>
- <groupId>org.apache.aries.jpa</groupId>
- <version>0.4-SNAPSHOT</version>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java5-parent</artifactId>
+ <version>0.4</version>
+ <relativePath />
</parent>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.api</artifactId>
<packaging>bundle</packaging>
<name>Aries JPA Container API</name>
+ <version>0.3.1-SNAPSHOT</version>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-api</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-api</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-api</url>
+ </scm>
<properties>
<!-- Export package versions are maintained in packageinfo files -->
@@ -41,6 +50,7 @@
javax.persistence.spi;version="[1.0.0,2.1.0)",
org.osgi.framework;version="[1.5.0,2.0.0)",
</aries.osgi.import>
+ <aries.osgi.private.pkg />
</properties>
<dependencies>
<dependency>
@@ -56,6 +66,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.0_spec</artifactId>
+ <version>1.1</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/context/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/context/packageinfo?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/context/packageinfo (original)
+++ aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/context/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/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/packageinfo?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/packageinfo (original)
+++ aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/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.1
Modified: aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/packageinfo?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/packageinfo (original)
+++ aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/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.1
Modified: aries/trunk/jpa/jpa-blueprint-aries/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-blueprint-aries/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-blueprint-aries/pom.xml (original)
+++ aries/trunk/jpa/jpa-blueprint-aries/pom.xml Fri Mar 18 20:47:07 2011
@@ -19,15 +19,24 @@
-->
<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">
<parent>
- <artifactId>jpa</artifactId>
- <groupId>org.apache.aries.jpa</groupId>
- <version>0.4-SNAPSHOT</version>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java5-parent</artifactId>
+ <version>0.4</version>
+ <relativePath />
</parent>
<name>Aries JPA Container blueprint integration for Aries blueprint</name>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.blueprint.aries</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
<packaging>bundle</packaging>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-blueprint-aries</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-blueprint-aries</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-blueprint-aries</url>
+ </scm>
+
<properties>
<!-- Export package versions are maintained in packageinfo files -->
@@ -57,16 +66,19 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.0_spec</artifactId>
+ <version>1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
+ <version>0.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.api</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -82,6 +94,7 @@
<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>
Modified: aries/trunk/jpa/jpa-blueprint-testbundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-blueprint-testbundle/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-blueprint-testbundle/pom.xml (original)
+++ aries/trunk/jpa/jpa-blueprint-testbundle/pom.xml Fri Mar 18 20:47:07 2011
@@ -19,15 +19,24 @@
-->
<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">
<parent>
- <artifactId>jpa</artifactId>
- <groupId>org.apache.aries.jpa</groupId>
- <version>0.4-SNAPSHOT</version>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java5-parent</artifactId>
+ <version>0.4</version>
+ <relativePath />
</parent>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.blueprint.itest.bundle</artifactId>
<packaging>bundle</packaging>
+ <version>0.3.1-SNAPSHOT</version>
<name>Test Bundle for Aries JPA Blueprint iTests</name>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jap/jpa-blueprint-testbundle</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jap/jpa-blueprint-testbundle</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/jap/jpa-blueprint-testbundle</url>
+ </scm>
+
<properties>
<!-- Export package versions are maintained in packageinfo files -->
@@ -44,6 +53,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.0_spec</artifactId>
+ <version>1.1</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: aries/trunk/jpa/jpa-blueprint-testbundle/src/main/java/org/apache/aries/jpa/blueprint/itest/entities/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-blueprint-testbundle/src/main/java/org/apache/aries/jpa/blueprint/itest/entities/packageinfo?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-blueprint-testbundle/src/main/java/org/apache/aries/jpa/blueprint/itest/entities/packageinfo (original)
+++ aries/trunk/jpa/jpa-blueprint-testbundle/src/main/java/org/apache/aries/jpa/blueprint/itest/entities/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/jpa/jpa-container-context/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-context/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container-context/pom.xml (original)
+++ aries/trunk/jpa/jpa-container-context/pom.xml Fri Mar 18 20:47:07 2011
@@ -19,15 +19,24 @@
-->
<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">
<parent>
- <artifactId>jpa</artifactId>
- <groupId>org.apache.aries.jpa</groupId>
- <version>0.4-SNAPSHOT</version>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java5-parent</artifactId>
+ <version>0.4</version>
+ <relativePath />
</parent>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.container.context</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
<name>Aries JPA Container Managed Contexts</name>
<packaging>bundle</packaging>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-container-context</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-container-context</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-context</url>
+ </scm>
+
<properties>
<!-- Export package versions are maintained in packageinfo files -->
@@ -62,26 +71,31 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.0_spec</artifactId>
+ <version>1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
+ <version>1.1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
+ <version>0.3.2-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.api</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.quiesce</groupId>
<artifactId>org.apache.aries.quiesce.api</artifactId>
+ <version>0.3</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -97,6 +111,7 @@
<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>
Modified: aries/trunk/jpa/jpa-container-itest/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-itest/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container-itest/pom.xml (original)
+++ aries/trunk/jpa/jpa-container-itest/pom.xml Fri Mar 18 20:47:07 2011
@@ -19,13 +19,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">
<parent>
- <artifactId>jpa</artifactId>
- <groupId>org.apache.aries.jpa</groupId>
- <version>0.4-SNAPSHOT</version>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java5-parent</artifactId>
+ <version>0.4</version>
+ <relativePath />
</parent>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.container.itest</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
<name>Aries JPA iTests</name>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-container-itest</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-container-itest</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-itest</url>
+ </scm>
+
<!--
For adding EclipseLink as a provider
@@ -77,21 +87,25 @@
<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.proxy</groupId>
<artifactId>org.apache.aries.proxy</artifactId>
+ <version>0.3</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.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
+ <version>0.3.2-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -102,31 +116,47 @@
<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>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.0_spec</artifactId>
+ <version>1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<artifactId>org.apache.aries.jpa.api</artifactId>
<groupId>org.apache.aries.jpa</groupId>
+ <version>0.3.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.container</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.container.context</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.blueprint.aries</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
<!--<scope>test</scope>-->
</dependency>
<!--
@@ -155,84 +185,101 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
+ <version>2.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
+ <version>1.1.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
+ <version>2.4</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
+ <version>3.2.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
+ <version>1.5.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.serp</artifactId>
+ <version>1.13.1_2</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.container.itest.bundle</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.blueprint.itest.bundle</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.quiesce</groupId>
<artifactId>org.apache.aries.quiesce.api</artifactId>
+ <version>0.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.transaction</groupId>
<artifactId>org.apache.aries.transaction.manager</artifactId>
+ <version>0.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.transaction</groupId>
<artifactId>org.apache.aries.transaction.testds</artifactId>
+ <version>0.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.transaction</groupId>
<artifactId>org.apache.aries.transaction.wrappers</artifactId>
+ <version>0.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.api</artifactId>
+ <version>0.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.core</artifactId>
+ <version>0.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.url</artifactId>
+ <version>0.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
+ <version>10.5.3.0_1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.cglib</artifactId>
+ <version>2.1_3_4</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: aries/trunk/jpa/jpa-container-testbundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-testbundle/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container-testbundle/pom.xml (original)
+++ aries/trunk/jpa/jpa-container-testbundle/pom.xml Fri Mar 18 20:47:07 2011
@@ -19,15 +19,24 @@
-->
<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">
<parent>
- <artifactId>jpa</artifactId>
- <groupId>org.apache.aries.jpa</groupId>
- <version>0.4-SNAPSHOT</version>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java5-parent</artifactId>
+ <version>0.4</version>
+ <relativePath />
</parent>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.container.itest.bundle</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Test Bundle for Aries JPA Container iTests</name>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-container-testbundle</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-container-testbundle</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-testbundle</url>
+ </scm>
+
<properties>
<!-- Export package versions are maintained in packageinfo files -->
@@ -38,20 +47,20 @@
javax.persistence;version="[1.0.0,3.0.0)",
*
</aries.osgi.import>
- <aries.osgi.private.pkg>
- org.apache.aries.jpa.container.itest
- </aries.osgi.private.pkg>
+ <aries.osgi.private.pkg />
<aries.osgi.symbolic.name>${project.groupId}.${project.artifactId}</aries.osgi.symbolic.name>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.0_spec</artifactId>
+ <version>1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
+ <version>2.0.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: aries/trunk/jpa/jpa-container-testbundle/src/main/java/org/apache/aries/jpa/container/itest/entities/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-testbundle/src/main/java/org/apache/aries/jpa/container/itest/entities/packageinfo?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container-testbundle/src/main/java/org/apache/aries/jpa/container/itest/entities/packageinfo (original)
+++ aries/trunk/jpa/jpa-container-testbundle/src/main/java/org/apache/aries/jpa/container/itest/entities/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/jpa/jpa-container/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container/pom.xml (original)
+++ aries/trunk/jpa/jpa-container/pom.xml Fri Mar 18 20:47:07 2011
@@ -19,15 +19,24 @@
-->
<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">
<parent>
- <artifactId>jpa</artifactId>
- <groupId>org.apache.aries.jpa</groupId>
- <version>0.4-SNAPSHOT</version>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java5-parent</artifactId>
+ <version>0.4</version>
+ <relativePath />
</parent>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.container</artifactId>
<packaging>bundle</packaging>
+ <version>0.3.1-SNAPSHOT</version>
<name>Aries JPA Container</name>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-container</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-container</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container</url>
+ </scm>
+
<properties>
<!-- Export package versions are maintained in packageinfo files -->
@@ -62,20 +71,24 @@
<dependency>
<artifactId>org.apache.aries.jpa.api</artifactId>
<groupId>org.apache.aries.jpa</groupId>
+ <version>0.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.quiesce</groupId>
<artifactId>org.apache.aries.quiesce.api</artifactId>
+ <version>0.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<artifactId>org.apache.aries.util</artifactId>
<groupId>org.apache.aries</groupId>
+ <version>0.4-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.0_spec</artifactId>
+ <version>1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -91,6 +104,7 @@
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<scope>test</scope>
+ <version>0.3</version>
</dependency>
<dependency>
Modified: aries/trunk/jpa/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/jpa/pom.xml (original)
+++ aries/trunk/jpa/pom.xml Fri Mar 18 20:47:07 2011
@@ -22,210 +22,14 @@
<artifactId>java5-parent</artifactId>
<groupId>org.apache.aries</groupId>
<version>0.4</version>
- <relativePath>../parent/default-parent/java5-parent/pom.xml</relativePath>
+ <relativePath />
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>jpa</artifactId>
<packaging>pom</packaging>
<name>Aries JPA Component</name>
- <version>0.4-SNAPSHOT</version>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jpa</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jpa</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/jpa</url>
- </scm>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.aries.jpa</groupId>
- <artifactId>org.apache.aries.jpa.api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jpa</groupId>
- <artifactId>org.apache.aries.jpa.blueprint.aries</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jpa</groupId>
- <artifactId>org.apache.aries.jpa.blueprint.itest</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jpa</groupId>
- <artifactId>org.apache.aries.jpa.blueprint.itest.bundle</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jpa</groupId>
- <artifactId>org.apache.aries.jpa.container</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jpa</groupId>
- <artifactId>org.apache.aries.jpa.container.context</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jpa</groupId>
- <artifactId>org.apache.aries.jpa.container.itest</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jpa</groupId>
- <artifactId>org.apache.aries.jpa.container.itest.bundle</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <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>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint</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.quiesce</groupId>
- <artifactId>org.apache.aries.quiesce.api</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.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_2.0_spec</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm-all</artifactId>
- <version>3.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <version>2.0.0</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.4</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
- </dependency>
- <dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>1.5.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.serp</artifactId>
- <version>1.13.1_2</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>org.eclipse.persistence.jpa</artifactId>
- <version>2.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>org.eclipse.persistence.core</artifactId>
- <version>2.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>org.eclipse.persistence.asm</artifactId>
- <version>2.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.transaction</groupId>
- <artifactId>org.apache.aries.transaction.manager</artifactId>
- <scope>test</scope>
- <version>0.4-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.transaction</groupId>
- <artifactId>org.apache.aries.transaction.testds</artifactId>
- <scope>test</scope>
- <version>0.4-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.transaction</groupId>
- <artifactId>org.apache.aries.transaction.wrappers</artifactId>
- <scope>test</scope>
- <version>0.4-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>org.apache.aries.jndi.api</artifactId>
- <scope>test</scope>
- <version>0.4-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>org.apache.aries.jndi.core</artifactId>
- <scope>test</scope>
- <version>0.4-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>org.apache.aries.jndi.url</artifactId>
- <scope>test</scope>
- <version>0.4-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.5.3.0_1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
- <version>2.1_3_4</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
<modules>
<module>jpa-api</module>
<module>jpa-container</module>
@@ -236,23 +40,7 @@
<module>jpa-blueprint-testbundle</module>
</modules>
- <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>
-
+ <!-- Saved from original parent pom - may need o be added to module poms if Eclipselink is used.
<profiles>
<profile>
<id>eclipselink</id>
@@ -263,34 +51,6 @@
</repository>
</repositories>
</profile>
- <profile>
- <id>rat</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>0.6</version>
- <!-- Note: other configuration inherited from the parent pom -->
- <configuration>
- <excludes>
- <!-- These CDDL+GPL files are covered in the NOTICE.vm and LICENCE.vm in the jpa-container module -->
- <exclude>**/persistence.xsd.rsrc</exclude>
- <exclude>**/persistence_2_0.xsd.rsrc</exclude>
- <!-- The rest of the excludes below had to be copied from the parent pom -->
- <exclude>**/target/**/*</exclude>
- <exclude>**/appended-resources/**/*</exclude>
- <exclude>**/dependency-reduced-pom.xml</exclude>
- <exclude>**/velocity.log</exclude>
- <!-- manifest files don't support comments so don't contain the ASL2.0 header -->
- <exclude>**/*.MF</exclude>
- <!--RAT doesn't seem to recognize MIT style licenses-->
- <exclude>manual/src/styles/print.css</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
+ -->
</project>
Modified: aries/trunk/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/pom.xml (original)
+++ aries/trunk/pom.xml Fri Mar 18 20:47:07 2011
@@ -50,7 +50,9 @@
<module>application</module>
<module>jmx</module>
<module>jpa</module>
+ <!--
<module>samples</module>
+ -->
</modules>
<build>
Modified: aries/trunk/proxy/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/proxy/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/proxy/pom.xml (original)
+++ aries/trunk/proxy/pom.xml Fri Mar 18 20:47:07 2011
@@ -28,97 +28,12 @@
<groupId>org.apache.aries.proxy</groupId>
<artifactId>proxy</artifactId>
<name>Apache Aries Class Proxy</name>
- <version>0.4-SNAPSHOT</version>
<packaging>pom</packaging>
<description>
A common proxy class generation service that can be used by blueprint and jndi and others.
</description>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/proxy</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/proxy</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/proxy</url>
- </scm>
-
- <dependencyManagement>
- <dependencies>
- <!-- internal Aries dependencies -->
- <dependency>
- <groupId>org.apache.aries.proxy</groupId>
- <artifactId>org.apache.aries.proxy</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.impl</artifactId>
- <version>0.4-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.proxy</groupId>
- <artifactId>org.apache.aries.proxy.itests</artifactId>
- <version>0.4-SNAPSHOT</version>
- </dependency>
- <!-- dependencies on other aries modules -->
- <dependency>
- <groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.util</artifactId>
- <version>0.4-SNAPSHOT</version>
- </dependency>
- <!-- external dependencies -->
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm-all</artifactId>
- <version>3.2</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>
- </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>proxy-api</module>
<module>proxy-impl</module>
Modified: aries/trunk/proxy/proxy-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-api/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/proxy/proxy-api/pom.xml (original)
+++ aries/trunk/proxy/proxy-api/pom.xml Fri Mar 18 20:47:07 2011
@@ -19,18 +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.proxy</groupId>
- <artifactId>proxy</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.proxy</groupId>
<artifactId>org.apache.aries.proxy.api</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries Proxy API</name>
+ <version>0.3.1-SNAPSHOT</version>
<description>
This bundle contains the Apache Aries Proxy service API.
</description>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/proxy/proxy-api</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/proxy/proxy-api</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-api</url>
+ </scm>
+
+
<properties>
<!-- Export package versions are maintained in packageinfo files -->
@@ -68,6 +78,7 @@
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
+ <version>0.4-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
Modified: aries/trunk/proxy/proxy-api/src/main/java/org/apache/aries/proxy/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-api/src/main/java/org/apache/aries/proxy/packageinfo?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/proxy/proxy-api/src/main/java/org/apache/aries/proxy/packageinfo (original)
+++ aries/trunk/proxy/proxy-api/src/main/java/org/apache/aries/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.1
Modified: aries/trunk/proxy/proxy-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-bundle/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/proxy/proxy-bundle/pom.xml (original)
+++ aries/trunk/proxy/proxy-bundle/pom.xml Fri Mar 18 20:47:07 2011
@@ -19,18 +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.proxy</groupId>
- <artifactId>proxy</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.proxy</groupId>
<artifactId>org.apache.aries.proxy</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries Proxy Bundle</name>
+ <version>0.3.1-SNAPSHOT</version>
<description>
This bundle contains the Apache Aries Proxy Service.
</description>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/proxy/proxy-bundle</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/proxy/proxy-bundle</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-bundle</url>
+ </scm>
+
+
<properties>
<!-- Export package versions are maintained in packageinfo files -->
<aries.osgi.activator>
@@ -73,10 +83,12 @@
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy.api</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy.impl</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: aries/trunk/proxy/proxy-impl/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-impl/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/proxy/proxy-impl/pom.xml (original)
+++ aries/trunk/proxy/proxy-impl/pom.xml Fri Mar 18 20:47:07 2011
@@ -19,18 +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.proxy</groupId>
- <artifactId>proxy</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.proxy</groupId>
<artifactId>org.apache.aries.proxy.impl</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries Proxy Service</name>
+ <version>0.3.1-SNAPSHOT</version>
<description>
This bundle contains the proxy service implementation for Apache Aries
</description>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/proxy/proxy-impl</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/proxy/proxy-impl</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-impl</url>
+ </scm>
+
+
<properties>
<aries.osgi.export.pkg/>
<aries.osgi.activator>
@@ -51,6 +61,7 @@
<groupId>asm</groupId>
<artifactId>asm-all</artifactId>
<optional>true</optional>
+ <version>3.2</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -85,11 +96,13 @@
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy.api</artifactId>
<scope>compile</scope>
+ <version>0.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
<scope>compile</scope>
+ <version>0.4-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: aries/trunk/proxy/proxy-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-itests/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/proxy/proxy-itests/pom.xml (original)
+++ aries/trunk/proxy/proxy-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.proxy</groupId>
- <artifactId>proxy</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.proxy</groupId>
<artifactId>org.apache.aries.proxy.itests</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
<name>Apache Aries Proxy iTests</name>
<description>
Integration tests using the standalone proxy-bundle.
</description>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/proxy/proxy-itests</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/proxy/proxy-itests</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-itests</url>
+ </scm>
+
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
@@ -51,11 +60,13 @@
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy</artifactId>
<scope>test</scope>
+ <version>0.3.1-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.ops4j.pax.exam</groupId>
@@ -87,9 +98,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>
@@ -110,6 +131,7 @@
<groupId>asm</groupId>
<artifactId>asm-all</artifactId>
<scope>test</scope>
+ <version>3.2</version>
</dependency>
</dependencies>
Modified: aries/trunk/quiesce/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/quiesce/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/quiesce/pom.xml (original)
+++ aries/trunk/quiesce/pom.xml Fri Mar 18 20:47:07 2011
@@ -26,110 +26,16 @@
<groupId>org.apache.aries.quiesce</groupId>
<artifactId>quiesce</artifactId>
<name>Apache Aries Quiesce</name>
- <version>0.4-SNAPSHOT</version>
<packaging>pom</packaging>
<description>
- Quiesce support for Aries
+ Quiesce support for Aries - reactor pom
</description>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/quiesce</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/quiesce</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/quiesce</url>
- </scm>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <!-- internal dependencies on other Aries modules -->
- <groupId>org.apache.aries.quiesce</groupId>
- <artifactId>org.apache.aries.quiesce.api</artifactId>
- <version>0.4-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.quiesce</groupId>
- <artifactId>org.apache.aries.quiesce.manager</artifactId>
- <version>0.4-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.quiesce</groupId>
- <artifactId>org.apache.aries.quiesce.manager.itest</artifactId>
- <version>0.4-SNAPSHOT</version>
- </dependency>
-
- <!-- dependencies on other Aries modules -->
- <dependency>
- <groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.util</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>
-
- <!-- external dependencies -->
- <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>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.4</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
- </dependency>
- <dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>1.5.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.serp</artifactId>
- <version>1.13.1_2</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<modules>
<module>quiesce-api</module>
<module>quiesce-manager</module>
<module>quiesce-manager-itest</module>
</modules>
- <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>
</project>
Modified: aries/trunk/quiesce/quiesce-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/quiesce/quiesce-api/pom.xml?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/quiesce/quiesce-api/pom.xml (original)
+++ aries/trunk/quiesce/quiesce-api/pom.xml Fri Mar 18 20:47:07 2011
@@ -19,18 +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.quiesce</groupId>
- <artifactId>quiesce</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.quiesce</groupId>
<artifactId>org.apache.aries.quiesce.api</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries Quiesce API</name>
+ <version>0.3.1-SNAPSHOT</version>
<description>
Quiesce API.
</description>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/quiesce/quiesce-api</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/quiesce/quiesce-api</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/quiesce/quiesce-api</url>
+ </scm>
+
<properties>
<!-- Export package versions are maintained in packageinfo files -->
Modified: aries/trunk/quiesce/quiesce-api/src/main/java/org/apache/aries/quiesce/manager/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/quiesce/quiesce-api/src/main/java/org/apache/aries/quiesce/manager/packageinfo?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/quiesce/quiesce-api/src/main/java/org/apache/aries/quiesce/manager/packageinfo (original)
+++ aries/trunk/quiesce/quiesce-api/src/main/java/org/apache/aries/quiesce/manager/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/quiesce/quiesce-api/src/main/java/org/apache/aries/quiesce/participant/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/quiesce/quiesce-api/src/main/java/org/apache/aries/quiesce/participant/packageinfo?rev=1083059&r1=1083058&r2=1083059&view=diff
==============================================================================
--- aries/trunk/quiesce/quiesce-api/src/main/java/org/apache/aries/quiesce/participant/packageinfo (original)
+++ aries/trunk/quiesce/quiesce-api/src/main/java/org/apache/aries/quiesce/participant/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