You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2017/07/27 06:40:20 UTC

commons-collections git commit: [COLLECTIONS-655] Update platform from Java 6 to Java 7.

Repository: commons-collections
Updated Branches:
  refs/heads/master ee851e403 -> f4a63c4c7


[COLLECTIONS-655] Update platform from Java 6 to Java 7.

Project: http://git-wip-us.apache.org/repos/asf/commons-collections/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-collections/commit/f4a63c4c
Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/f4a63c4c
Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/f4a63c4c

Branch: refs/heads/master
Commit: f4a63c4c72770fd099dbe11bc56d6e094a62c93c
Parents: ee851e4
Author: Gary Gregory <gg...@apache.org>
Authored: Wed Jul 26 23:40:14 2017 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Wed Jul 26 23:40:14 2017 -0700

----------------------------------------------------------------------
 pom.xml                 | 18 ++++++++++++------
 src/changes/changes.xml |  3 +++
 2 files changed, 15 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-collections/blob/f4a63c4c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 71d61bd..7a84cee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -467,8 +467,8 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <maven.compiler.source>1.6</maven.compiler.source>
-    <maven.compiler.target>1.6</maven.compiler.target>
+    <maven.compiler.source>1.7</maven.compiler.source>
+    <maven.compiler.target>1.7</maven.compiler.target>
 
     <!--
        This is also  used to generate download_xxx file name.
@@ -483,15 +483,21 @@
     <commons.module.name>org.apache.commons.collections4</commons.module.name>
 
     <!-- Current 4.x release series -->
-    <commons.release.version>4.1</commons.release.version>
-    <commons.release.desc>(Java 6.0+)</commons.release.desc>
+    <commons.release.version>4.2</commons.release.version>
+    <commons.release.desc>(Requires Java 7 or later)</commons.release.desc>
 
     <!-- Previous 3.x release series -->
-    <commons.release.2.version>3.2.2</commons.release.2.version>
-    <commons.release.2.desc>(Requires Java 1.3 or later)</commons.release.2.desc>
+    <commons.release.2.version>4.1</commons.release.2.version>
+    <commons.release.2.desc>(Requires Java 6 or later)</commons.release.2.desc>
     <!-- Override generated name -->
     <commons.release.2.name>commons-collections-${commons.release.2.version}</commons.release.2.name>
 
+    <!-- Previous 3.x release series -->
+    <commons.release.3.version>3.2.2</commons.release.3.version>
+    <commons.release.3.desc>(Requires Java 1.3 or later)</commons.release.3.desc>
+    <!-- Override generated name -->
+    <commons.release.3.name>commons-collections-${commons.release.3.version}</commons.release.3.name>
+
     <commons.jira.id>COLLECTIONS</commons.jira.id>
     <commons.jira.pid>12310465</commons.jira.pid>
     <!-- The RC version used in the staging repository URL. -->

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/f4a63c4c/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 337cb81..ebee0b3 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -30,6 +30,9 @@
     <action issue="COLLECTIONS-603" dev="kinow" type="update" due-to="Artem Konovalov">
       Small improvements for generics, conditional statements, and warnings suppressions.
     </action>
+    <action issue="COLLECTIONS-655" dev="ggregory" type="update">
+      Update platform from Java 6 to Java 7.
+    </action>
     <action issue="COLLECTIONS-594" dev="ggregory" type="fix" due-to="Javen O'Neal">
       Web site spelling error: MultiValuedMapeList. 
     </action>