diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index c889b11cd..5e48f4a9e 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,3 +1,35 @@
+ Apache Apache Commons Collections 4.3 RELEASE NOTES
+
+The Apache Commons Collections package contains types that extend and augment the Java Collections Framework.
+
+Update from Java 7 to Java 8, bug fixes, and small changes.
+
+Changes in this version include:
+
+New features:
+o COLLECTIONS-696: AbstractReferenceMap made easier for subclassing; PR #51. Thanks to Maxim Solodovnik.
+
+Fixed Bugs:
+o COLLECTIONS-691: Use boolean operator for boolean result. Thanks to Eitan Adler.
+o COLLECTIONS-701: StackOverflowError in SetUniqueList.add() when it receives itself. Thanks to Shin Hong, Don Jeba.
+o COLLECTIONS-703: The PassiveExpiringMap#put() method should return the previous record only if not expired. Thanks to Tomas Tulka.
+o COLLECTIONS-706: Add SetUtils.unmodifiableSet(T... items) method. Thanks to Richard Eckart de Castilho, Gary Gregory.
+
+Changes:
+o COLLECTIONS-688: Update platform requirement from Java 7 to 8.
+o COLLECTIONS-689: Link to Javadoc API broken. Thanks to Richard Walker.
+o COLLECTIONS-692: Replace use of deprecated Class#newInstance() PR #49. Thanks to Gary Gregory, Eitan Adler.
+
+
+For complete information on Apache Commons Collections, including instructions on how to submit bug reports,
+patches, or suggestions for improvement, see the Apache Apache Commons Collections website:
+
+http://commons.apache.org/proper/commons-collections/
+
+Download page: http://commons.apache.org/proper/commons-collections/download_pool.cgi
+
+===============================================================================
+
Apache Apache Commons Collections 4.2 RELEASE NOTES
The Apache Commons Collections package contains types that extend and augment the Java Collections Framework.
diff --git a/pom.xml b/pom.xml
index 2b4dc93a9..14b32b3a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -450,13 +450,13 @@
org.easymock
easymock
- 4.0
+ 4.0.2
test
org.apache.commons
commons-lang3
- 3.8
+ 3.8.1
test
@@ -512,7 +512,7 @@
COLLECTIONS
12310465
- RC1
+ RC2
3.0.0
collections
@@ -523,10 +523,10 @@
2.8
- 4.1
+ 4.2
true
- Gary Gregory
- 86FDC7E2A11262CB
+ Maxim Solodovnik
+ C467526E
@@ -676,7 +676,7 @@
maven-pmd-plugin
- 3.10.0
+ 3.11.0
${maven.compiler.target}
@@ -752,3 +752,4 @@
+
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 248b32781..cca1bd78f 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -20,7 +20,7 @@
Commons Collections Changes
-
+
Use boolean operator for boolean result.
diff --git a/src/site/site.xml b/src/site/site.xml
index 8c722fc64..e2ce592b0 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -29,6 +29,7 @@
+
diff --git a/src/site/xdoc/download_collections.xml b/src/site/xdoc/download_collections.xml
index eedad102a..ad57f071f 100644
--- a/src/site/xdoc/download_collections.xml
+++ b/src/site/xdoc/download_collections.xml
@@ -26,22 +26,24 @@ limitations under the License.
| commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |
+======================================================================+
| |
- | 1) Re-generate using: mvn commons:download-page |
+ | 1) Re-generate using: mvn commons-build:download-page |
| |
| 2) Set the following properties in the component's pom: |
- | - commons.componentid (required, alphabetic, lower case) |
+ | - commons.componentid (required, alphabetic, lower case) |
| - commons.release.version (required) |
| - commons.release.name (required) |
| - commons.binary.suffix (optional) |
| (defaults to "-bin", set to "" for pre-maven2 releases) |
| - commons.release.desc (optional) |
| - commons.release.subdir (optional) |
+ | - commons.release.hash (optional, lowercase, default sha256) |
| |
- | - commons.release.2/3.version (conditional) |
- | - commons.release.2/3.name (conditional) |
- | - commons.release.2/3.binary.suffix (optional) |
- | - commons.release.2/3.desc (optional) |
- | - commons.release.2/3.subdir (optional) |
+ | - commons.release.[234].version (conditional) |
+ | - commons.release.[234].name (conditional) |
+ | - commons.release.[234].binary.suffix (optional) |
+ | - commons.release.[234].desc (optional) |
+ | - commons.release.[234].subdir (optional) |
+ | - commons.release.[234].hash (optional, lowercase, [sha256])|
| |
| 3) Example Properties |
| (commons.release.name inherited by parent: |
@@ -102,7 +104,7 @@ limitations under the License.
It is essential that you
verify the integrity
of downloaded files, preferably using the PGP
signature (*.asc
files);
- failing that using the SHA1
hash (*.sha1
checksum files).
+ failing that using the SHA256
hash (*.sha256
checksum files).
The KEYS
@@ -116,12 +118,12 @@ limitations under the License.
@@ -130,12 +132,12 @@ limitations under the License.
@@ -146,12 +148,12 @@ limitations under the License.
@@ -160,12 +162,12 @@ limitations under the License.
@@ -176,12 +178,12 @@ limitations under the License.
@@ -190,12 +192,12 @@ limitations under the License.
@@ -206,12 +208,12 @@ limitations under the License.
@@ -220,12 +222,12 @@ limitations under the License.
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index 2edeb335a..a9723a5b0 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -57,7 +57,7 @@ as are various project reports.
The Javadoc API documents are available online:
-- The current release 4.2
+- The current release 4.3
- The latest 3.x release - version 3.2.2
- The latest 2.x release - version 2.1.1
- The latest from repository sources
@@ -71,9 +71,9 @@ The git repository can be
-The latest version is 4.2 -
+The latest version is 4.3 -
Download now!
-It is built for Java 7 and later, and the release notes are also available.
+It is built for Java 8 and later, and the release notes are also available.
For previous releases, see the Apache Archive
diff --git a/src/site/xdoc/release_4_3.xml b/src/site/xdoc/release_4_3.xml
new file mode 100644
index 000000000..a147dba4e
--- /dev/null
+++ b/src/site/xdoc/release_4_3.xml
@@ -0,0 +1,66 @@
+
+
+
+
+ Release notes for v4.3
+ Commons Documentation Team
+
+
+
+
+
+
+Apache Commons Collections is a project to develop and maintain collection
+classes based on and inspired by the JDK collection framework.
+
+
+This 4.3 release is a minor and updates the platform requirement from Java 7 to 8.
+This release fixes several bugs present in previous releases of the 4.X branch.
+
+
+All users are strongly encouraged to updated to this release.
+
+
+Compatibility
+
+ - Java 8 or later is now required (version 4.2 required Java 7)
+ - This release is source and binary compatible with the 4.0 release
+ of Commons Collections with the exception that some classes in the functor
+ package do not implement the Serializable interface anymore (see COLLECTIONS-580)
+
+
+Major changes since 4.2
+
+- Updates the platform requirement from Java 7 to 8
+- Add Automatic-Module-Name MANIFEST entry for Java 9 compatibility
+- Added a few new APIs.
+
+
+Security Changes
+
+None.
+
+
+
+For a full list of changes in this release, refer to the Change report.
+
+
+
+
+
+