activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1064655 - in /activemq/activemq-apollo/trunk: apollo-broker/pom.xml apollo-dto/pom.xml apollo-selector/pom.xml apollo-transport/pom.xml apollo-util/pom.xml pom.xml
Date Fri, 28 Jan 2011 13:10:04 GMT
Author: chirino
Date: Fri Jan 28 13:10:03 2011
New Revision: 1064655

URL: http://svn.apache.org/viewvc?rev=1064655&view=rev
Log:
Switch to the snapshot of bundle plugin since that version works better with Scala, and setup
the build to generate bundle fragments.

Modified:
    activemq/activemq-apollo/trunk/apollo-broker/pom.xml
    activemq/activemq-apollo/trunk/apollo-dto/pom.xml
    activemq/activemq-apollo/trunk/apollo-selector/pom.xml
    activemq/activemq-apollo/trunk/apollo-transport/pom.xml
    activemq/activemq-apollo/trunk/apollo-util/pom.xml
    activemq/activemq-apollo/trunk/pom.xml

Modified: activemq/activemq-apollo/trunk/apollo-broker/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/pom.xml?rev=1064655&r1=1064654&r2=1064655&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/pom.xml Fri Jan 28 13:10:03 2011
@@ -35,11 +35,7 @@
   <name>${project.artifactId}</name>
 
   <properties>
-    <apollo.osgi.export.pkg>org.apache.activemq.apollo.broker*</apollo.osgi.export.pkg>
-    <apollo.osgi.import>
-      org.eclipse.jetty*;resolution:=optional,
-      *
-    </apollo.osgi.import>
+    <apollo.osgi.host></apollo.osgi.host>
   </properties>
 
   <dependencies>

Modified: activemq/activemq-apollo/trunk/apollo-dto/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/pom.xml?rev=1064655&r1=1064654&r2=1064655&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-dto/pom.xml Fri Jan 28 13:10:03 2011
@@ -32,6 +32,10 @@
   <packaging>bundle</packaging>
 
   <name>${project.artifactId}</name>
+
+  <properties>
+    <apollo.osgi.host></apollo.osgi.host>
+  </properties>
   
   <dependencies>
     <dependency>

Modified: activemq/activemq-apollo/trunk/apollo-selector/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-selector/pom.xml?rev=1064655&r1=1064654&r2=1064655&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-selector/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-selector/pom.xml Fri Jan 28 13:10:03 2011
@@ -33,6 +33,10 @@
 
   <name>${project.artifactId}</name>
 
+  <properties>
+    <apollo.osgi.host></apollo.osgi.host>
+  </properties>
+
   <dependencies>
 
     <dependency>

Modified: activemq/activemq-apollo/trunk/apollo-transport/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-transport/pom.xml?rev=1064655&r1=1064654&r2=1064655&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-transport/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-transport/pom.xml Fri Jan 28 13:10:03 2011
@@ -33,6 +33,10 @@
 
   <name>${project.artifactId}</name>
 
+  <properties>
+    <apollo.osgi.host></apollo.osgi.host>
+  </properties>
+
   <dependencies>
 
     <dependency>

Modified: activemq/activemq-apollo/trunk/apollo-util/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-util/pom.xml?rev=1064655&r1=1064654&r2=1064655&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-util/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-util/pom.xml Fri Jan 28 13:10:03 2011
@@ -34,6 +34,10 @@
 
   <name>${project.artifactId}</name>
 
+  <properties>
+    <apollo.osgi.host></apollo.osgi.host>
+  </properties>
+
   <repositories>
     <!-- For the JNA dependency -->
     <repository>
@@ -48,12 +52,6 @@
     </repository>
   </repositories>
 
-  <properties>
-    <apollo.osgi.import.pkg>
-      *;resolution:=optional
-    </apollo.osgi.import.pkg>
-  </properties>
-
   <dependencies>
                 
     <dependency>

Modified: activemq/activemq-apollo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/pom.xml?rev=1064655&r1=1064654&r2=1064655&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/pom.xml (original)
+++ activemq/activemq-apollo/trunk/pom.xml Fri Jan 28 13:10:03 2011
@@ -124,17 +124,15 @@
     <cascal-version>1.3-SNAPSHOT</cascal-version>
     <hawtdb-version>1.6-SNAPSHOT</hawtdb-version>
     
-    
-    <maven-bundle-plugin-version>2.2.0</maven-bundle-plugin-version>
-    
+    <maven-bundle-plugin-version>2.3.0-SNAPSHOT</maven-bundle-plugin-version>
     <apollo.osgi.export.pkg>{local-packages}</apollo.osgi.export.pkg>
-
     <apollo.osgi.name>${project.groupId}.${project.artifactId}</apollo.osgi.name>
     <apollo.osgi.import>*</apollo.osgi.import>
     <apollo.osgi.export>${apollo.osgi.export.pkg};version=${project.version};-noimport:=true</apollo.osgi.export>
     <apollo.osgi.private>!*</apollo.osgi.private>
     <apollo.osgi.dynamic></apollo.osgi.dynamic>
-    
+    <apollo.osgi.host>org.apache.activemq.apollo-broker</apollo.osgi.host>
+
   </properties>
 
   <prerequisites>
@@ -392,6 +390,7 @@
         <inherited>true</inherited>
         <configuration>
           <instructions>
+            <Fragment-Host>${apollo.osgi.host}</Fragment-Host>
             <Bundle-Name>${project.artifactId}</Bundle-Name>
             <Bundle-SymbolicName>${apollo.osgi.name}</Bundle-SymbolicName>
             <Export-Package>${apollo.osgi.export}</Export-Package>



Mime
View raw message