incubator-aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r916927 [1/2] - in /incubator/aries/trunk: ./ application/ application/application-converters/ application/application-install/ application/application-itests/ application/application-management/ application/application-obr-resolver/ applic...
Date Sat, 27 Feb 2010 08:34:08 GMT
Author: djencks
Date: Sat Feb 27 08:34:07 2010
New Revision: 916927

URL: http://svn.apache.org/viewvc?rev=916927&view=rev
Log:
ARIES-173 beginnings of pom cleanup.  This adds scm info to all top-level subprojects and does a little bit of dependency cleanup.  No shared dependencies in project parent pom yet.

Modified:
    incubator/aries/trunk/application/application-converters/pom.xml
    incubator/aries/trunk/application/application-install/pom.xml
    incubator/aries/trunk/application/application-itests/pom.xml
    incubator/aries/trunk/application/application-management/pom.xml
    incubator/aries/trunk/application/application-obr-resolver/pom.xml
    incubator/aries/trunk/application/application-runtime/pom.xml
    incubator/aries/trunk/application/application-utils/pom.xml
    incubator/aries/trunk/application/pom.xml
    incubator/aries/trunk/ariestrader-sample/pom.xml
    incubator/aries/trunk/blueprint/pom.xml
    incubator/aries/trunk/jmx/jmx-api/pom.xml
    incubator/aries/trunk/jmx/jmx-blueprint-api/pom.xml
    incubator/aries/trunk/jmx/jmx-blueprint-core/pom.xml
    incubator/aries/trunk/jmx/jmx-core/pom.xml
    incubator/aries/trunk/jmx/pom.xml
    incubator/aries/trunk/jndi/pom.xml
    incubator/aries/trunk/jpa/pom.xml
    incubator/aries/trunk/parent/pom.xml
    incubator/aries/trunk/pom.xml
    incubator/aries/trunk/samples/blog-sample/blog-api/pom.xml
    incubator/aries/trunk/samples/blog-sample/blog-assembly/pom.xml
    incubator/aries/trunk/samples/blog-sample/blog-persistence/pom.xml
    incubator/aries/trunk/samples/blog-sample/blog-servlet/pom.xml
    incubator/aries/trunk/samples/blog-sample/blog/pom.xml
    incubator/aries/trunk/samples/blog-sample/pom.xml
    incubator/aries/trunk/samples/blueprint-sample-idverifier/blueprint-sample-idverifier-assembly/pom.xml
    incubator/aries/trunk/samples/blueprint-sample-idverifier/pom.xml
    incubator/aries/trunk/samples/helloworld-samples/blueprint-helloworld/blueprint-helloworld-api/pom.xml
    incubator/aries/trunk/samples/helloworld-samples/blueprint-helloworld/blueprint-helloworld-client/pom.xml
    incubator/aries/trunk/samples/helloworld-samples/blueprint-helloworld/blueprint-helloworld-server/pom.xml
    incubator/aries/trunk/samples/helloworld-samples/pom.xml
    incubator/aries/trunk/samples/pom.xml
    incubator/aries/trunk/samples/transaction-sample/osgi-jdbc-api/pom.xml
    incubator/aries/trunk/samples/transaction-sample/osgi-jdbc-derby/pom.xml
    incubator/aries/trunk/samples/transaction-sample/pom.xml
    incubator/aries/trunk/samples/transaction-sample/transaction-assembly/pom.xml
    incubator/aries/trunk/samples/transaction-sample/transaction-sample-web/pom.xml
    incubator/aries/trunk/spi-fly/pom.xml
    incubator/aries/trunk/testsupport/pom.xml
    incubator/aries/trunk/testsupport/testsupport-unit/pom.xml
    incubator/aries/trunk/transaction/pom.xml
    incubator/aries/trunk/transaction/transaction-blueprint/pom.xml
    incubator/aries/trunk/transaction/transaction-manager/pom.xml
    incubator/aries/trunk/util/pom.xml
    incubator/aries/trunk/web/pom.xml
    incubator/aries/trunk/web/web-urlhandler/pom.xml

Modified: incubator/aries/trunk/application/application-converters/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-converters/pom.xml?rev=916927&r1=916926&r2=916927&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-converters/pom.xml (original)
+++ incubator/aries/trunk/application/application-converters/pom.xml Sat Feb 27 08:34:07 2010
@@ -42,6 +42,7 @@
         <dependency>
             <groupId>asm</groupId>
             <artifactId>asm-all</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.application</groupId>
@@ -60,6 +61,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 

Modified: incubator/aries/trunk/application/application-install/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-install/pom.xml?rev=916927&r1=916926&r2=916927&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-install/pom.xml (original)
+++ incubator/aries/trunk/application/application-install/pom.xml Sat Feb 27 08:34:07 2010
@@ -26,7 +26,6 @@
     
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.apache.aries.application.install</artifactId>
-    <version>1.0.0-incubating-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache Aries Application Installer</name>
     <description>
@@ -37,7 +36,6 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.fileinstall</artifactId>
-            <version>2.0.8</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.application</groupId>
@@ -56,6 +54,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

Modified: incubator/aries/trunk/application/application-itests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-itests/pom.xml?rev=916927&r1=916926&r2=916927&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-itests/pom.xml (original)
+++ incubator/aries/trunk/application/application-itests/pom.xml Sat Feb 27 08:34:07 2010
@@ -26,7 +26,6 @@
     
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.apache.aries.application.runtime.itests</artifactId>
-    <version>1.0.0-incubating-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>Apache Aries Application integration tests</name>
     <description>

Modified: incubator/aries/trunk/application/application-management/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-management/pom.xml?rev=916927&r1=916926&r2=916927&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-management/pom.xml (original)
+++ incubator/aries/trunk/application/application-management/pom.xml Sat Feb 27 08:34:07 2010
@@ -39,18 +39,12 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.aries.testsupport</groupId>
-            <artifactId>org.apache.aries.testsupport.unit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <scope>provided</scope>
+            <groupId>org.apache.aries.application</groupId>
+            <artifactId>org.apache.aries.application.utils</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
+            <groupId>org.apache.aries.testsupport</groupId>
+            <artifactId>org.apache.aries.testsupport.unit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -64,8 +58,14 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.aries.application</groupId>
-            <artifactId>org.apache.aries.application.utils</artifactId>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 

Modified: incubator/aries/trunk/application/application-obr-resolver/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-obr-resolver/pom.xml?rev=916927&r1=916926&r2=916927&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-obr-resolver/pom.xml (original)
+++ incubator/aries/trunk/application/application-obr-resolver/pom.xml Sat Feb 27 08:34:07 2010
@@ -28,12 +28,12 @@
         </dependency>
         <dependency>
             <groupId>org.apache.aries.application</groupId>
-            <artifactId>org.apache.aries.application.utils</artifactId>
+            <artifactId>org.apache.aries.application.management</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.application</groupId>
-            <artifactId>org.apache.aries.application.management</artifactId>
+            <artifactId>org.apache.aries.application.utils</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: incubator/aries/trunk/application/application-runtime/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-runtime/pom.xml?rev=916927&r1=916926&r2=916927&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-runtime/pom.xml (original)
+++ incubator/aries/trunk/application/application-runtime/pom.xml Sat Feb 27 08:34:07 2010
@@ -39,18 +39,12 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.aries.testsupport</groupId>
-            <artifactId>org.apache.aries.testsupport.unit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <scope>provided</scope>
+            <groupId>org.apache.aries.application</groupId>
+            <artifactId>org.apache.aries.application.utils</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
+            <groupId>org.apache.aries.testsupport</groupId>
+            <artifactId>org.apache.aries.testsupport.unit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -64,8 +58,14 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.aries.application</groupId>
-            <artifactId>org.apache.aries.application.utils</artifactId>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 

