CRYPTO-78: Upgrade JDK from 1.6 to 1.7
Project: http://git-wip-us.apache.org/repos/asf/commons-crypto/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-crypto/commit/720b1173 Tree: http://git-wip-us.apache.org/repos/asf/commons-crypto/tree/720b1173 Diff: http://git-wip-us.apache.org/repos/asf/commons-crypto/diff/720b1173 Branch: refs/heads/master Commit: 720b1173da04eaa08c24422a2a7c7c0fa9235bda Parents: d6e1f3c Author: Sun Dapeng <s...@apache.org> Authored: Thu Jun 16 14:24:08 2016 +0800 Committer: Sun Dapeng <s...@apache.org> Committed: Thu Jun 16 14:24:08 2016 +0800 ---------------------------------------------------------------------- BUILDING.txt | 3 +-- README.md | 4 +++- pom.xml | 6 +++--- src/site/xdoc/download_crypto.xml | 2 +- src/site/xdoc/index.xml | 2 +- src/site/xdoc/userguide.xml | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/720b1173/BUILDING.txt ---------------------------------------------------------------------- diff --git a/BUILDING.txt b/BUILDING.txt index 2642483..ded2291 100644 --- a/BUILDING.txt +++ b/BUILDING.txt @@ -4,7 +4,7 @@ Build instructions for Apache Commons Crypto Requirements: * Unix System (Linux or Mac) -* JDK 1.6 or above (environment variable JAVA_HOME must be set) +* JDK 1.7 or above (environment variable JAVA_HOME must be set) * Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files (if running unit tests) * Maven 3.0 or above @@ -16,7 +16,6 @@ Install JCE Unlimited Strength Jurisdiction Policy Files: Download the Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files from Oracle: -For JDK 1.6: http://www.oracle.com/technetwork/java/javase/downloads/jce-6-download-429243.html For JDK 1.7: http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html For JDK 1.8: http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/720b1173/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index 4614214..d11908c 100644 --- a/README.md +++ b/README.md @@ -50,12 +50,14 @@ code and effort. Please note that Crypto doesn't implement the cryptographic alg AES directly. It wraps to Openssl or JCE which implement the algorithms. Features +-------- 1. Cipher API for low level cryptographic operations. 2. Java stream API (CryptoInputStream/CryptoOutputStream) for high level stream encyrption/decryption. 3. Both optimized with high performance AES encryption/decryption. (1400 MB/s - 1700 MB/s throughput in modern Xeon processors). 4. JNI-based implementation to achieve comparable performance to the native C++ version based on Openssl. -5. Portable across various operating systems (currently only Linux); Apache Commons Crypto loads the library according to your machine environment (It looks system properties, `os.name` and `os.arch`). +5. Portable across various operating systems (currently only Linux); + Apache Commons Crypto loads the library according to your machine environment (it checks system properties, `os.name` and `os.arch`). 6. Simple usage. Add the commons-crypto-(version).jar file to your classpath. http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/720b1173/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 0e69cb4..e43d9f6 100644 --- a/pom.xml +++ b/pom.xml @@ -193,11 +193,11 @@ The following provides more details on the included cryptographic software: <!-- properties not related to versioning --> <commons.jira.id>CRYPTO</commons.jira.id> <commons.jira.pid>12320024</commons.jira.pid> - <commons.javadoc.java.link>http://download.oracle.com/javase/6/docs/api/</commons.javadoc.java.link> + <commons.javadoc.java.link>http://download.oracle.com/javase/7/docs/api/</commons.javadoc.java.link> <commons.changes.onlyCurrentVersion>true</commons.changes.onlyCurrentVersion> <commons-build-plugin.version>1.6</commons-build-plugin.version> - <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> <!-- http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/720b1173/src/site/xdoc/download_crypto.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/download_crypto.xml b/src/site/xdoc/download_crypto.xml index b0ec43d..36d2f1e 100644 --- a/src/site/xdoc/download_crypto.xml +++ b/src/site/xdoc/download_crypto.xml @@ -111,7 +111,7 @@ limitations under the License. </p> </subsection> </section> - <section name="Apache Commons Crypto 1.0.0 (Requires Java 1.6 or later)"> + <section name="Apache Commons Crypto 1.0.0 (Requires Java 1.7 or later)"> <subsection name="Binaries"> <table> <tr> http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/720b1173/src/site/xdoc/index.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml index a0944bc..68a4bb1 100644 --- a/src/site/xdoc/index.xml +++ b/src/site/xdoc/index.xml @@ -77,7 +77,7 @@ limitations under the License. <ul> <li> <a href="http://commons.apache.org/crypto/download_crypto.cgi";>Crypto 1.0.0 (mirrors)</a> - requires Java 1.6 + requires Java 1.7 </li> </ul> <p> http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/720b1173/src/site/xdoc/userguide.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/userguide.xml b/src/site/xdoc/userguide.xml index e5b686a..44bb381 100644 --- a/src/site/xdoc/userguide.xml +++ b/src/site/xdoc/userguide.xml @@ -62,7 +62,7 @@ <ol style="list-style-type: decimal"> <h4>Prerequisites</h4> <p> - Commons Crypto relies on standard JDK 6 (or above) and OpenSSL 1.0.1c (or above) for production + Commons Crypto relies on standard JDK 1.7 (or above) and OpenSSL 1.0.1c (or above) for production deployment. </p> <h4>Using Commons Crypto in your Apache Maven build</h4>
