You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by dj...@apache.org on 2010/03/05 20:45:10 UTC
svn commit: r919561 - in /activemq/trunk: activemq-core/pom.xml pom.xml
Author: djencks
Date: Fri Mar 5 19:45:10 2010
New Revision: 919561
URL: http://svn.apache.org/viewvc?rev=919561&view=rev
Log:
AMQ-2637 widen osgi import version ranges
Modified:
activemq/trunk/activemq-core/pom.xml
activemq/trunk/pom.xml
Modified: activemq/trunk/activemq-core/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/pom.xml?rev=919561&r1=919560&r2=919561&view=diff
==============================================================================
--- activemq/trunk/activemq-core/pom.xml (original)
+++ activemq/trunk/activemq-core/pom.xml Fri Mar 5 19:45:10 2010
@@ -32,7 +32,6 @@
<properties>
<activemq.osgi.import.pkg>
- org.osgi.framework;version="[1.3,2)",
com.thoughtworks.xstream*;resolution:=optional,
org.apache.activeio*;resolution:=optional,
org.apache.camel*;resolution:=optional,
@@ -395,21 +394,9 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>${felix-version}</version>
- <extensions>true</extensions>
<configuration>
<instructions>
<Bundle-Activator>org.apache.activemq.util.osgi.Activator</Bundle-Activator>
- <Bundle-Name>${artifactId}</Bundle-Name>
- <Bundle-SymbolicName>${activemq.osgi.symbolic.name}</Bundle-SymbolicName>
- <Export-Package>${activemq.osgi.export}</Export-Package>
- <Import-Package>${activemq.osgi.import}</Import-Package>
- <DynamicImport-Package>${activemq.osgi.dynamic.import}</DynamicImport-Package>
- <Private-Package>${activemq.osgi.private.pkg}</Private-Package>
- <Implementation-Title>Apache ActiveMQ</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
- <_versionpolicy>[$(version;==;$(@)),$(version;=+;$(@)))</_versionpolicy>
- <_failok>${servicemix.osgi.failok}</_failok>
</instructions>
</configuration>
</plugin>
Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=919561&r1=919560&r2=919561&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Fri Mar 5 19:45:10 2010
@@ -82,7 +82,7 @@
<xstream-version>1.3.1</xstream-version>
<xbean-version>3.6</xbean-version>
<velocity-version>1.6.2</velocity-version>
- <felix-version>2.0.1</felix-version>
+ <maven-bundle-plugin-version>2.0.1</maven-bundle-plugin-version>
<commons-net-version>2.0</commons-net-version>
<ftpserver-version>1.0.0</ftpserver-version>
<site-repo-url>scpexe://people.apache.org/www/activemq.apache.org/maven/</site-repo-url>
@@ -987,7 +987,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>${felix-version}</version>
+ <version>${maven-bundle-plugin-version}</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -1076,7 +1076,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>${felix-version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -1088,7 +1087,9 @@
<Private-Package>${activemq.osgi.private.pkg}</Private-Package>
<Implementation-Title>Apache ActiveMQ</Implementation-Title>
<Implementation-Version>${project.version}</Implementation-Version>
- <_versionpolicy>[$(version;==;$(@)),$(version;=+;$(@)))</_versionpolicy>
+ <_versionpolicy-impl>[$(version;==;$(@)),$(version;=+;$(@)))</_versionpolicy-impl>
+ <_versionpolicy-uses>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy-uses>
+ <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
<_failok>${servicemix.osgi.failok}</_failok>
</instructions>
</configuration>