Modified: incubator/aries/trunk/application/application-utils/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-utils/pom.xml?rev=916927&r1=916926&r2=916927&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-utils/pom.xml (original)
+++ incubator/aries/trunk/application/application-utils/pom.xml Sat Feb 27 08:34:07 2010
@@ -34,16 +34,6 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.testsupport</groupId>
-            <artifactId>org.apache.aries.testsupport.unit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
@@ -53,6 +43,16 @@
             <artifactId>org.apache.aries.application.api</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.apache.aries.testsupport</groupId>
+            <artifactId>org.apache.aries.testsupport.unit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
             <scope>provided</scope>

Modified: incubator/aries/trunk/application/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/pom.xml?rev=916927&r1=916926&r2=916927&view=diff
==============================================================================
--- incubator/aries/trunk/application/pom.xml (original)
+++ incubator/aries/trunk/application/pom.xml Sat Feb 27 08:34:07 2010
@@ -40,183 +40,191 @@
 
 	<dependencyManagement>
 		<dependencies>
-			<dependency>
-				<groupId>org.osgi</groupId>
-				<artifactId>org.osgi.core</artifactId>
-				<version>4.2.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.osgi</groupId>
-				<artifactId>org.osgi.compendium</artifactId>
-				<version>4.2.0</version>
-			</dependency>
+            <dependency>
+                <groupId>asm</groupId>
+                <artifactId>asm-all</artifactId>
+                <version>3.1</version>
+            </dependency>
 			<dependency>
 				<groupId>junit</groupId>
 				<artifactId>junit</artifactId>
 				<version>4.5</version>
 			</dependency>
