You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by dj...@apache.org on 2011/09/27 02:13:15 UTC
svn commit: r1176139 - in /aries/trunk: application/application-api/
application/application-converters/
application/application-default-local-platform/
application/application-deployment-management/
application/application-distro/ application/applicat...
Author: djencks
Date: Tue Sep 27 00:13:11 2011
New Revision: 1176139
URL: http://svn.apache.org/viewvc?rev=1176139&view=rev
Log:
ARIES-744 try to clean up poms to make scopes more consistent and reduce duplication
Modified:
aries/trunk/application/application-api/pom.xml
aries/trunk/application/application-converters/pom.xml
aries/trunk/application/application-default-local-platform/pom.xml
aries/trunk/application/application-deployment-management/pom.xml
aries/trunk/application/application-distro/pom.xml
aries/trunk/application/application-isolated-distro/pom.xml
aries/trunk/application/application-itests/pom.xml
aries/trunk/application/application-modeller-standalone/pom.xml
aries/trunk/application/application-modeller/pom.xml
aries/trunk/application/application-noop-resolver/pom.xml
aries/trunk/application/application-obr-resolver/pom.xml
aries/trunk/application/application-utils/pom.xml
aries/trunk/blueprint/blueprint-bundle/pom.xml
aries/trunk/blueprint/blueprint-cm/pom.xml
aries/trunk/blueprint/blueprint-core/pom.xml
aries/trunk/blueprint/blueprint-parser/pom.xml
aries/trunk/eba-maven-plugin/pom.xml
aries/trunk/ejb/ejb-modeller-itest/pom.xml
aries/trunk/ejb/ejb-modeller/pom.xml
aries/trunk/ejb/openejb-extender-itest/pom.xml
aries/trunk/ejb/openejb-extender/pom.xml
aries/trunk/jndi/jndi-bundle/pom.xml
aries/trunk/jndi/jndi-url-itest/pom.xml
aries/trunk/jpa/jpa-api/pom.xml
aries/trunk/jpa/jpa-blueprint-aries/pom.xml
aries/trunk/jpa/jpa-container-context/pom.xml
aries/trunk/jpa/jpa-container-itest/pom.xml
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/advanced/features/itest/JPAWeavingAndAnnotationScanningTest.java
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/blueprint/aries/itest/JPAInjectionTest.java
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerDataSourceFactoryTest.java
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/EclipseLinkStartupTest.java
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/JPAContextTest.java
aries/trunk/jpa/jpa-container/pom.xml
aries/trunk/proxy/proxy-api/pom.xml
aries/trunk/proxy/proxy-bundle/pom.xml
aries/trunk/proxy/proxy-impl/pom.xml
aries/trunk/quiesce/quiesce-manager/pom.xml
aries/trunk/samples/blog/blog-jdbc-eba/pom.xml
aries/trunk/samples/blog/blog-jpa-eba/pom.xml
aries/trunk/samples/blog/blog-web/pom.xml
aries/trunk/samples/twitter/twitter-bundle/pom.xml
aries/trunk/samples/twitter/twitter-eba/pom.xml
aries/trunk/samples/twitter/twitter-twitter4j/pom.xml
aries/trunk/transaction/transaction-blueprint/pom.xml
aries/trunk/transaction/transaction-manager/pom.xml
Modified: aries/trunk/application/application-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-api/pom.xml?rev=1176139&r1=1176138&r2=1176139&view=diff
==============================================================================
--- aries/trunk/application/application-api/pom.xml (original)
+++ aries/trunk/application/application-api/pom.xml Tue Sep 27 00:13:11 2011
@@ -61,7 +61,6 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>4.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: aries/trunk/application/application-converters/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-converters/pom.xml?rev=1176139&r1=1176138&r2=1176139&view=diff
==============================================================================
--- aries/trunk/application/application-converters/pom.xml (original)
+++ aries/trunk/application/application-converters/pom.xml Tue Sep 27 00:13:11 2011
@@ -55,7 +55,6 @@
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.utils</artifactId>
- <scope>provided</scope>
<version>0.3.1-SNAPSHOT</version>
</dependency>
Modified: aries/trunk/application/application-default-local-platform/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-default-local-platform/pom.xml?rev=1176139&r1=1176138&r2=1176139&view=diff
==============================================================================
--- aries/trunk/application/application-default-local-platform/pom.xml (original)
+++ aries/trunk/application/application-default-local-platform/pom.xml Tue Sep 27 00:13:11 2011
@@ -55,7 +55,6 @@
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.api</artifactId>
<version>0.3.1-SNAPSHOT</version>
- <scope>provided</scope>
</dependency>
</dependencies>
Modified: aries/trunk/application/application-deployment-management/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-deployment-management/pom.xml?rev=1176139&r1=1176138&r2=1176139&view=diff
==============================================================================
--- aries/trunk/application/application-deployment-management/pom.xml (original)
+++ aries/trunk/application/application-deployment-management/pom.xml Tue Sep 27 00:13:11 2011
@@ -69,7 +69,6 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>4.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: aries/trunk/application/application-distro/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-distro/pom.xml?rev=1176139&r1=1176138&r2=1176139&view=diff
==============================================================================
--- aries/trunk/application/application-distro/pom.xml (original)
+++ aries/trunk/application/application-distro/pom.xml Tue Sep 27 00:13:11 2011
@@ -30,6 +30,7 @@
<artifactId>org.apache.aries.application-distro</artifactId>
<name>Application distribution</name>
<version>0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/application/application-distro</connection>
Modified: aries/trunk/application/application-isolated-distro/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-isolated-distro/pom.xml?rev=1176139&r1=1176138&r2=1176139&view=diff
==============================================================================
--- aries/trunk/application/application-isolated-distro/pom.xml (original)
+++ aries/trunk/application/application-isolated-distro/pom.xml Tue Sep 27 00:13:11 2011
@@ -30,6 +30,7 @@
<artifactId>org.apache.aries.application-isolated-distro</artifactId>
<name>Application distribution for isolated application support</name>
<version>0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/application/application-isolated-distro</connection>
Modified: aries/trunk/application/application-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-itests/pom.xml?rev=1176139&r1=1176138&r2=1176139&view=diff
==============================================================================
--- aries/trunk/application/application-itests/pom.xml (original)
+++ aries/trunk/application/application-itests/pom.xml Tue Sep 27 00:13:11 2011
@@ -48,21 +48,21 @@
<scope>test</scope>
</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>
+ <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>
+ <dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
<version>0.4-SNAPSHOT</version>
@@ -133,12 +133,6 @@
<version>0.3.1-SNAPSHOT</version>
<scope>test</scope>
</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.apache.aries.application</groupId>
Modified: aries/trunk/application/application-modeller-standalone/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-modeller-standalone/pom.xml?rev=1176139&r1=1176138&r2=1176139&view=diff
==============================================================================
--- aries/trunk/application/application-modeller-standalone/pom.xml (original)
+++ aries/trunk/application/application-modeller-standalone/pom.xml Tue Sep 27 00:13:11 2011
@@ -28,7 +28,7 @@
<groupId>org.apache.aries.application</groupId>
<artifactId>application-modeller-standalone</artifactId>
<packaging>jar</packaging>
- <name>Apache Aries Application Modelling</name>
+ <name>Apache Aries Application Modelling Standalone</name>
<version>0.3.1-SNAPSHOT</version>
<description>
Modelling utilities for working with Aries Applications (distribution for offline use).
Modified: aries/trunk/application/application-modeller/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-modeller/pom.xml?rev=1176139&r1=1176138&r2=1176139&view=diff
==============================================================================
--- aries/trunk/application/application-modeller/pom.xml (original)
+++ aries/trunk/application/application-modeller/pom.xml Tue Sep 27 00:13:11 2011
@@ -81,8 +81,8 @@
<!-- Blueprint API must come before OSGi compendium because we want to compile against the Java 5 interfaces
with generics -->
<dependency>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint.api</artifactId>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint.api</artifactId>
<version>0.3.2-SNAPSHOT</version>
</dependency>
<dependency>
@@ -115,7 +115,6 @@
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.utils</artifactId>
- <scope>provided</scope>
<version>0.3.1-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: aries/trunk/application/application-noop-resolver/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-noop-resolver/pom.xml?rev=1176139&r1=1176138&r2=1176139&view=diff
==============================================================================
--- aries/trunk/application/application-noop-resolver/pom.xml (original)
+++ aries/trunk/application/application-noop-resolver/pom.xml Tue Sep 27 00:13:11 2011
@@ -54,7 +54,6 @@
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.api</artifactId>
- <scope>provided</scope>
<version>0.3.1-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: aries/trunk/application/application-obr-resolver/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-obr-resolver/pom.xml?rev=1176139&r1=1176138&r2=1176139&view=diff
==============================================================================
--- aries/trunk/application/application-obr-resolver/pom.xml (original)
+++ aries/trunk/application/application-obr-resolver/pom.xml Tue Sep 27 00:13:11 2011
@@ -59,31 +59,11 @@
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.api</artifactId>
<version>0.3.1-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.application</groupId>
- <artifactId>org.apache.aries.application.management</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.utils</artifactId>
<version>0.3.1-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.application</groupId>
- <artifactId>org.apache.aries.application.deployment.management</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.application</groupId>
- <artifactId>org.apache.aries.application.modeller</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: aries/trunk/application/application-utils/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-utils/pom.xml?rev=1176139&r1=1176138&r2=1176139&view=diff
==============================================================================
--- aries/trunk/application/application-utils/pom.xml (original)
+++ aries/trunk/application/application-utils/pom.xml Tue Sep 27 00:13:11 2011
@@ -80,7 +80,7 @@
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<scope>test</scope>
- <version>0.3</version>
+ <version>0.3</version>
</dependency>
@@ -93,7 +93,6 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>4.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: aries/trunk/blueprint/blueprint-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-bundle/pom.xml?rev=1176139&r1=1176138&r2=1176139&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-bundle/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-bundle/pom.xml Tue Sep 27 00:13:11 2011
@@ -92,16 +92,19 @@
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.api</artifactId>
<version>0.3.2-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
<version>0.3.2-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.cm</artifactId>
<version>0.3.2-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
Modified: aries/trunk/blueprint/blueprint-cm/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-cm/pom.xml?rev=1176139&r1=1176138&r2=1176139&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-cm/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-cm/pom.xml Tue Sep 27 00:13:11 2011
@@ -51,6 +51,11 @@
<dependencies>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint.api</artifactId>
+ <version>0.3.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
<version>0.3.2-SNAPSHOT</version>
</dependency>
Modified: aries/trunk/blueprint/blueprint-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/pom.xml?rev=1176139&r1=1176138&r2=1176139&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-core/pom.xml Tue Sep 27 00:13:11 2011
@@ -81,7 +81,8 @@
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>blueprint-parser</artifactId>
<version>0.4-SNAPSHOT</version>
- </dependency>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
@@ -126,7 +127,6 @@
<dependency>
<groupId>org.apache.aries.quiesce</groupId>
<artifactId>org.apache.aries.quiesce.api</artifactId>
- <scope>provided</scope>
<version>0.3.1-SNAPSHOT</version>
</dependency>
<dependency>
Modified: aries/trunk/blueprint/blueprint-parser/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-parser/pom.xml?rev=1176139&r1=1176138&r2=1176139&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-parser/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-parser/pom.xml Tue Sep 27 00:13:11 2011
@@ -31,8 +31,7 @@
<name>Apache Aries Blueprint Parser</name>
<version>0.4-SNAPSHOT</version>
<description>
- This bundle contains the core implementation of Blueprint
- along with the "ext" namespace handler.
+ This bundle contains the blueprint parser in a plain jar.
</description>
<scm>
Modified: aries/trunk/eba-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/eba-maven-plugin/pom.xml?rev=1176139&r1=1176138&r2=1176139&view=diff
==============================================================================
--- aries/trunk/eba-maven-plugin/pom.xml (original)
+++ aries/trunk/eba-maven-plugin/pom.xml Tue Sep 27 00:13:11 2011
@@ -75,6 +75,26 @@ under the License.
<version>2.3</version>
</dependency>
<dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ <version>2.0.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-archiver</artifactId>
+ <version>1.0-alpha-7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.4.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <version>1.0-alpha-9-stable-1</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
<version>1.1</version>
Modified: aries/trunk/ejb/ejb-modeller-itest/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/ejb/ejb-modeller-itest/pom.xml?rev=1176139&r1=1176138&r2=1176139&view=diff
==============================================================================
--- aries/trunk/ejb/ejb-modeller-itest/pom.xml (original)
+++ aries/trunk/ejb/ejb-modeller-itest/pom.xml Tue Sep 27 00:13:11 2011
@@ -361,7 +361,7 @@
<artifactId>openwebbeans-ejb</artifactId>
<version>${openWebBeansVersion}</version>
<type>jar</type>
- <scope>test-SNAPSHOT</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
Modified: aries/trunk/ejb/ejb-modeller/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/ejb/ejb-modeller/pom.xml?rev=1176139&r1=1176138&r2=1176139&view=diff
==============================================================================
--- aries/trunk/ejb/ejb-modeller/pom.xml (original)
+++ aries/trunk/ejb/ejb-modeller/pom.xml Tue Sep 27 00:13:11 2011
@@ -56,36 +56,32 @@
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.api</artifactId>
<version>0.3.1-SNAPSHOT</version>
- <type>bundle</type>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
<version>0.4-SNAPSHOT</version>
- <type>bundle</type>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
<version>4.0.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>javaee-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>4.2.0</version>
- <type>jar</type>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.utils</artifactId>
<version>0.3.1-SNAPSHOT</version>
- <type>bundle</type>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -101,14 +97,13 @@
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<version>0.3.1-SNAPSHOT</version>
- <scope>compile</scope>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.1_spec</artifactId>
- <version>1.0.2</version>
- <type>bundle</type>
- <scope>test</scope>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>javaee-api</artifactId>
+ <version>6.0-1</version>
+ <scope>test</scope>
</dependency>
</dependencies>
Modified: aries/trunk/ejb/openejb-extender-itest/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/ejb/openejb-extender-itest/pom.xml?rev=1176139&r1=1176138&r2=1176139&view=diff
==============================================================================
--- aries/trunk/ejb/openejb-extender-itest/pom.xml (original)
+++ aries/trunk/ejb/openejb-extender-itest/pom.xml Tue Sep 27 00:13:11 2011
@@ -375,7 +375,7 @@
<artifactId>openwebbeans-ejb</artifactId>
<version>${openWebBeansVersion}</version>
<type>jar</type>
- <scope>test-SNAPSHOT</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
Modified: aries/trunk/ejb/openejb-extender/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/ejb/openejb-extender/pom.xml?rev=1176139&r1=1176138&r2=1176139&view=diff
==============================================================================
--- aries/trunk/ejb/openejb-extender/pom.xml (original)
+++ aries/trunk/ejb/openejb-extender/pom.xml Tue Sep 27 00:13:11 2011
@@ -56,24 +56,30 @@
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
<version>0.4-SNAPSHOT</version>
- <type>bundle</type>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
<version>4.0.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>javaee-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>4.3.0</version>
- <type>jar</type>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
@@ -87,35 +93,47 @@
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<version>0.3.1-SNAPSHOT</version>
- <scope>compile</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.1_spec</artifactId>
- <version>1.0.2</version>
- <type>bundle</type>
- <scope>test</scope>
+ <artifactId>geronimo-jpa_2.0_spec</artifactId>
+ <version>1.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.specs</groupId>-->
+ <!--<artifactId>geronimo-annotation_1.1_spec</artifactId>-->
+ <!--<version>1.0.1</version>-->
+ <!--<scope>test</scope>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.specs</groupId>-->
+ <!--<artifactId>geronimo-validation_1.0_spec</artifactId>-->
+ <!--<version>1.1</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>provided</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>4.2.0</version>
- <type>jar</type>
- <scope>compile</scope>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ejb_3.1_spec</artifactId>
+ <version>1.0.2</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy.api</artifactId>
<version>0.4-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.api</artifactId>
<version>0.3.1-SNAPSHOT</version>
- <type>bundle</type>
- <scope>compile</scope>
</dependency>
</dependencies>
Modified: aries/trunk/jndi/jndi-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-bundle/pom.xml?rev=1176139&r1=1176138&r2=1176139&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-bundle/pom.xml (original)
+++ aries/trunk/jndi/jndi-bundle/pom.xml Tue Sep 27 00:13:11 2011
@@ -63,17 +63,20 @@
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.core</artifactId>
<version>0.3.1-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.url</artifactId>
<version>0.3.1-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.api</artifactId>
<version>0.3.1-SNAPSHOT</version>
- </dependency>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
Modified: aries/trunk/jndi/jndi-url-itest/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url-itest/pom.xml?rev=1176139&r1=1176138&r2=1176139&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-url-itest/pom.xml (original)
+++ aries/trunk/jndi/jndi-url-itest/pom.xml Tue Sep 27 00:13:11 2011
@@ -165,12 +165,6 @@
</dependency>
<dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>osgi</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.eclipse.equinox</groupId>
<artifactId>cm</artifactId>
<scope>test</scope>
Modified: aries/trunk/jpa/jpa-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-api/pom.xml?rev=1176139&r1=1176138&r2=1176139&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-api/pom.xml (original)
+++ aries/trunk/jpa/jpa-api/pom.xml Tue Sep 27 00:13:11 2011
@@ -59,11 +59,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.0_spec</artifactId>
<version>1.1</version>
Modified: aries/trunk/jpa/jpa-blueprint-aries/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-blueprint-aries/pom.xml?rev=1176139&r1=1176138&r2=1176139&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-blueprint-aries/pom.xml (original)
+++ aries/trunk/jpa/jpa-blueprint-aries/pom.xml Tue Sep 27 00:13:11 2011
@@ -79,7 +79,6 @@
<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.slf4j</groupId>
Modified: aries/trunk/jpa/jpa-container-context/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-context/pom.xml?rev=1176139&r1=1176138&r2=1176139&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container-context/pom.xml (original)
+++ aries/trunk/jpa/jpa-container-context/pom.xml Tue Sep 27 00:13:11 2011
@@ -87,6 +87,12 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.util</artifactId>
+ <version>0.4-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>
Modified: aries/trunk/jpa/jpa-container-itest/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-itest/pom.xml?rev=1176139&r1=1176138&r2=1176139&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container-itest/pom.xml (original)
+++ aries/trunk/jpa/jpa-container-itest/pom.xml Tue Sep 27 00:13:11 2011
@@ -90,7 +90,13 @@
</dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
- <artifactId>org.apache.aries.proxy</artifactId>
+ <artifactId>org.apache.aries.proxy.api</artifactId>
+ <version>0.4-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.proxy</groupId>
+ <artifactId>org.apache.aries.proxy.impl</artifactId>
<version>0.4-SNAPSHOT</version>
<scope>test</scope>
</dependency>
Modified: aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/advanced/features/itest/JPAWeavingAndAnnotationScanningTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/advanced/features/itest/JPAWeavingAndAnnotationScanningTest.java?rev=1176139&r1=1176138&r2=1176139&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/advanced/features/itest/JPAWeavingAndAnnotationScanningTest.java (original)
+++ aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/advanced/features/itest/JPAWeavingAndAnnotationScanningTest.java Tue Sep 27 00:13:11 2011
@@ -66,7 +66,8 @@ public abstract class JPAWeavingAndAnnot
mavenBundle("commons-pool", "commons-pool"),
mavenBundle("org.apache.aries", "org.apache.aries.util"),
mavenBundle("asm", "asm-all"),
- mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
+ mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.api"),
+ mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.impl"),
mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.api"),
mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.container"),
mavenBundle("org.apache.derby", "derby"),
Modified: aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/blueprint/aries/itest/JPAInjectionTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/blueprint/aries/itest/JPAInjectionTest.java?rev=1176139&r1=1176138&r2=1176139&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/blueprint/aries/itest/JPAInjectionTest.java (original)
+++ aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/blueprint/aries/itest/JPAInjectionTest.java Tue Sep 27 00:13:11 2011
@@ -58,7 +58,8 @@ public class JPAInjectionTest extends Ab
mavenBundle("org.apache.aries", "org.apache.aries.util"),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint"),
mavenBundle("asm", "asm-all"),
- mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
+ mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.api"),
+ mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.impl"),
mavenBundle("org.apache.geronimo.specs", "geronimo-jpa_2.0_spec"),
mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.api"),
mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.container"),
Modified: aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerDataSourceFactoryTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerDataSourceFactoryTest.java?rev=1176139&r1=1176138&r2=1176139&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerDataSourceFactoryTest.java (original)
+++ aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerDataSourceFactoryTest.java Tue Sep 27 00:13:11 2011
@@ -192,7 +192,8 @@ public class JPAContainerDataSourceFacto
mavenBundle("org.apache.aries", "org.apache.aries.util"),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint"),
mavenBundle("asm", "asm-all"),
- mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
+ mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.api"),
+ mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.impl"),
mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi.api"),
mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi.core"),
mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi.url"),
Modified: aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java?rev=1176139&r1=1176138&r2=1176139&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java (original)
+++ aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java Tue Sep 27 00:13:11 2011
@@ -65,7 +65,8 @@ public class JPAContainerTest extends Ab
mavenBundle("org.apache.aries", "org.apache.aries.util"),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint"),
mavenBundle("asm", "asm-all"),
- mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
+ mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.api"),
+ mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.impl"),
mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi.api"),
mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi.core"),
mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi.url"),
Modified: aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/EclipseLinkStartupTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/EclipseLinkStartupTest.java?rev=1176139&r1=1176138&r2=1176139&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/EclipseLinkStartupTest.java (original)
+++ aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/EclipseLinkStartupTest.java Tue Sep 27 00:13:11 2011
@@ -58,7 +58,8 @@ public class EclipseLinkStartupTest exte
// maven bundle plugin.
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint"),
mavenBundle("asm", "asm-all"),
- mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
+ mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.api"),
+ mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.impl"),
mavenBundle("org.apache.geronimo.specs", "geronimo-jpa_2.0_spec"),
mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi.api"),
mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi.core"),
Modified: aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/JPAContextTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/JPAContextTest.java?rev=1176139&r1=1176138&r2=1176139&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/JPAContextTest.java (original)
+++ aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/JPAContextTest.java Tue Sep 27 00:13:11 2011
@@ -416,7 +416,8 @@ public abstract class JPAContextTest ext
// Adding blueprint to the runtime is a hack to placate the maven bundle plugin.
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint"),
mavenBundle("asm", "asm-all"),
- mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
+ mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.api"),
+ mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.impl"),
mavenBundle("org.apache.geronimo.specs", "geronimo-jpa_2.0_spec"),
mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi.api"),
mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi.core"),
Modified: aries/trunk/jpa/jpa-container/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container/pom.xml?rev=1176139&r1=1176138&r2=1176139&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container/pom.xml (original)
+++ aries/trunk/jpa/jpa-container/pom.xml Tue Sep 27 00:13:11 2011
@@ -75,6 +75,7 @@
bundles to be able to run with 4.2 though!
-->
<version>4.3.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -85,40 +86,19 @@
<artifactId>org.apache.aries.jpa.api</artifactId>
<groupId>org.apache.aries.jpa</groupId>
<version>0.3.1-SNAPSHOT</version>
-
- <exclusions>
- <exclusion>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.aries.quiesce</groupId>
<artifactId>org.apache.aries.quiesce.api</artifactId>
<version>0.3</version>
<scope>provided</scope>
-
- <exclusions>
- <exclusion>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<artifactId>org.apache.aries.util</artifactId>
<groupId>org.apache.aries</groupId>
<version>0.4-SNAPSHOT</version>
<scope>provided</scope>
-
- <exclusions>
- <exclusion>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.0_spec</artifactId>
@@ -138,16 +118,9 @@
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
- <scope>test</scope>
<version>0.3</version>
-
- <exclusions>
- <exclusion>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
@@ -158,13 +131,13 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.enterprise</artifactId>
<version>4.2.0</version>
- <type>jar</type>
- <scope>compile</scope>
+ <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>
</dependencies>
Modified: aries/trunk/proxy/proxy-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-api/pom.xml?rev=1176139&r1=1176138&r2=1176139&view=diff
==============================================================================
--- aries/trunk/proxy/proxy-api/pom.xml (original)
+++ aries/trunk/proxy/proxy-api/pom.xml Tue Sep 27 00:13:11 2011
@@ -61,21 +61,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>osgi</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
<version>0.4-SNAPSHOT</version>
Modified: aries/trunk/proxy/proxy-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-bundle/pom.xml?rev=1176139&r1=1176138&r2=1176139&view=diff
==============================================================================
--- aries/trunk/proxy/proxy-bundle/pom.xml (original)
+++ aries/trunk/proxy/proxy-bundle/pom.xml Tue Sep 27 00:13:11 2011
@@ -66,34 +66,16 @@
<dependencies>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>osgi</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy.api</artifactId>
<version>0.4-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy.impl</artifactId>
<version>0.4-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
Modified: aries/trunk/proxy/proxy-impl/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-impl/pom.xml?rev=1176139&r1=1176138&r2=1176139&view=diff
==============================================================================
--- aries/trunk/proxy/proxy-impl/pom.xml (original)
+++ aries/trunk/proxy/proxy-impl/pom.xml Tue Sep 27 00:13:11 2011
@@ -82,19 +82,9 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>4.3.0</version>
- </dependency>
-
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- </exclusions>
</dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -109,28 +99,7 @@
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy.api</artifactId>
- <scope>compile</scope>
- <version>0.4-SNAPSHOT</version>
-
- <exclusions>
- <exclusion>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.util</artifactId>
- <scope>compile</scope>
<version>0.4-SNAPSHOT</version>
-
- <exclusions>
- <exclusion>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
Modified: aries/trunk/quiesce/quiesce-manager/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/quiesce/quiesce-manager/pom.xml?rev=1176139&r1=1176138&r2=1176139&view=diff
==============================================================================
--- aries/trunk/quiesce/quiesce-manager/pom.xml (original)
+++ aries/trunk/quiesce/quiesce-manager/pom.xml Tue Sep 27 00:13:11 2011
@@ -77,11 +77,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
Modified: aries/trunk/samples/blog/blog-jdbc-eba/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-jdbc-eba/pom.xml?rev=1176139&r1=1176138&r2=1176139&view=diff
==============================================================================
--- aries/trunk/samples/blog/blog-jdbc-eba/pom.xml (original)
+++ aries/trunk/samples/blog/blog-jdbc-eba/pom.xml Tue Sep 27 00:13:11 2011
@@ -63,6 +63,7 @@ under the License.
<plugin>
<groupId>org.apache.aries</groupId>
<artifactId>eba-maven-plugin</artifactId>
+ <version>0.4-SNAPSHOT</version>
<extensions>true</extensions>
<configuration>
<generateManifest>true</generateManifest>
Modified: aries/trunk/samples/blog/blog-jpa-eba/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-jpa-eba/pom.xml?rev=1176139&r1=1176138&r2=1176139&view=diff
==============================================================================
--- aries/trunk/samples/blog/blog-jpa-eba/pom.xml (original)
+++ aries/trunk/samples/blog/blog-jpa-eba/pom.xml Tue Sep 27 00:13:11 2011
@@ -63,6 +63,7 @@ under the License.
<plugin>
<groupId>org.apache.aries</groupId>
<artifactId>eba-maven-plugin</artifactId>
+ <version>0.4-SNAPSHOT</version>
<extensions>true</extensions>
<configuration>
<generateManifest>true</generateManifest>
Modified: aries/trunk/samples/blog/blog-web/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-web/pom.xml?rev=1176139&r1=1176138&r2=1176139&view=diff
==============================================================================
--- aries/trunk/samples/blog/blog-web/pom.xml (original)
+++ aries/trunk/samples/blog/blog-web/pom.xml Tue Sep 27 00:13:11 2011
@@ -49,7 +49,7 @@
<configuration>
<instructions>
<Web-ContextPath>/blog</Web-ContextPath>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Private-Package>org.apache.aries.samples.blog.web.*</Private-Package>
<Export-Package>!org.apache.aries.samples.blog.web.*</Export-Package>
<Import-Package>
Modified: aries/trunk/samples/twitter/twitter-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/twitter/twitter-bundle/pom.xml?rev=1176139&r1=1176138&r2=1176139&view=diff
==============================================================================
--- aries/trunk/samples/twitter/twitter-bundle/pom.xml (original)
+++ aries/trunk/samples/twitter/twitter-bundle/pom.xml Tue Sep 27 00:13:11 2011
@@ -57,7 +57,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Activator>org.apache.aries.sample.twitter.TwitterQuery</Bundle-Activator>
<Private-Package>org.apache.aries.sample.twitter</Private-Package>
</instructions>
Modified: aries/trunk/samples/twitter/twitter-eba/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/twitter/twitter-eba/pom.xml?rev=1176139&r1=1176138&r2=1176139&view=diff
==============================================================================
--- aries/trunk/samples/twitter/twitter-eba/pom.xml (original)
+++ aries/trunk/samples/twitter/twitter-eba/pom.xml Tue Sep 27 00:13:11 2011
@@ -46,11 +46,12 @@ under the License.
<plugin>
<groupId>org.apache.aries</groupId>
<artifactId>eba-maven-plugin</artifactId>
+ <version>${ariesEbaMavenPluginVersion}</version>
<extensions>true</extensions>
<configuration>
<generateManifest>true</generateManifest>
<instructions>
- <Application-SymbolicName>${pom.artifactId}</Application-SymbolicName>
+ <Application-SymbolicName>${project.artifactId}</Application-SymbolicName>
</instructions>
</configuration>
</plugin>
Modified: aries/trunk/samples/twitter/twitter-twitter4j/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/twitter/twitter-twitter4j/pom.xml?rev=1176139&r1=1176138&r2=1176139&view=diff
==============================================================================
--- aries/trunk/samples/twitter/twitter-twitter4j/pom.xml (original)
+++ aries/trunk/samples/twitter/twitter-twitter4j/pom.xml Tue Sep 27 00:13:11 2011
@@ -44,9 +44,9 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Bundle-Name>${pom.name}</Bundle-Name>
- <Bundle-Version>${pom.version}</Bundle-Version>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-Name>${project.name}</Bundle-Name>
+ <Bundle-Version>${project.version}</Bundle-Version>
<Embed-Dependency>*;scope=compile|runtime;inline=true</Embed-Dependency>
<Import-Package>com.sun.syndication.feed.synd;resolution:=optional,com.sun.syndication.io;resolution:=optional,javax.crypto,javax.crypto.spec,javax.xml.parsers,javax.xml.transform,javax.xml.transform.dom,javax.xml.transform.stream,org.slf4j,org.w3c.dom,org.xml.sax,twitter4j;version="2.0.8"</Import-Package>
<Export-Package>twitter4j;version=2.0.8</Export-Package>
Modified: aries/trunk/transaction/transaction-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-blueprint/pom.xml?rev=1176139&r1=1176138&r2=1176139&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-blueprint/pom.xml (original)
+++ aries/trunk/transaction/transaction-blueprint/pom.xml Tue Sep 27 00:13:11 2011
@@ -59,7 +59,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <scope>test</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -85,11 +85,6 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>test</scope>
</dependency>
Modified: aries/trunk/transaction/transaction-manager/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-manager/pom.xml?rev=1176139&r1=1176138&r2=1176139&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-manager/pom.xml (original)
+++ aries/trunk/transaction/transaction-manager/pom.xml Tue Sep 27 00:13:11 2011
@@ -92,11 +92,13 @@
<groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-transaction</artifactId>
<version>2.2.1</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.objectweb.howl</groupId>
<artifactId>howl</artifactId>
<version>1.0.1-1</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -104,6 +106,11 @@
<optional>true</optional>
<version>2.5.6</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>