Author: [email protected]
Date: Tue Jun 21 16:57:14 2011
New Revision: 1180
Log:
[AMDATUCASSANDRA-66] Replaced import package version ranges by BND generated
range using provider/consumer approach
Removed:
branches/amdatu-cassandra-0.2.0/cassandra-application/src/main/java/org/amdatu/core/
branches/amdatu-cassandra-0.2.0/cassandra-listener/src/main/java/org/amdatu/core/
branches/amdatu-cassandra-0.2.0/cassandra-persistencemanager/src/main/java/org/amdatu/core/
Modified:
branches/amdatu-cassandra-0.2.0/cassandra-application/pom.xml
branches/amdatu-cassandra-0.2.0/cassandra-listener/pom.xml
branches/amdatu-cassandra-0.2.0/cassandra-persistencemanager/pom.xml
branches/amdatu-cassandra-0.2.0/cassandra-store-consumer/pom.xml
branches/amdatu-cassandra-0.2.0/cassandra-store-tenant/pom.xml
branches/amdatu-cassandra-0.2.0/cassandra-store-token/pom.xml
branches/amdatu-cassandra-0.2.0/cassandra-store-useradmin/pom.xml
branches/amdatu-cassandra-0.2.0/pom.xml
branches/amdatu-cassandra-0.2.0/test-performance/test-bundle/pom.xml
Modified: branches/amdatu-cassandra-0.2.0/cassandra-application/pom.xml
==============================================================================
--- branches/amdatu-cassandra-0.2.0/cassandra-application/pom.xml
(original)
+++ branches/amdatu-cassandra-0.2.0/cassandra-application/pom.xml Tue Jun
21 16:57:14 2011
@@ -135,7 +135,7 @@
*
</Import-Package>
<Export-Package>
- org.amdatu.cassandra.application;version="1.0.0",
+ org.amdatu.cassandra.application;version="1.0.0";provide:=true,
org.apache.cassandra.concurrent;version="1.0.0",
org.apache.cassandra.config;version="1.0.0",
org.apache.cassandra.db;version="1.0.0",
@@ -148,7 +148,7 @@
org.apache.cassandra.utils;version="1.0.0",
org.apache.thrift.*;version="1.0.0",
</Export-Package>
- </instructions>
+ </instructions>
</configuration>
</plugin>
Modified: branches/amdatu-cassandra-0.2.0/cassandra-listener/pom.xml
==============================================================================
--- branches/amdatu-cassandra-0.2.0/cassandra-listener/pom.xml (original)
+++ branches/amdatu-cassandra-0.2.0/cassandra-listener/pom.xml Tue Jun 21
16:57:14 2011
@@ -52,16 +52,8 @@
<instructions>
<Bundle-Activator>org.amdatu.cassandra.listener.osgi.Activator</Bundle-Activator>
<Bundle-SymbolicName>org.amdatu.cassandra.listener</Bundle-SymbolicName>
- <Import-Package>
- org.amdatu.cassandra.application;version="[1.0,2.0)",
- org.amdatu.cassandra.listener,
- org.amdatu.cassandra.persistencemanager;version="[1.0,2.0)",
- org.apache.cassandra.thrift.*;version="[1.0,2.0)",
- org.apache.thrift.*;version="[1.0,2.0)",
- *
- </Import-Package>
<Export-Package>
- org.amdatu.cassandra.listener;version="1.0.0"
+ org.amdatu.cassandra.listener;version="1.0.0";provide:=true
</Export-Package>
</instructions>
</configuration>
Modified: branches/amdatu-cassandra-0.2.0/cassandra-persistencemanager/pom.xml
==============================================================================
--- branches/amdatu-cassandra-0.2.0/cassandra-persistencemanager/pom.xml
(original)
+++ branches/amdatu-cassandra-0.2.0/cassandra-persistencemanager/pom.xml
Tue Jun 21 16:57:14 2011
@@ -95,11 +95,6 @@
<Bundle-Activator>org.amdatu.cassandra.persistencemanager.osgi.Activator</Bundle-Activator>
<Bundle-SymbolicName>org.amdatu.cassandra.persistencemanager</Bundle-SymbolicName>
<Import-Package>
- org.amdatu.cassandra.application;version="[1.0,2.0)",
- org.amdatu.cassandra.persistencemanager,
- me.prettyprint.hector.api.beans;version="[1.0,1.1)",
- org.apache.cassandra.*;version="[1.0,2.0)",
- org.apache.thrift.*;version="[1.0,2.0)",
!com.ibm.uvm.tools,
!com.sun.jdmk.comm,
!com.sun.xml.fastinfoset.stax,
@@ -110,8 +105,8 @@
*
</Import-Package>
<Export-Package>
- org.amdatu.cassandra.persistencemanager;version="1.0.0",
- me.prettyprint.hector.api.beans;version="1.0.0"
+
org.amdatu.cassandra.persistencemanager;version="1.0.0";provide:=true,
+ me.prettyprint.hector.api.beans;version="1.0.0";provide:=true
</Export-Package>
<Embed-Dependency>*;scope=compile</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
Modified: branches/amdatu-cassandra-0.2.0/cassandra-store-consumer/pom.xml
==============================================================================
--- branches/amdatu-cassandra-0.2.0/cassandra-store-consumer/pom.xml
(original)
+++ branches/amdatu-cassandra-0.2.0/cassandra-store-consumer/pom.xml Tue Jun
21 16:57:14 2011
@@ -100,12 +100,10 @@
<Embed-Transitive>true</Embed-Transitive>
<Import-Package>
!org.joda.time,
- org.amdatu.cassandra.application;version="[1.0,2.0)",
- org.amdatu.cassandra.listener;version="[1.0,2.0)",
- org.amdatu.cassandra.persistencemanager;version="[1.0,2.0)",
me.prettyprint.hector.api.beans;version="[1.0,2.0)",
*
</Import-Package>
+ <Export-Package></Export-Package>
</instructions>
</configuration>
</plugin>
Modified: branches/amdatu-cassandra-0.2.0/cassandra-store-tenant/pom.xml
==============================================================================
--- branches/amdatu-cassandra-0.2.0/cassandra-store-tenant/pom.xml
(original)
+++ branches/amdatu-cassandra-0.2.0/cassandra-store-tenant/pom.xml Tue Jun
21 16:57:14 2011
@@ -63,12 +63,10 @@
<Bundle-Activator>org.amdatu.cassandra.store.tenant.osgi.Activator</Bundle-Activator>
<Bundle-SymbolicName>org.amdatu.cassandra.store.tenant</Bundle-SymbolicName>
<Import-Package>
- org.amdatu.cassandra.application;version="[1.0,2.0)",
- org.amdatu.cassandra.listener;version="[1.0,2.0)",
- org.amdatu.cassandra.persistencemanager;version="[1.0,2.0)",
+ me.prettyprint.hector.api.beans;version="[1.0,2.0)",
*
</Import-Package>
- <Export-Package />
+ <Export-Package></Export-Package>
</instructions>
</configuration>
</plugin>
Modified: branches/amdatu-cassandra-0.2.0/cassandra-store-token/pom.xml
==============================================================================
--- branches/amdatu-cassandra-0.2.0/cassandra-store-token/pom.xml
(original)
+++ branches/amdatu-cassandra-0.2.0/cassandra-store-token/pom.xml Tue Jun
21 16:57:14 2011
@@ -89,11 +89,9 @@
<Embed-Dependency>*;scope=compile</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
<Import-Package>
- org.amdatu.cassandra.application;version="[1.0,2.0)",
- org.amdatu.cassandra.listener;version="[1.0,2.0)",
- org.amdatu.cassandra.persistencemanager;version="[1.0,2.0)",
*
</Import-Package>
+ <Export-Package></Export-Package>
</instructions>
</configuration>
</plugin>
Modified: branches/amdatu-cassandra-0.2.0/cassandra-store-useradmin/pom.xml
==============================================================================
--- branches/amdatu-cassandra-0.2.0/cassandra-store-useradmin/pom.xml
(original)
+++ branches/amdatu-cassandra-0.2.0/cassandra-store-useradmin/pom.xml Tue Jun
21 16:57:14 2011
@@ -96,14 +96,11 @@
<Bundle-Activator>org.amdatu.cassandra.store.useradmin.osgi.Activator</Bundle-Activator>
<Bundle-SymbolicName>org.amdatu.cassandra.store.useradmin</Bundle-SymbolicName>
<Import-Package>
- org.amdatu.cassandra.application;version="[1.0,2.0)",
- org.amdatu.cassandra.listener;version="[1.0,2.0)",
- org.amdatu.cassandra.persistencemanager;version="[1.0,2.0)",
me.prettyprint.hector.api.beans;version="[1.0,2.0)",
*
</Import-Package>
<Export-Package>
- org.amdatu.cassandra.store.useradmin;version="1.0.0"
+
org.amdatu.cassandra.store.useradmin;version="1.0.0";provide:=true
</Export-Package>
<Embed-Dependency>*;scope=compile</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
Modified: branches/amdatu-cassandra-0.2.0/pom.xml
==============================================================================
--- branches/amdatu-cassandra-0.2.0/pom.xml (original)
+++ branches/amdatu-cassandra-0.2.0/pom.xml Tue Jun 21 16:57:14 2011
@@ -295,14 +295,14 @@
<version>2.1</version>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.5</version>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.5</version>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.5</version>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -369,6 +369,18 @@
<target>1.6</target>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.3.4</version>
+ <configuration>
+ <instructions>
+
<_consumer-policy>[$(version;==;$(@)),$(version;+0;$(@)))</_consumer-policy>
+
<_provider-policy>[$(version;==;$(@)),$(version;=+;$(@)))</_provider-policy>
+ </instructions>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
<!-- This can be removed when using the parent pom version 3 -->
Modified: branches/amdatu-cassandra-0.2.0/test-performance/test-bundle/pom.xml
==============================================================================
--- branches/amdatu-cassandra-0.2.0/test-performance/test-bundle/pom.xml
(original)
+++ branches/amdatu-cassandra-0.2.0/test-performance/test-bundle/pom.xml
Tue Jun 21 16:57:14 2011
@@ -101,11 +101,9 @@
<Bundle-SymbolicName>org.amdatu.test.performance-bundle</Bundle-SymbolicName>
<Embed-Dependency>json,utilities;scope=compile</Embed-Dependency>
<Import-Package>
- org.amdatu.cassandra.application;version="[1.0,2.0)",
- org.amdatu.cassandra.listener;version="[1.0,2.0)",
- org.amdatu.cassandra.persistencemanager;version="[1.0,2.0)",
*
</Import-Package>
+ <Export-Package></Export-Package>
</instructions>
</configuration>
</plugin>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
