svn commit: r1169776 - /httpcomponents/project/pom.xml

[se...@apache.org]

Author: sebb
Date: Mon Sep 12 14:43:57 2011
New Revision: 1169776

URL: http://svn.apache.org/viewvc?rev=1169776&view=rev
Log:
Apply fix for bundle 2.3.5 dependency bndlib 1.43.0 requiring Java 6 (FELIX issue 3037)

Modified:
    httpcomponents/project/pom.xml

Modified: httpcomponents/project/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/project/pom.xml?rev=1169776&r1=1169775&r2=1169776&view=diff
==============================================================================
--- httpcomponents/project/pom.xml (original)
+++ httpcomponents/project/pom.xml Mon Sep 12 14:43:57 2011
@@ -476,6 +476,7 @@
         <plugin>
           <groupId>org.apache.felix</groupId>
           <artifactId>maven-bundle-plugin</artifactId>
+          <!-- N.B. 2.3.5 does not work on Java 5; see profile java-1.5-detected for the workround -->
           <version>2.3.5</version>
         </plugin>
         <plugin>
@@ -586,6 +587,32 @@
       </build>
     </profile>
     
+    <profile>
+      <!-- This profile detects Java 1.5 -->
+      <id>java-1.5-detected</id>
+      <activation>
+        <jdk>1.5</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <!-- workround for FELIX-3037 which applies to bundle 2.3.5 -->
+          <plugin>
+            <!-- version 2.3.5 depends on bndlib 1.43.0 which requires Java 6; fix this -->
+            <groupId>org.apache.felix</groupId>
+            <artifactId>maven-bundle-plugin</artifactId>
+            <dependencies>
+              <dependency>
+                <groupId>biz.aQute</groupId>
+                <artifactId>bndlib</artifactId>
+                <!-- 1.43.0 requires Java 6; use previous version which works with Java 5--> 
+                <version>1.15.0</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
  </profiles>
 
  <properties>