commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1334411 - in /commons/proper/commons-parent/trunk: pom.xml src/changes/changes.xml
Date Sat, 05 May 2012 12:10:38 GMT
Author: sebb
Date: Sat May  5 12:10:37 2012
New Revision: 1334411

URL: http://svn.apache.org/viewvc?rev=1334411&view=rev
Log:
The FELIX jira issue 3037 has been fixed; the profile java-1.5-detected now causes problems

Modified:
    commons/proper/commons-parent/trunk/pom.xml
    commons/proper/commons-parent/trunk/src/changes/changes.xml

Modified: commons/proper/commons-parent/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/commons-parent/trunk/pom.xml?rev=1334411&r1=1334410&r2=1334411&view=diff
==============================================================================
--- commons/proper/commons-parent/trunk/pom.xml (original)
+++ commons/proper/commons-parent/trunk/pom.xml Sat May  5 12:10:37 2012
@@ -1005,32 +1005,6 @@ http://svn.apache.org/repos/asf/commons/
     </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>
-
-    <profile>
       <!--
           Generate release notes in top-level directory from src/changes/changes.xml
           Usage:

Modified: commons/proper/commons-parent/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/commons-parent/trunk/src/changes/changes.xml?rev=1334411&r1=1334410&r2=1334411&view=diff
==============================================================================
--- commons/proper/commons-parent/trunk/src/changes/changes.xml (original)
+++ commons/proper/commons-parent/trunk/src/changes/changes.xml Sat May  5 12:10:37 2012
@@ -56,6 +56,12 @@ The <action> type attribute can be add,u
      -->
 
     <body>
+        <release version="26" date="2012-??-??" description="Update plugins">
+            <action type="update">
+            FELIX-3037 has been fixed; the profile java-1.5-detected is no longer needed
+            (in fact is causes problems, because it reverts bndlib to a version that is missing
some required new methods)
+            </action>
+        </release>
         <release version="25" date="2012-??-??" description="Update plugins">
             <action type="update">
             Updated various plugin versions:



Mime
View raw message