merging in from trunk to milestones

git-svn-id: https://svn.apache.org/repos/asf/directory/studio/branches/milestones@1079426 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index e35a1f6..9062b21 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>