-			<dependency>
-				<groupId>org.slf4j</groupId>
-				<artifactId>slf4j-api</artifactId>
-				<version>1.5.6</version>
-			</dependency>
-			<dependency>
-				<groupId>org.slf4j</groupId>
-				<artifactId>slf4j-simple</artifactId>
-				<version>1.5.6</version>
-			</dependency>
-			<dependency>
-				<groupId>asm</groupId>
-				<artifactId>asm-all</artifactId>
-				<version>3.1</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.aries.application</groupId>
-				<artifactId>org.apache.aries.application.api</artifactId>
-				<version>${version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.aries.application</groupId>
-				<artifactId>org.apache.aries.application.utils</artifactId>
-				<version>${version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.aries.application</groupId>
-				<artifactId>org.apache.aries.application.management</artifactId>
-				<version>${version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.aries.application</groupId>
-				<artifactId>org.apache.aries.application.resolver.obr</artifactId>
-				<version>${version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.aries.application</groupId>
-				<artifactId>org.apache.aries.application.runtime</artifactId>
-				<version>${version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.aries.application</groupId>
-				<artifactId>org.apache.aries.application.runtime.itest.interfaces</artifactId>
-				<version>${version}</version>
-			</dependency>
+            <dependency>
+                <groupId>org.apache.aries</groupId>
+                <artifactId>org.apache.aries.util</artifactId>
+                <version>1.0.0-incubating-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.aries.blueprint</groupId>
+                <artifactId>org.apache.aries.blueprint</artifactId>
+                <version>1.0.0-incubating-SNAPSHOT</version>
+            </dependency>
 			<dependency>
 				<groupId>org.apache.aries.testsupport</groupId>
 				<artifactId>org.apache.aries.testsupport.unit</artifactId>
-				<version>${version}</version>
+				<version>1.0.0-incubating-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.aries.web</groupId>
 				<artifactId>org.apache.aries.web.urlhandler</artifactId>
-				<version>${version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.ops4j.pax.exam</groupId>
-				<artifactId>pax-exam</artifactId>
-				<version>1.2.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.ops4j.pax.exam</groupId>
-				<artifactId>pax-exam-junit</artifactId>
-				<version>1.2.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.ops4j.pax.exam</groupId>
-				<artifactId>pax-exam-container-default</artifactId>
-				<version>1.2.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.ops4j.pax.swissbox</groupId>
-				<artifactId>pax-swissbox-tinybundles</artifactId>
-				<version>1.2.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.ops4j.pax.logging</groupId>
-				<artifactId>pax-logging-api</artifactId>
-				<version>1.4</version>
-			</dependency>
-			<dependency>
-				<groupId>org.ops4j.pax.logging</groupId>
-				<artifactId>pax-logging-service</artifactId>
-				<version>1.4</version>
-				<exclusions>
-					<exclusion>
-						<groupId>com.sun.jdmk</groupId>
-						<artifactId>jmxtools</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>com.sun.jmx</groupId>
-						<artifactId>jmxri</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>javax.mail</groupId>
-						<artifactId>mail</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-				<groupId>org.ops4j.pax.url</groupId>
-				<artifactId>pax-url-mvn</artifactId>
-				<version>1.0.0</version>
+				<version>1.0.0-incubating-SNAPSHOT</version>
 			</dependency>
             <dependency>
                 <groupId>org.apache.felix</groupId>
-                <artifactId>org.osgi.service.obr</artifactId>
+                <artifactId>org.apache.felix.bundlerepository</artifactId>
+                <version>1.5.0-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>
-                <version>1.0.2</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.bundlerepository</artifactId>
-                <version>1.5.0-SNAPSHOT</version>
+                <artifactId>org.apache.felix.fileinstall</artifactId>
+                <version>2.0.8</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.osgi.service.obr</artifactId>
                 <exclusions>
                     <exclusion>
                         <groupId>org.apache.felix</groupId>
-                        <artifactId>org.osgi.service.obr</artifactId>
+                        <artifactId>org.osgi.core</artifactId>
                     </exclusion>
+                </exclusions>
+                <version>1.0.2</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.exam</groupId>
+                <artifactId>pax-exam</artifactId>
+                <version>1.2.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.exam</groupId>
+                <artifactId>pax-exam-container-default</artifactId>
+                <version>1.2.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.exam</groupId>
+                <artifactId>pax-exam-junit</artifactId>
+                <version>1.2.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.logging</groupId>
+                <artifactId>pax-logging-api</artifactId>
+                <version>1.4</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.logging</groupId>
+                <artifactId>pax-logging-service</artifactId>
+                <version>1.4</version>
+                <exclusions>
                     <exclusion>
-                        <groupId>org.apache.felix</groupId>
-                        <artifactId>org.apache.felix.shell</artifactId>
+                        <groupId>com.sun.jdmk</groupId>
+                        <artifactId>jmxtools</artifactId>
                     </exclusion>
                     <exclusion>
-                        <groupId>org.apache.felix</groupId>
-                        <artifactId>org.osgi.core</artifactId>
+                        <groupId>com.sun.jmx</groupId>
+                        <artifactId>jmxri</artifactId>
                     </exclusion>
                     <exclusion>
-                        <groupId>net.sf.kxml</groupId>
-                        <artifactId>kxml2</artifactId>
+                        <groupId>javax.mail</groupId>
+                        <artifactId>mail</artifactId>
                     </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.swissbox</groupId>
+                <artifactId>pax-swissbox-tinybundles</artifactId>
+                <version>1.2.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.url</groupId>
+                <artifactId>pax-url-mvn</artifactId>
+                <version>1.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.core</artifactId>
+                <version>4.2.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.compendium</artifactId>
+                <version>4.2.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>1.5.6</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-simple</artifactId>
+                <version>1.5.6</version>
+            </dependency>
+
+            <!-- internal -->
+            <dependency>
+                <groupId>org.apache.aries.application</groupId>
+                <artifactId>org.apache.aries.application.api</artifactId>
+                <version>${version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.aries.application</groupId>
+                <artifactId>org.apache.aries.application.converters</artifactId>
+                <version>${version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.aries.application</groupId>
+                <artifactId>org.apache.aries.application.install</artifactId>
+                <version>${version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.aries.application</groupId>
+                <artifactId>org.apache.aries.application.management</artifactId>
+                <version>${version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.aries.application</groupId>
+                <artifactId>org.apache.aries.application.resolver.obr</artifactId>
+                <version>${version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.aries.application</groupId>
+                <artifactId>org.apache.aries.application.runtime</artifactId>
+                <version>${version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.aries.application</groupId>
+                <artifactId>org.apache.aries.application.runtime.itest.interfaces</artifactId>
+                <version>${version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.aries.application</groupId>
+                <artifactId>org.apache.aries.application.runtime.itests</artifactId>
+                <version>${version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.aries.application</groupId>
+                <artifactId>org.apache.aries.application.utils</artifactId>
+                <version>${version}</version>
+            </dependency>
 		</dependencies>
 	</dependencyManagement>
 
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.felix</groupId>
-					<artifactId>maven-bundle-plugin</artifactId>
-					<version>2.0.1</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-release-plugin</artifactId>
-					<configuration>
-						<useReleaseProfile>false</useReleaseProfile>
-						<goals>deploy</goals>
-						<arguments>-Papache-release,deploy</arguments>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-	</build>
-
 	<modules>
 		<module>application-utils</module>
 		<module>application-api</module>
@@ -227,6 +235,7 @@
 		<module>application-itests</module>
 		<module>application-obr-resolver</module>
 		<module>application-install</module>
+		<module>eba-maven-plugin</module>
 	</modules>
 
 </project>

Modified: incubator/aries/trunk/ariestrader-sample/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/pom.xml?rev=916927&r1=916926&r2=916927&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/pom.xml (original)
+++ incubator/aries/trunk/ariestrader-sample/pom.xml Sat Feb 27 08:34:07 2010
@@ -142,6 +142,7 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
+
     <modules>
         <!-- application components-->
         <module>modules</module>

Modified: incubator/aries/trunk/blueprint/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/pom.xml?rev=916927&r1=916926&r2=916927&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/pom.xml (original)
+++ incubator/aries/trunk/blueprint/pom.xml Sat Feb 27 08:34:07 2010
@@ -86,7 +86,7 @@
             <dependency>
                 <groupId>org.apache.aries</groupId>
                 <artifactId>org.apache.aries.util</artifactId>
-                <version>${version}</version> 
+                <version>1.0.0-incubating-SNAPSHOT</version> 
             </dependency>
             <dependency>
                 <groupId>org.osgi</groupId>

Modified: incubator/aries/trunk/jmx/jmx-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-api/pom.xml?rev=916927&r1=916926&r2=916927&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-api/pom.xml (original)
+++ incubator/aries/trunk/jmx/jmx-api/pom.xml Sat Feb 27 08:34:07 2010
@@ -56,26 +56,4 @@
         </plugins>
     </build>
     
-    <profiles>
-        <profile>
-            <id>deploy</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-source-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-sources</id>
-                                <phase>process-classes</phase>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>

Modified: incubator/aries/trunk/jmx/jmx-blueprint-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-blueprint-api/pom.xml?rev=916927&r1=916926&r2=916927&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-blueprint-api/pom.xml (original)
+++ incubator/aries/trunk/jmx/jmx-blueprint-api/pom.xml Sat Feb 27 08:34:07 2010
@@ -50,26 +50,4 @@
         </plugins>
     </build>
     
-    <profiles>
-        <profile>
-            <id>deploy</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-source-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-sources</id>
-                                <phase>process-classes</phase>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>

Modified: incubator/aries/trunk/jmx/jmx-blueprint-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-blueprint-core/pom.xml?rev=916927&r1=916926&r2=916927&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-blueprint-core/pom.xml (original)
+++ incubator/aries/trunk/jmx/jmx-blueprint-core/pom.xml Sat Feb 27 08:34:07 2010
@@ -95,26 +95,4 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>deploy</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-source-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-sources</id>
-                                <phase>process-classes</phase>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>

Modified: incubator/aries/trunk/jmx/jmx-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-core/pom.xml?rev=916927&r1=916926&r2=916927&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-core/pom.xml (original)
+++ incubator/aries/trunk/jmx/jmx-core/pom.xml Sat Feb 27 08:34:07 2010
@@ -92,26 +92,4 @@
         </plugins>
     </build>
     
-    <profiles>
-        <profile>
-            <id>deploy</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-source-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-sources</id>
-                                <phase>process-classes</phase>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>

Modified: incubator/aries/trunk/jmx/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/pom.xml?rev=916927&r1=916926&r2=916927&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/pom.xml (original)
+++ incubator/aries/trunk/jmx/pom.xml Sat Feb 27 08:34:07 2010
@@ -152,24 +152,10 @@
         <pluginManagement>
             <plugins>
                 <plugin>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>maven-bundle-plugin</artifactId>
-                    <version>2.0.1</version>
-                </plugin>
-                <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-shade-plugin</artifactId>
                     <version>1.2.2</version>
                 </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-release-plugin</artifactId>
-                    <configuration>
-                        <useReleaseProfile>false</useReleaseProfile>
-                        <goals>deploy</goals>
-                        <arguments>-Papache-release,deploy</arguments>
-                  </configuration>
-                </plugin>
             </plugins>
         </pluginManagement>
     </build>

Modified: incubator/aries/trunk/jndi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jndi/pom.xml?rev=916927&r1=916926&r2=916927&view=diff
==============================================================================
--- incubator/aries/trunk/jndi/pom.xml (original)
+++ incubator/aries/trunk/jndi/pom.xml Sat Feb 27 08:34:07 2010
@@ -80,24 +80,10 @@
         <pluginManagement>
             <plugins>
                 <plugin>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>maven-bundle-plugin</artifactId>
-                    <version>2.0.1</version>
-                </plugin>
-                <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-shade-plugin</artifactId>
                     <version>1.2.2</version>
                 </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-release-plugin</artifactId>
-                    <configuration>
-                        <useReleaseProfile>false</useReleaseProfile>
-                        <goals>deploy</goals>
-                        <arguments>-Papache-release,deploy</arguments>
-                  </configuration>
-                </plugin>
             </plugins>
         </pluginManagement>
     </build>

Modified: incubator/aries/trunk/jpa/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jpa/pom.xml?rev=916927&r1=916926&r2=916927&view=diff
==============================================================================
--- incubator/aries/trunk/jpa/pom.xml (original)
+++ incubator/aries/trunk/jpa/pom.xml Sat Feb 27 08:34:07 2010
@@ -17,77 +17,83 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<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>java5-parent</artifactId>
-    <groupId>org.apache.aries</groupId>
+<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>java5-parent</artifactId>
+        <groupId>org.apache.aries</groupId>
+        <version>1.0.0-incubating-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.aries.jpa</groupId>
+    <artifactId>jpa</artifactId>
+    <packaging>pom</packaging>
+    <name>Aries JPA Component</name>
     <version>1.0.0-incubating-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.aries.jpa</groupId>
-  <artifactId>jpa</artifactId>
-  <packaging>pom</packaging>
-  <name>Aries JPA Component</name>
-  <version>1.0.0-incubating-SNAPSHOT</version>
-  <modules>
-  	<module>jpa-container</module>
-  	<module>jpa-container-context</module>
-  	<module>jpa-blueprint-aries</module>
-  	<module>jpa-container-itest</module>
-  	<module>jpa-container-testbundle</module>
-  	<module>jpa-context-itest</module>
-  	<module>jpa-blueprint-testbundle</module>
-  </modules>
-  <dependencyManagement>
-    <dependencies>
-  	  <dependency>
-        <groupId>org.osgi</groupId>
-        <artifactId>org.osgi.core</artifactId>
-        <version>4.2.0</version>
-      </dependency>
-    
-      <dependency>
-        <groupId>org.osgi</groupId>
-        <artifactId>org.osgi.compendium</artifactId>
-        <version>4.2.0</version>
-      </dependency>
-      
-      <dependency>
-        <groupId>org.apache.aries.testsupport</groupId>
-        <artifactId>org.apache.aries.testsupport.unit</artifactId>
-        <version>${version}</version>
-      </dependency>
-      			
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
-        <version>1.5.6</version>
-      </dependency>
-      
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-simple</artifactId>
-        <version>1.5.6</version>
-      </dependency>
-      
-      <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>4.5</version>
-      </dependency>
-
-      <dependency>
-          <groupId>org.apache.geronimo.specs</groupId>
-          <artifactId>geronimo-jpa_2.0_spec</artifactId>
-          <version>1.0</version>
-      </dependency> 
-
-      <dependency>
-          <groupId>org.apache.geronimo.specs</groupId>
-          <artifactId>geronimo-jta_1.1_spec</artifactId>
-          <version>1.1.1</version> 
-      </dependency>  
-      
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/aries/trunk/jpa</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/aries/trunk/jpa</developerConnection>
+        <url>http://svn.apache.org/viewvc/incubator/aries/trunk/jpa</url>
+    </scm>
+    <modules>
+        <module>jpa-container</module>
+        <module>jpa-container-context</module>
+        <module>jpa-blueprint-aries</module>
+        <module>jpa-container-itest</module>
+        <module>jpa-container-testbundle</module>
+        <module>jpa-context-itest</module>
+        <module>jpa-blueprint-testbundle</module>
+    </modules>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.core</artifactId>
+                <version>4.2.0</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.compendium</artifactId>
+                <version>4.2.0</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.aries.testsupport</groupId>
+                <artifactId>org.apache.aries.testsupport.unit</artifactId>
+                <version>1.0.0-incubating-SNAPSHOT</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>1.5.6</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-simple</artifactId>
+                <version>1.5.6</version>
+            </dependency>
+
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>4.5</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-jpa_2.0_spec</artifactId>
+                <version>1.0</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.ops4j.pax.logging</groupId>
                 <artifactId>pax-logging-api</artifactId>
@@ -113,7 +119,7 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-            
-    </dependencies>
-  </dependencyManagement>
+
+        </dependencies>
+    </dependencyManagement>
 </project>

Modified: incubator/aries/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/parent/pom.xml?rev=916927&r1=916926&r2=916927&view=diff
==============================================================================
--- incubator/aries/trunk/parent/pom.xml (original)
+++ incubator/aries/trunk/parent/pom.xml Sat Feb 27 08:34:07 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache</groupId>
         <artifactId>apache</artifactId>
-        <version>6</version>
+        <version>7</version>
     </parent>
 
     <groupId>org.apache.aries</groupId>
@@ -45,20 +45,12 @@
         <url>http://www.apache.org</url>
     </organization>
 
-    <licenses>
-        <license>
-            <name>The Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-
     <inceptionYear>2009</inceptionYear>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/aries/trunk</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/aries/trunk</developerConnection>
-        <url>scm:svn:http://svn.apache.org/repos/asf/incubator/aries/trunk</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/aries/trunk/parent</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/aries/trunk/parent</developerConnection>
+        <url>scm:svn:http://svn.apache.org/repos/asf/incubator/aries/trunk/parent</url>
     </scm>
 
     <issueManagement>

Modified: incubator/aries/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/pom.xml?rev=916927&r1=916926&r2=916927&view=diff
==============================================================================
--- incubator/aries/trunk/pom.xml (original)
+++ incubator/aries/trunk/pom.xml Sat Feb 27 08:34:07 2010
@@ -16,7 +16,9 @@
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
     under the License.
---><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">
+-->
+<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>
         <groupId>org.apache</groupId>
@@ -24,7 +26,8 @@
         <version>6</version>
     </parent>
 
-    <!-- This file was based on the Geronimo Genesis Parent Pom -->
+    <!-- This pom is for convenience in building several aries subprojects at once.
+     Do not try to use it to deploy or release.-->
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.aries</groupId>
@@ -47,6 +50,17 @@
         <module>spi-fly</module>
         <module>samples</module>
         <module>ariestrader-sample</module>
-  </modules>
+    </modules>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>

Modified: incubator/aries/trunk/samples/blog-sample/blog-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/blog-sample/blog-api/pom.xml?rev=916927&r1=916926&r2=916927&view=diff
==============================================================================
--- incubator/aries/trunk/samples/blog-sample/blog-api/pom.xml (original)
+++ incubator/aries/trunk/samples/blog-sample/blog-api/pom.xml Sat Feb 27 08:34:07 2010
@@ -16,39 +16,34 @@
     limitations under the License.
 -->
 <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">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-	<modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-	<parent>
-		<groupId>org.apache.aries.blog-sample</groupId>
-		<artifactId>blog-sample</artifactId>
-		<version>1.0.0</version>
-	</parent>
+    <parent>
+        <groupId>org.apache.aries.blog-sample</groupId>
+        <artifactId>blog-sample</artifactId>
+        <version>1.0.0-incubating-SNAPSHOT</version>
+    </parent>
 
-	<groupId>org.apache.aries.samples</groupId>
-	<artifactId>blog-api</artifactId>
-        <name>Apache Aries blog sample API</name>
-	<version>1.0.0</version>
-	<packaging>bundle</packaging>
+    <groupId>org.apache.aries.samples</groupId>
+    <artifactId>blog-api</artifactId>
+    <name>Apache Aries blog sample API</name>
+    <packaging>bundle</packaging>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<extensions>true</extensions>
-				<configuration>
-					<instructions>
-						<Bundle-Name>blog-api</Bundle-Name>
-						<Bundle-SymbolicName>${pom.groupId}.blog-api</Bundle-SymbolicName>
-					</instructions>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-Name>blog-api</Bundle-Name>
+                        <Bundle-SymbolicName>${pom.groupId}.blog-api</Bundle-SymbolicName>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

Modified: incubator/aries/trunk/samples/blog-sample/blog-assembly/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/blog-sample/blog-assembly/pom.xml?rev=916927&r1=916926&r2=916927&view=diff
==============================================================================
--- incubator/aries/trunk/samples/blog-sample/blog-assembly/pom.xml (original)
+++ incubator/aries/trunk/samples/blog-sample/blog-assembly/pom.xml Sat Feb 27 08:34:07 2010
@@ -21,12 +21,11 @@
     <parent>
         <groupId>org.apache.aries.blog-sample</groupId>
         <artifactId>blog-sample</artifactId>
-        <version>1.0.0</version>
+        <version>1.0.0-incubating-SNAPSHOT</version>
     </parent>
 
     <artifactId>blog-assembly</artifactId>
     <name>Apache Aries blog sample assembly</name>
-    <version>1.0.0</version>
     <packaging>pom</packaging>
 
     <dependencies>
@@ -147,25 +146,25 @@
         <dependency>
             <groupId>org.apache.aries.samples</groupId>
             <artifactId>blog</artifactId>
-            <version>1.0.0</version>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.aries.samples</groupId>
             <artifactId>blog-api</artifactId>
-            <version>1.0.0</version>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.aries.samples</groupId>
             <artifactId>blog-persistence</artifactId>
-            <version>1.0.0</version>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.aries.samples</groupId>
             <artifactId>blog-servlet</artifactId>
-            <version>1.0.0</version>
+            <version>${pom.version}</version>
         </dependency>
 
 
@@ -173,16 +172,6 @@
 
     <build>
 
-        <resources>
-            <resource>
-                <directory>${pom.basedir}/src/main/resources</directory>
-                <filtering>true</filtering>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-        </resources>
-
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

Modified: incubator/aries/trunk/samples/blog-sample/blog-persistence/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/blog-sample/blog-persistence/pom.xml?rev=916927&r1=916926&r2=916927&view=diff
==============================================================================
--- incubator/aries/trunk/samples/blog-sample/blog-persistence/pom.xml (original)
+++ incubator/aries/trunk/samples/blog-sample/blog-persistence/pom.xml Sat Feb 27 08:34:07 2010
@@ -24,12 +24,11 @@
     <parent>
         <groupId>org.apache.aries.blog-sample</groupId>
         <artifactId>blog-sample</artifactId>
-        <version>1.0.0</version>
+        <version>1.0.0-incubating-SNAPSHOT</version>
     </parent>
     
 	<groupId>org.apache.aries.samples</groupId>
 	<artifactId>blog-persistence</artifactId>
-	<version>1.0.0</version>
 	<name>Apache Aries blog sample persistence</name>
 	<packaging>bundle</packaging>
 	
@@ -46,10 +45,6 @@
                     </instructions>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-            </plugin>
         </plugins>
     </build>
     
@@ -57,7 +52,7 @@
         <dependency>
             <groupId>org.apache.aries.samples</groupId>
             <artifactId>blog-api</artifactId>
-            <version>1.0.0</version>
+            <version>${pom.version}</version>
             <scope>provided</scope>
         </dependency>
        <dependency>

Modified: incubator/aries/trunk/samples/blog-sample/blog-servlet/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/blog-sample/blog-servlet/pom.xml?rev=916927&r1=916926&r2=916927&view=diff
==============================================================================
--- incubator/aries/trunk/samples/blog-sample/blog-servlet/pom.xml (original)
+++ incubator/aries/trunk/samples/blog-sample/blog-servlet/pom.xml Sat Feb 27 08:34:07 2010
@@ -23,13 +23,12 @@
 	<parent>
 		<groupId>org.apache.aries.blog-sample</groupId>
 		<artifactId>blog-sample</artifactId>
-		<version>1.0.0</version>
+        <version>1.0.0-incubating-SNAPSHOT</version>
 	</parent>
 
 	<groupId>org.apache.aries.samples</groupId>
 	<artifactId>blog-servlet</artifactId>
 	<name>Apache Aries blog sample servlet</name>
-	<version>1.0.0</version>
 	<packaging>bundle</packaging>
 
 	<build>
@@ -46,17 +45,13 @@
 					</instructions>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-			</plugin>
 		</plugins>
 	</build>
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.aries.samples</groupId>
 			<artifactId>blog-api</artifactId>
-			<version>1.0.0</version>
+			<version>${pom.version}</version>
 		</dependency>
 	 	<dependency>
 			<groupId>org.mortbay.jetty</groupId>

Modified: incubator/aries/trunk/samples/blog-sample/blog/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/blog-sample/blog/pom.xml?rev=916927&r1=916926&r2=916927&view=diff
==============================================================================
--- incubator/aries/trunk/samples/blog-sample/blog/pom.xml (original)
+++ incubator/aries/trunk/samples/blog-sample/blog/pom.xml Sat Feb 27 08:34:07 2010
@@ -19,19 +19,16 @@
 	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>
+        <artifactId>blog-sample</artifactId>
+        <groupId>org.apache.aries.blog-sample</groupId>
+        <version>1.0.0-incubating-SNAPSHOT</version>
+    </parent>
 
 	<groupId>org.apache.aries.samples</groupId>
 	<artifactId>blog</artifactId>
 	<name>Apache Aries blog sample </name>
 	<packaging>bundle</packaging>
-	<version>1.0.0</version>
-
-
-	<parent>
-		<artifactId>blog-sample</artifactId>
-		<groupId>org.apache.aries.blog-sample</groupId>
-		<version>1.0.0</version>
-	</parent>
 
 	<build>
 		<plugins>
@@ -46,17 +43,13 @@
 					</instructions>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-			</plugin>
 		</plugins>
 	</build>
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.aries.samples</groupId>
 			<artifactId>blog-api</artifactId>
-			<version>1.0.0</version>
+			<version>${pom.version}</version>
 		</dependency>
 	</dependencies>
 </project>

Modified: incubator/aries/trunk/samples/blog-sample/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/blog-sample/pom.xml?rev=916927&r1=916926&r2=916927&view=diff
==============================================================================
--- incubator/aries/trunk/samples/blog-sample/pom.xml (original)
+++ incubator/aries/trunk/samples/blog-sample/pom.xml Sat Feb 27 08:34:07 2010
@@ -18,18 +18,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.samples</groupId>
+        <artifactId>samples</artifactId>
+        <version>1.0.0-incubating-SNAPSHOT</version>
+    </parent>
+
     <groupId>org.apache.aries.blog-sample</groupId>
-    <version>1.0.0</version>
     <artifactId>blog-sample</artifactId>
     <name>Apache Aries blog sample</name>
     <packaging>pom</packaging>
 	
-	<parent>
-	    <groupId>org.apache.aries.samples</groupId>
-		<artifactId>samples</artifactId>
-		<version>1.0.0-incubating-SNAPSHOT</version>
-	</parent>
 
     <modules>
         <module>blog</module>

Modified: incubator/aries/trunk/samples/blueprint-sample-idverifier/blueprint-sample-idverifier-assembly/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/blueprint-sample-idverifier/blueprint-sample-idverifier-assembly/pom.xml?rev=916927&r1=916926&r2=916927&view=diff
==============================================================================
--- incubator/aries/trunk/samples/blueprint-sample-idverifier/blueprint-sample-idverifier-assembly/pom.xml (original)
+++ incubator/aries/trunk/samples/blueprint-sample-idverifier/blueprint-sample-idverifier-assembly/pom.xml Sat Feb 27 08:34:07 2010
@@ -122,16 +122,6 @@
 
 	<build>
 
-		<resources>
-			<resource>
-				<directory>${pom.basedir}/src/main/resources</directory>
-				<filtering>true</filtering>
-				<includes>
-					<include>**/*</include>
-				</includes>
-			</resource>
-		</resources>
-
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>

Modified: incubator/aries/trunk/samples/blueprint-sample-idverifier/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/blueprint-sample-idverifier/pom.xml?rev=916927&r1=916926&r2=916927&view=diff
==============================================================================
--- incubator/aries/trunk/samples/blueprint-sample-idverifier/pom.xml (original)
+++ incubator/aries/trunk/samples/blueprint-sample-idverifier/pom.xml Sat Feb 27 08:34:07 2010
@@ -15,8 +15,9 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<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">
-    
+<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>
@@ -24,54 +25,34 @@
         <artifactId>samples</artifactId>
         <version>1.0.0-incubating-SNAPSHOT</version>
     </parent>
-    
+
     <groupId>org.apache.aries.samples</groupId>
-    <version>1.0.0-incubating-SNAPSHOT</version>
     <artifactId>blueprint-sample-idverifier</artifactId>
     <name>Apache Aries Blueprint Sample - ID Verifier</name>
     <packaging>pom</packaging>
 
-    <repositories>
-       <!--  <repository>
-            <id>apache.snapshots</id>
-            <name>Apache Snapshots Repository</name>
-            <url>https://repository.apache.org/content/groups/snapshots-group</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-        -->
-    </repositories>
-  
     <dependencyManagement>
-    <dependencies>
-        
+        <dependencies>
+
             <dependency>
                 <groupId>org.eclipse</groupId>
                 <artifactId>osgi</artifactId>
                 <version>3.5.0.v20090520</version>
             </dependency>
-       
-       <dependency>
+
+            <dependency>
                 <groupId>org.apache.aries.blueprint</groupId>
                 <artifactId>org.apache.aries.blueprint.api</artifactId>
-                <version>${pom.version}</version>
+                <version>1.0.0-incubating-SNAPSHOT</version>
             </dependency>
 
-	
-    </dependencies>
-	</dependencyManagement>
+        </dependencies>
+    </dependencyManagement>
 
     <modules>
         <module>blueprint-sample-idverifier-api</module>
         <module>blueprint-sample-idverifier-server</module>
-	<module>blueprint-sample-idverifier-client</module>
+        <module>blueprint-sample-idverifier-client</module>
         <module>blueprint-sample-idverifier-assembly</module>
     </modules>
 

Modified: incubator/aries/trunk/samples/helloworld-samples/blueprint-helloworld/blueprint-helloworld-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/helloworld-samples/blueprint-helloworld/blueprint-helloworld-api/pom.xml?rev=916927&r1=916926&r2=916927&view=diff
==============================================================================
--- incubator/aries/trunk/samples/helloworld-samples/blueprint-helloworld/blueprint-helloworld-api/pom.xml (original)
+++ incubator/aries/trunk/samples/helloworld-samples/blueprint-helloworld/blueprint-helloworld-api/pom.xml Sat Feb 27 08:34:07 2010
@@ -33,7 +33,6 @@
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin
                 </artifactId>
-                <extensions>true</extensions>
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>

Modified: incubator/aries/trunk/samples/helloworld-samples/blueprint-helloworld/blueprint-helloworld-client/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/helloworld-samples/blueprint-helloworld/blueprint-helloworld-client/pom.xml?rev=916927&r1=916926&r2=916927&view=diff
==============================================================================
--- incubator/aries/trunk/samples/helloworld-samples/blueprint-helloworld/blueprint-helloworld-client/pom.xml (original)
+++ incubator/aries/trunk/samples/helloworld-samples/blueprint-helloworld/blueprint-helloworld-client/pom.xml Sat Feb 27 08:34:07 2010
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.apache.aries.samples</groupId>
 			<artifactId>blueprint-helloworld-api</artifactId>
-			<version>1.0.0-incubating-SNAPSHOT</version>
+			<version>${pom.version}</version>
 		</dependency>
 	</dependencies>
 </project>

Modified: incubator/aries/trunk/samples/helloworld-samples/blueprint-helloworld/blueprint-helloworld-server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/helloworld-samples/blueprint-helloworld/blueprint-helloworld-server/pom.xml?rev=916927&r1=916926&r2=916927&view=diff
==============================================================================
--- incubator/aries/trunk/samples/helloworld-samples/blueprint-helloworld/blueprint-helloworld-server/pom.xml (original)
+++ incubator/aries/trunk/samples/helloworld-samples/blueprint-helloworld/blueprint-helloworld-server/pom.xml Sat Feb 27 08:34:07 2010
@@ -46,7 +46,7 @@
         <dependency>
                 <groupId>org.apache.aries.samples</groupId>
                 <artifactId>blueprint-helloworld-api</artifactId>
-                <version>1.0.0-incubating-SNAPSHOT</version>
+                <version>${pom.version}</version>
         </dependency>
     </dependencies>
 </project>

Modified: incubator/aries/trunk/samples/helloworld-samples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/helloworld-samples/pom.xml?rev=916927&r1=916926&r2=916927&view=diff
==============================================================================
--- incubator/aries/trunk/samples/helloworld-samples/pom.xml (original)
+++ incubator/aries/trunk/samples/helloworld-samples/pom.xml Sat Feb 27 08:34:07 2010
@@ -1,37 +1,36 @@
-
-	<!--
-		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.
-	-->
+<!--
+        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.
+    -->
 <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">
+         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>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
         <groupId>org.apache.aries.samples</groupId>
         <artifactId>samples</artifactId>
-	<version>1.0.0-incubating-SNAPSHOT</version>
-        </parent>
+        <version>1.0.0-incubating-SNAPSHOT</version>
+    </parent>
 
-	<artifactId>helloworld-samples</artifactId>
-	<name>Apache Aries HelloWorld samples</name>
-	<packaging>pom</packaging>
-	<description>Example hello world application</description>
-
-	<modules>
-		<module>blueprint-helloworld</module>
-	</modules>
+    <artifactId>helloworld-samples</artifactId>
+    <name>Apache Aries HelloWorld samples</name>
+    <packaging>pom</packaging>
+    <description>Example hello world application</description>
+
+    <modules>
+        <module>blueprint-helloworld</module>
+    </modules>
 
 
 </project>

Modified: incubator/aries/trunk/samples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/pom.xml?rev=916927&r1=916926&r2=916927&view=diff
==============================================================================
--- incubator/aries/trunk/samples/pom.xml (original)
+++ incubator/aries/trunk/samples/pom.xml Sat Feb 27 08:34:07 2010
@@ -31,17 +31,11 @@
     <name>Apache Aries Samples</name>
     <packaging>pom</packaging>
   
-    <build>
-        <pluginManagement>
-            <plugins>    
-                <plugin>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>maven-bundle-plugin</artifactId>
-                    <version>2.0.1</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/aries/trunk/samples</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/aries/trunk/samples</developerConnection>
+        <url>http://svn.apache.org/viewvc/incubator/aries/trunk/samples</url>
+    </scm>
 
     <modules>
         <module>helloworld-samples</module>

Modified: incubator/aries/trunk/samples/transaction-sample/osgi-jdbc-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/transaction-sample/osgi-jdbc-api/pom.xml?rev=916927&r1=916926&r2=916927&view=diff
==============================================================================
--- incubator/aries/trunk/samples/transaction-sample/osgi-jdbc-api/pom.xml (original)
+++ incubator/aries/trunk/samples/transaction-sample/osgi-jdbc-api/pom.xml Sat Feb 27 08:34:07 2010
@@ -16,39 +16,34 @@
     limitations under the License.
 -->
 <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">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-	<modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-	<parent>
-		<groupId>org.apache.aries.transaction-sample</groupId>
-		<artifactId>transaction-sample</artifactId>
-		<version>1.0.0</version>
-	</parent>
+    <parent>
+        <groupId>org.apache.aries.transaction-sample</groupId>
+        <artifactId>transaction-sample</artifactId>
+        <version>1.0.0-incubating-SNAPSHOT</version>
+    </parent>
 
-	<groupId>org.apache.aries.samples</groupId>
-	<artifactId>osgi-jdbc-api</artifactId>
-        <name>Apache Aries OSGi API for JDBC access</name>
-	<version>1.0.0</version>
-	<packaging>bundle</packaging>
+    <groupId>org.apache.aries.samples</groupId>
+    <artifactId>osgi-jdbc-api</artifactId>
+    <name>Apache Aries OSGi API for JDBC access</name>
+    <packaging>bundle</packaging>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<extensions>true</extensions>
-				<configuration>
-					<instructions>
-						<Bundle-Name>osgi-jdbc-api</Bundle-Name>
-						<Bundle-SymbolicName>${pom.groupId}.osgi-jdbc-api</Bundle-SymbolicName>
-					</instructions>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-Name>osgi-jdbc-api</Bundle-Name>
+                        <Bundle-SymbolicName>${pom.groupId}.osgi-jdbc-api</Bundle-SymbolicName>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

Modified: incubator/aries/trunk/samples/transaction-sample/osgi-jdbc-derby/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/transaction-sample/osgi-jdbc-derby/pom.xml?rev=916927&r1=916926&r2=916927&view=diff
==============================================================================
--- incubator/aries/trunk/samples/transaction-sample/osgi-jdbc-derby/pom.xml (original)
+++ incubator/aries/trunk/samples/transaction-sample/osgi-jdbc-derby/pom.xml Sat Feb 27 08:34:07 2010
@@ -16,59 +16,58 @@
     limitations under the License.
 -->
 <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">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-	<modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-	<parent>
-		<groupId>org.apache.aries.transaction-sample</groupId>
-		<artifactId>transaction-sample</artifactId>
-		<version>1.0.0</version>
-	</parent>
+    <parent>
+        <groupId>org.apache.aries.transaction-sample</groupId>
+        <artifactId>transaction-sample</artifactId>
+        <version>1.0.0-incubating-SNAPSHOT</version>
+    </parent>
 
-	<groupId>org.apache.aries.samples</groupId>
-	<artifactId>osgi-jdbc-derby</artifactId>
-        <name>Apache Aries sample Derby ODGi JDBC driver</name>
-	<version>1.0.0</version>
-	<packaging>bundle</packaging>
-	<dependencies>
-		<dependency>
-			<groupId>org.eclipse.osgi</groupId>
-			<artifactId>osgi</artifactId>
-			<version>3.5.0</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.derby</groupId>
-			<artifactId>derby</artifactId>
-			<version>10.5.3.0_1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.aries.samples</groupId>
-			<artifactId>osgi-jdbc-api</artifactId>
-			<version>1.0.0</version>
-			<type>bundle</type>
-			<scope>compile</scope>
-		</dependency>		
-	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<extensions>true</extensions>
-				<configuration>
-					<instructions>
-						<Bundle-Name>osgi-jdbc-derby</Bundle-Name>
-						<Bundle-SymbolicName>${pom.groupId}.osgi-jdbc-derby</Bundle-SymbolicName>
-						<DynamicImport-Package>javax.transaction;version="1.1",javax.transaction.xa;version="1.1",*</DynamicImport-Package>
-						<Import-Package></Import-Package>
-						<Private-Package>org.apache.derby.*</Private-Package>
-                        <Bundle-Activator>org.apache.aries.samples.osgijdbc.derby.DerbyActivator</Bundle-Activator>						
-						<Export-Service>org.osgi.service.jdbc.DataSourceFactory</Export-Service>
-					</instructions>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+    <groupId>org.apache.aries.samples</groupId>
+    <artifactId>osgi-jdbc-derby</artifactId>
+    <name>Apache Aries sample Derby ODGi JDBC driver</name>
+    <packaging>bundle</packaging>
+    <dependencies>
+        <dependency>
+            <groupId>org.eclipse.osgi</groupId>
+            <artifactId>osgi</artifactId>
+            <version>3.5.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+            <version>10.5.3.0_1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.samples</groupId>
+            <artifactId>osgi-jdbc-api</artifactId>
+            <version>1.0.0</version>
+            <type>bundle</type>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-Name>osgi-jdbc-derby</Bundle-Name>
+                        <Bundle-SymbolicName>${pom.groupId}.osgi-jdbc-derby</Bundle-SymbolicName>
+                        <DynamicImport-Package>javax.transaction;version="1.1",javax.transaction.xa;version="1.1",*
+                        </DynamicImport-Package>
+                        <Import-Package></Import-Package>
+                        <Private-Package>org.apache.derby.*</Private-Package>
+                        <Bundle-Activator>org.apache.aries.samples.osgijdbc.derby.DerbyActivator</Bundle-Activator>
+                        <Export-Service>org.osgi.service.jdbc.DataSourceFactory</Export-Service>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

Modified: incubator/aries/trunk/samples/transaction-sample/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/transaction-sample/pom.xml?rev=916927&r1=916926&r2=916927&view=diff
==============================================================================
--- incubator/aries/trunk/samples/transaction-sample/pom.xml (original)
+++ incubator/aries/trunk/samples/transaction-sample/pom.xml Sat Feb 27 08:34:07 2010
@@ -18,18 +18,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.samples</groupId>
+        <artifactId>samples</artifactId>
+        <version>1.0.0-incubating-SNAPSHOT</version>
+    </parent>
     
     <groupId>org.apache.aries.transaction-sample</groupId>
-    <version>1.0.0</version>
     <artifactId>transaction-sample</artifactId>
     <name>Apache Aries Transaction sample</name>
     <packaging>pom</packaging>
 	
-	<parent>
-	    <groupId>org.apache.aries.samples</groupId>
-		<artifactId>samples</artifactId>
-		<version>1.0.0-incubating-SNAPSHOT</version>
-	</parent>
 
     <modules>
         <module>osgi-jdbc-api</module>

Modified: incubator/aries/trunk/samples/transaction-sample/transaction-assembly/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/transaction-sample/transaction-assembly/pom.xml?rev=916927&r1=916926&r2=916927&view=diff
==============================================================================
--- incubator/aries/trunk/samples/transaction-sample/transaction-assembly/pom.xml (original)
+++ incubator/aries/trunk/samples/transaction-sample/transaction-assembly/pom.xml Sat Feb 27 08:34:07 2010
@@ -21,12 +21,12 @@
 	<parent>
 		<groupId>org.apache.aries.transaction-sample</groupId>
 		<artifactId>transaction-sample</artifactId>
-		<version>1.0.0</version>
+        <version>1.0.0-incubating-SNAPSHOT</version>
+
 	</parent>
 
 	<artifactId>transaction-assembly</artifactId>
 	<name>Apache Aries Transaction sample assembly</name>
-	<version>1.0.0</version>
 	<packaging>pom</packaging>
 
 	<dependencies>

Modified: incubator/aries/trunk/samples/transaction-sample/transaction-sample-web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/transaction-sample/transaction-sample-web/pom.xml?rev=916927&r1=916926&r2=916927&view=diff
==============================================================================
--- incubator/aries/trunk/samples/transaction-sample/transaction-sample-web/pom.xml (original)
+++ incubator/aries/trunk/samples/transaction-sample/transaction-sample-web/pom.xml Sat Feb 27 08:34:07 2010
@@ -16,69 +16,65 @@
     limitations under the License.
 -->
 <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">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-	<modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-	<parent>
-		<groupId>org.apache.aries.transaction-sample</groupId>
-		<artifactId>transaction-sample</artifactId>
-		<version>1.0.0</version>
-	</parent>
+    <parent>
+        <groupId>org.apache.aries.transaction-sample</groupId>
+        <artifactId>transaction-sample</artifactId>
+        <version>1.0.0-incubating-SNAPSHOT</version>
+    </parent>
 
-	<groupId>org.apache.aries.samples</groupId>
-	<artifactId>transaction-sample-web</artifactId>
-	<name>Apache Aries Transaction sample servlet</name>
-	<version>1.0.0</version>
-	<packaging>bundle</packaging>
+    <groupId>org.apache.aries.samples</groupId>
+    <artifactId>transaction-sample-web</artifactId>
+    <name>Apache Aries Transaction sample servlet</name>
+    <packaging>bundle</packaging>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<extensions>true</extensions>
-				<configuration>
-					<instructions>
-						<Bundle-SymbolicName>${pom.groupId}.transaction-sample-web</Bundle-SymbolicName>
-						<Export-Package>!org.apache.aries.samples.*</Export-Package>
-						<Import-Package> javax.transaction;version="1.1",javax.transaction.xa;version="1.1",*</Import-Package>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${pom.groupId}.transaction-sample-web</Bundle-SymbolicName>
+                        <Export-Package>!org.apache.aries.samples.*</Export-Package>
+                        <Import-Package>javax.transaction;version="1.1",javax.transaction.xa;version="1.1",*
+                        </Import-Package>
                         <Web-ContextPath>/osgitransactions</Web-ContextPath>
-					</instructions>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-<!--		<dependency>
-			<groupId>org.apache.aries.samples</groupId>
-			<artifactId>blog-api</artifactId>
-			<version>1.0.0</version>
-		</dependency> -->
-		<dependency>
-			<groupId>org.apache.aries.samples</groupId>
-			<artifactId>osgi-jdbc-api</artifactId>
-			<version>1.0.0</version>
-		</dependency>
-		<dependency>
-		  <groupId>javax.transaction</groupId>
-		  <artifactId>jta</artifactId>
-		  <version>1.1</version>
-		</dependency>
-		<dependency>
-          <groupId>org.osgi</groupId>
-          <artifactId>org.osgi.core</artifactId>
-          <version>4.2.0</version>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <!--		<dependency>
+              <groupId>org.apache.aries.samples</groupId>
+              <artifactId>blog-api</artifactId>
+              <version>${pom.version}</version>
+          </dependency> -->
+        <dependency>
+            <groupId>org.apache.aries.samples</groupId>
+            <artifactId>osgi-jdbc-api</artifactId>
+            <version>${pom.version}</version>
         </dependency>
-	 	<dependency>
-			<groupId>org.mortbay.jetty</groupId>
-			<artifactId>servlet-api-2.5</artifactId>
-			<version>6.1.5</version>
-		</dependency>
-	</dependencies>
+        <dependency>
+            <groupId>javax.transaction</groupId>
+            <artifactId>jta</artifactId>
+            <version>1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <version>4.2.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>servlet-api-2.5</artifactId>
+            <version>6.1.5</version>
+        </dependency>
+    </dependencies>
 </project>
 	

Modified: incubator/aries/trunk/spi-fly/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/spi-fly/pom.xml?rev=916927&r1=916926&r2=916927&view=diff
==============================================================================
--- incubator/aries/trunk/spi-fly/pom.xml (original)
+++ incubator/aries/trunk/spi-fly/pom.xml Sat Feb 27 08:34:07 2010
@@ -35,6 +35,11 @@
 JRE through META-INF/services resources).
     </description>
     
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/aries/trunk/spi-fly</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/aries/trunk/spi-fly</developerConnection>
+        <url>http://svn.apache.org/viewvc/incubator/aries/trunk/spi-fly</url>
+    </scm>
     <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>
@@ -74,8 +79,6 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.0.1</version>
-                <extensions>true</extensions>
                 <configuration>
                     <instructions>
                         <Import-Package>

Modified: incubator/aries/trunk/testsupport/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/testsupport/pom.xml?rev=916927&r1=916926&r2=916927&view=diff
==============================================================================
--- incubator/aries/trunk/testsupport/pom.xml (original)
+++ incubator/aries/trunk/testsupport/pom.xml Sat Feb 27 08:34:07 2010
@@ -16,13 +16,14 @@
  specific language governing permissions and limitations
  under the License.
 -->
-<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">
+<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>
         <groupId>org.apache.aries</groupId>
         <artifactId>java5-parent</artifactId>
         <version>1.0.0-incubating-SNAPSHOT</version>
-    </parent>  
+    </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.aries.testsupport</groupId>
@@ -35,6 +36,11 @@
         Test Support for OSGi
     </description>
 
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/aries/trunk/testsupport</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/aries/trunk/testsupport</developerConnection>
+        <url>http://svn.apache.org/viewvc/incubator/aries/trunk/testsupport</url>
+    </scm>
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -54,25 +60,4 @@
         <module>testsupport-unit</module>
     </modules>
 
-		<build>
-		    <pluginManagement>
-		        <plugins>
-		            <plugin>
-		                <groupId>org.apache.felix</groupId>
-		                <artifactId>maven-bundle-plugin</artifactId>
-		                <version>2.0.1</version>
-		            </plugin>
-		            <plugin>
-		                <groupId>org.apache.maven.plugins</groupId>
-		                <artifactId>maven-release-plugin</artifactId>
-		                <configuration>
-		                    <useReleaseProfile>false</useReleaseProfile>
-		                    <goals>deploy</goals>
-		                    <arguments>-Papache-release,deploy</arguments>
-		                </configuration>
-		            </plugin>
-		        </plugins>
-		    </pluginManagement>
-		</build>
-
 </project>

Modified: incubator/aries/trunk/testsupport/testsupport-unit/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/testsupport/testsupport-unit/pom.xml?rev=916927&r1=916926&r2=916927&view=diff
==============================================================================
--- incubator/aries/trunk/testsupport/testsupport-unit/pom.xml (original)
+++ incubator/aries/trunk/testsupport/testsupport-unit/pom.xml Sat Feb 27 08:34:07 2010
@@ -49,7 +49,6 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
         <configuration>
           <instructions>
             <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>

Modified: incubator/aries/trunk/transaction/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/transaction/pom.xml?rev=916927&r1=916926&r2=916927&view=diff
==============================================================================
--- incubator/aries/trunk/transaction/pom.xml (original)
+++ incubator/aries/trunk/transaction/pom.xml Sat Feb 27 08:34:07 2010
@@ -28,9 +28,15 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.aries.transaction</groupId>
     <artifactId>transaction</artifactId>
+    <version>1.0.0-incubating-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Apache Aries Transaction</name> 
 
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/aries/trunk/transaction</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/aries/trunk/transaction</developerConnection>
+        <url>http://svn.apache.org/viewvc/incubator/aries/trunk/transaction</url>
+    </scm>
 	<modules>
 		<module>transaction-manager</module>
 		<module>transaction-blueprint</module>

Modified: incubator/aries/trunk/transaction/transaction-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/transaction/transaction-blueprint/pom.xml?rev=916927&r1=916926&r2=916927&view=diff
==============================================================================
--- incubator/aries/trunk/transaction/transaction-blueprint/pom.xml (original)
+++ incubator/aries/trunk/transaction/transaction-blueprint/pom.xml Sat Feb 27 08:34:07 2010
@@ -89,8 +89,6 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.0.1</version>
-                <extensions>true</extensions>
                 <configuration>
                     <instructions>
                         <Import-Package>



Mime
View raw message