activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1069670 - in /activemq/activemq-apollo/trunk: apollo-broker/pom.xml apollo-util/pom.xml apollo-web/pom.xml pom.xml
Date Fri, 11 Feb 2011 03:22:01 GMT
Author: chirino
Date: Fri Feb 11 03:22:00 2011
New Revision: 1069670

URL: http://svn.apache.org/viewvc?rev=1069670&view=rev
Log:
A couple of version upgrades and pom fixes.

Modified:
    activemq/activemq-apollo/trunk/apollo-broker/pom.xml
    activemq/activemq-apollo/trunk/apollo-util/pom.xml
    activemq/activemq-apollo/trunk/apollo-web/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=1069670&r1=1069669&r2=1069670&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/pom.xml Fri Feb 11 03:22:00 2011
@@ -106,12 +106,6 @@
       <version>${osgi-version}</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.ops4j.pax.web</groupId>
-      <artifactId>pax-web-extender-war</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
-      <optional>true</optional>
-    </dependency>
 
     <!-- Scala Support -->
     <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=1069670&r1=1069669&r2=1069670&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-util/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-util/pom.xml Fri Feb 11 03:22:00 2011
@@ -168,19 +168,6 @@
         </executions>
       </plugin>
       
-      <!-- <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <version>${bundle-plugin-version}</version>
-        <extensions>true</extensions>
-        <inherited>true</inherited>
-        <configuration>
-          <instructions>
-            <Webapp-Context>apollo</Webapp-Context>
-          </instructions>
-        </configuration>
-      </plugin>
-      -->
     </plugins> 
   </build>  
 

Modified: activemq/activemq-apollo/trunk/apollo-web/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-web/pom.xml?rev=1069670&r1=1069669&r2=1069670&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-web/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-web/pom.xml Fri Feb 11 03:22:00 2011
@@ -216,7 +216,6 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>${bundle-plugin-version}</version>
         <extensions>true</extensions>
         <inherited>true</inherited>
         <executions>

Modified: activemq/activemq-apollo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/pom.xml?rev=1069670&r1=1069669&r2=1069670&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/pom.xml (original)
+++ activemq/activemq-apollo/trunk/pom.xml Fri Feb 11 03:22:00 2011
@@ -103,8 +103,8 @@
     <bdb-version>4.1.6</bdb-version>
     <jasypt-version>1.6</jasypt-version>
 
-    <scalate-version>1.4.0-SNAPSHOT</scalate-version>
-    <scalamd-version>1.4</scalamd-version>
+    <scalate-version>1.4.0</scalate-version>
+    <scalamd-version>1.5</scalamd-version>
 
     <servlet-api-version>2.5</servlet-api-version>
     <jackson-version>1.6.1</jackson-version>
@@ -127,7 +127,6 @@
     <osgi-version>4.2.0</osgi-version>
     <karaf-version>2.1.2</karaf-version>
     <features-maven-plugin-version>2.1.0</features-maven-plugin-version>
-    <bundle-plugin-version>2.3.5-SNAPSHOT</bundle-plugin-version>
     
     <osgi.fragment.host>${project.groupId}.apollo-broker</osgi.fragment.host>
   </properties>
@@ -383,7 +382,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>${bundle-plugin-version}</version>
+        <version>2.3.4</version>
         <extensions>true</extensions>
         <inherited>true</inherited>
         <configuration>



Mime
View raw message