You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@directory.apache.org by ak...@apache.org on 2011/03/08 17:39:58 UTC

svn commit: r1079426 - in /directory/studio/branches/milestones: ./ pom.xml

Author: akarasulu
Date: Tue Mar  8 16:39:58 2011
New Revision: 1079426

URL: http://svn.apache.org/viewvc?rev=1079426&view=rev
Log:
merging in from trunk to milestones

Modified:
    directory/studio/branches/milestones/   (props changed)
    directory/studio/branches/milestones/pom.xml

Propchange: directory/studio/branches/milestones/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 16:39:58 2011
@@ -1,4 +1,4 @@
 /directory/studio/branches/milestones:1072812-1075331
 /directory/studio/branches/shared-trunk-merge:1004968-1005876
 /directory/studio/branches/studio-connection-refactoring:1022102-1030058
-/directory/studio/trunk:1066125-1067996,1068027-1072726,1072812-1075332,1075834-1079041
+/directory/studio/trunk:1066125-1067996,1068027-1072726,1072812-1075332,1075834-1079424

Modified: directory/studio/branches/milestones/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/milestones/pom.xml?rev=1079426&r1=1079425&r2=1079426&view=diff
==============================================================================
--- directory/studio/branches/milestones/pom.xml (original)
+++ directory/studio/branches/milestones/pom.xml Tue Mar  8 16:39:58 2011
@@ -1623,6 +1623,9 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
+        <!-- Moved back to version 2.2.0 (project pom.xml contains version 2.3.4) -->
+        <!-- See https://issues.apache.org/jira/browse/FELIX-2873 -->
+        <version>2.2.0</version>
         <configuration>
           <goalPrefix>bundle</goalPrefix>
         </configuration>