activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1075428 - in /activemq/activemq-apollo/trunk: apollo-broker/pom.xml apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/osgi/OsgiWebServerFactory.scala pom.xml
Date Mon, 28 Feb 2011 17:12:34 GMT
Author: chirino
Date: Mon Feb 28 17:12:33 2011
New Revision: 1075428

URL: http://svn.apache.org/viewvc?rev=1075428&view=rev
Log:
Removing the karaf 3.x features so that we can release against the soon to be released 2.2.0
version.

Removed:
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/osgi/OsgiWebServerFactory.scala
Modified:
    activemq/activemq-apollo/trunk/apollo-broker/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=1075428&r1=1075427&r2=1075428&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/pom.xml Mon Feb 28 17:12:33 2011
@@ -107,13 +107,6 @@
       <scope>provided</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.ops4j.pax.web</groupId>
-      <artifactId>pax-web-spi</artifactId>
-      <version>${pax-web-version}</version>
-      <optional>true</optional>
-    </dependency>
-
     <!-- Scala Support -->
     <dependency>
       <groupId>org.scala-lang</groupId>

Modified: activemq/activemq-apollo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/pom.xml?rev=1075428&r1=1075427&r2=1075428&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/pom.xml (original)
+++ activemq/activemq-apollo/trunk/pom.xml Mon Feb 28 17:12:33 2011
@@ -125,8 +125,7 @@
     
     <!-- osgi stuff -->
     <osgi-version>4.2.0</osgi-version>
-    <karaf-version>2.99.99-SNAPSHOT</karaf-version>
-    <pax-web-version>1.1.0-SNAPSHOT</pax-web-version>
+    <karaf-version>2.1.99-SNAPSHOT</karaf-version>
     <features-maven-plugin-version>2.1.0</features-maven-plugin-version>
     
     <osgi.fragment.host>${project.groupId}.apollo-broker</osgi.fragment.host>



Mime
View raw message