You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by sd...@apache.org on 2016/05/06 05:39:12 UTC

[1/3] commons-crypto git commit: CRYPTO-53: Fix assembly, pom.xml, README, NOTICE.txt...etc

Repository: commons-crypto
Updated Branches:
  refs/heads/CRYPTO-1.0.0 3f835c2f5 -> 1335e165e


CRYPTO-53: Fix assembly, pom.xml, README, NOTICE.txt...etc


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

Branch: refs/heads/CRYPTO-1.0.0
Commit: 231faf3ef90527b131dd595d13d44cf89a09e022
Parents: 3f835c2
Author: Sun Dapeng <sd...@apache.org>
Authored: Fri May 6 13:05:08 2016 +0800
Committer: Sun Dapeng <sd...@apache.org>
Committed: Fri May 6 13:05:08 2016 +0800

----------------------------------------------------------------------
 NOTICE.txt                        |   6 ++
 README.md                         |  14 ++--
 pom.xml                           | 112 +++++++++++++++---------------
 src/assembly/bin.xml              |  16 ++++-
 src/assembly/src.xml              |   3 +
 src/changes/changes.xml           |  64 +++++++++++++++++
 src/changes/release-notes.vm      | 122 +++++++++++++++++++++++++++++++++
 src/site/xdoc/download_crypto.xml |  50 +++++++++-----
 src/site/xdoc/issue-tracking.xml  |  22 +++---
 src/site/xdoc/mail-lists.xml      |   2 +-
 10 files changed, 318 insertions(+), 93 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/231faf3e/NOTICE.txt
----------------------------------------------------------------------
diff --git a/NOTICE.txt b/NOTICE.txt
new file mode 100644
index 0000000..595a84e
--- /dev/null
+++ b/NOTICE.txt
@@ -0,0 +1,6 @@
+Apache Commons Crypto
+Copyright 2016-2016 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+

http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/231faf3e/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 0bc4a4c..e18a215 100644
--- a/README.md
+++ b/README.md
@@ -50,13 +50,13 @@ 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
--------------
-+ Cipher API for low level cryptographic operations.
-+ Java stream API (CryptoInputStream/CryptoOutputStream) for high level stream encryption/decryption.
-+ Both optimized with high performance AES encryption/decryption. (1400 MB/s - 1700 MB/s throughput in modern Xeon processors).
-+ JNI-based implementation to achieve comparable performance to the native C++ version based on Openssl.
-+ 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`).
-+ Simple usage. Add the commons-crypto-(version).jar file to your classpath.
+
+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`).
+6. Simple usage. Add the commons-crypto-(version).jar file to your classpath.
 
 Documentation
 -------------

http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/231faf3e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 72e58bd..228ae10 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,18 +33,18 @@ 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
--------------
-+ Cipher API for low level cryptographic operations.
-+ Java stream API (CryptoInputStream/CryptoOutputStream) for high level stream encyrption/decryption.
-+ Both optimized with high performance AES encryption/decryption. (1400 MB/s - 1700 MB/s throughput in modern Xeon processors).
-+ JNI-based implementation to achieve comparable performance to the native C++ version based on Openssl.
-+ 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`).
-+ Simple usage. Add the commons-crypto-(version).jar file to your classpath.
+
+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`).
+6. Simple usage. Add the commons-crypto-(version).jar file to your classpath.
   </description>
   <version>1.0.0-SNAPSHOT</version>
   <name>Apache Commons Crypto</name>
   <inceptionYear>2016</inceptionYear>
-  <url>http://commons.apache.org/proper/commons-crypto</url>
+  <url>http://commons.apache.org/proper/commons-crypto/</url>
   <issueManagement>
     <system>jira</system>
     <url>http://issues.apache.org/jira/browse/CRYPTO</url>
@@ -134,30 +134,43 @@ Features
     </developer>
   </developers>
   <properties>
+    <commons.componentid>crypto</commons.componentid>
+    <commons.release.version>1.0.0</commons.release.version>
+    <commons.release.desc>(Requires Java ${maven.compiler.target} or later)</commons.release.desc>
+    <commons.rc.version>RC1</commons.rc.version>
+
+    <!-- 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.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>
+
+
+    <!--
+        Encoding of Java source files: ensures that the compiler and
+        the javadoc generator use the right encoding. Subprojects may
+        overwrite this, if they are using another encoding.
+    -->
+    <commons.encoding>iso-8859-1</commons.encoding>
+    <!-- used in this pom to provide the Javadoc HTML file encoding -->
+    <commons.docEncoding>${commons.encoding}</commons.docEncoding>
+    <!-- Define source encoding for filtering; used by general plugins -->
+    <project.build.sourceEncoding>${commons.encoding}</project.build.sourceEncoding>
+    <!-- This is used by reporting plugins -->
+    <project.reporting.outputEncoding>${commons.encoding}</project.reporting.outputEncoding>
+
     <!-- The property "target.name" is used to specify the ant target, The All target will use
     OSInfo.java to detect the OS info and arch to generate the native binary for detected platform.
     User is able to specify the platform by maven profiles.-->
     <target.name>all</target.name>
     <maven-antrun-plugin.version>1.7</maven-antrun-plugin.version>
-    <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
-    <maven-javadoc-plugin.version>2.8.1</maven-javadoc-plugin.version>
-    <maven-source-plugin.version>2.3</maven-source-plugin.version>
-    <maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
     <findbugs-maven-plugin.version>3.0.2</findbugs-maven-plugin.version>
     <junit.version>4.8.2</junit.version>
     <commons-logging.version>1.1.3</commons-logging.version>
     <slf4j-api.version>1.7.10</slf4j-api.version>
-    <maven.compiler.source>1.6</maven.compiler.source>
-    <maven.compiler.target>1.6</maven.compiler.target>
-    <commons.javadoc.java.link>http://download.oracle.com/javase/6/docs/api/</commons.javadoc.java.link>
-    <commons.componentid>crypto</commons.componentid>
-    <commons.release.version>1.0.0</commons.release.version>
-    <commons.rc.version>RC1</commons.rc.version>
-    <commons.release.desc>(Requires Java ${maven.compiler.target} or later)</commons.release.desc>
-    <commons.jira.id>CRYPTO</commons.jira.id>
-    <commons.jira.pid>12320024</commons.jira.pid>
-    <commons.changes.onlyCurrentVersion>true</commons.changes.onlyCurrentVersion>
-    <commons-build-plugin.version>1.6</commons-build-plugin.version>
   </properties>
   <profiles>
     <profile>
@@ -278,35 +291,6 @@ Features
             </dependency>
           </dependencies>
         </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-gpg-plugin</artifactId>
-          <version>${maven-gpg-plugin.version}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-javadoc-plugin</artifactId>
-          <version>${maven-javadoc-plugin.version}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-source-plugin</artifactId>
-          <version>${maven-source-plugin.version}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.sonatype.plugins</groupId>
-          <artifactId>nexus-staging-maven-plugin</artifactId>
-          <version>${nexus-staging-maven-plugin.version}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>${maven-compiler-plugin.version}</version>
-          <configuration>
-            <source>${maven.compiler.source}</source>
-            <target>${maven.compiler.target}</target>
-          </configuration>
-        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>
@@ -346,14 +330,30 @@ Features
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-      </plugin>
-      <plugin>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-build-plugin</artifactId>
         <version>${commons-build-plugin.version}</version>
       </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptors>
+             <descriptor>src/assembly/bin.xml</descriptor>
+             <descriptor>src/assembly/src.xml</descriptor>
+          </descriptors>
+          <tarLongFileMode>gnu</tarLongFileMode>
+        </configuration>
+      </plugin>
+      <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-scm-publish-plugin</artifactId>
+          <version>1.1</version>
+          <configuration>
+            <ignorePathsToDelete>
+              <ignorePathToDelete>javadocs**</ignorePathToDelete>
+            </ignorePathsToDelete>
+          </configuration>
+        </plugin>
     </plugins>
   </build>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/231faf3e/src/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/src/assembly/bin.xml b/src/assembly/bin.xml
index cf524c3..2f86d3d 100644
--- a/src/assembly/bin.xml
+++ b/src/assembly/bin.xml
@@ -26,18 +26,32 @@
         <fileSet>
             <includes>
                 <include>LICENSE.txt</include>
+                <include>NOTICE.txt</include>
+                <include>README.md</include>
+                <include>RELEASE-NOTES.txt</include>
+                <include>CONTRIBUTING.md</include>
             </includes>
         </fileSet>
         <fileSet>
             <directory>target</directory>
             <outputDirectory/>
             <includes>
-                <include>*.jar</include>
+                <include>${artifactId}-${version}.jar</include>
             </includes>
         </fileSet>
         <fileSet>
             <directory>target/site/apidocs</directory>
             <outputDirectory>apidocs</outputDirectory>
+            <includes>
+                <include>**/*</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>target</directory>
+            <outputDirectory></outputDirectory>
+            <includes>
+                <include>${artifactId}-${version}-sources.jar</include>
+            </includes>
         </fileSet>
     </fileSets>
 </assembly>

http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/231faf3e/src/assembly/src.xml
----------------------------------------------------------------------
diff --git a/src/assembly/src.xml b/src/assembly/src.xml
index cad329e..386841d 100644
--- a/src/assembly/src.xml
+++ b/src/assembly/src.xml
@@ -25,10 +25,13 @@
     <fileSets>
         <fileSet>
             <includes>
+                <include>BUILDING.txt</include>
                 <include>LICENSE.txt</include>
                 <include>Makefile</include>
                 <include>Makefile.common</include>
+                <include>NOTICE.txt</include>
                 <include>README.md</include>
+                <include>RELEASE-NOTES.txt</include>
                 <include>findbugs-exclude.xml</include>
                 <include>pom.xml</include>
             </includes>

http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/231faf3e/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
new file mode 100644
index 0000000..7d03452
--- /dev/null
+++ b/src/changes/changes.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements. See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License. You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!--
+  This file is used by the maven-changes-plugin to generate the release notes.
+  Useful ways of finding items to add to this file are:
+
+  1. Add items when you fix a bug or add a feature (this makes the
+  release process easy :-).
+
+  2. Do a JIRA search for tickets closed since the previous release.
+
+  3. Use the report generated by the maven-changelog-plugin to see all
+  SVN commits. Set the project.properties' maven.changelog.range
+  property to the number of days since the last release.
+
+
+  The <action> type attribute can be add,update,fix,remove.
+-->
+
+<document>
+  <properties>
+    <title>Release Notes</title>
+  </properties>
+  <body>
+    <release version="1.0.0" date="2016-MM-DD" description="Feature and bug fix release">
+      <action issue="CRYPTO-11" type="add" dev="Ke Jia" due-to="Ke Jia, Jerry Chen">User guide documentation .</action>
+      <action issue="CRYPTO-12" type="add" dev="Xianda Ke" due-to="Xianda Ke">Rename CryptoInputStream to CipherInputStream and CryptoOutputStream to CipherOutputStream .</action>
+      <action issue="CRYPTO-13" type="add" dev="Xianda Ke" due-to="Xianda Ke">The API differences between apache.commons.crypto and JCE .</action>
+      <action issue="CRYPTO-26" type="update" dev="Dapeng Sun" due-to="Dapeng Sun">Utility classes should not have public constructors .</action>
+      <action issue="CRYPTO-28" type="update" dev="Ferdinand Xu" due-to="Ferdinand Xu, Ke Jia">Update the README.md of Apache Commons Crypto .</action>
+      <action issue="CRYPTO-29" type="fix" dev="Dian Fu" due-to="Dian Fu, Sebb">Make sure Cipher.ENCRYPT_MODE is consistent with JDK .</action>
+      <action issue="CRYPTO-3" type="update" dev="Ferdinand Xu" due-to="ferdinand xu">Change default cipher as OpensslCipher .</action>
+      <action issue="CRYPTO-30" type="fix" dev="Ferdinand Xu" due-to="Ferdinand Xu, Sebb">Mutable fields should be private .</action>
+      <action issue="CRYPTO-31" type="update" dev="Ferdinand Xu" due-to="Ferdinand Xu, Sebb">Make fields final wherever possible .</action>
+      <action issue="CRYPTO-33" type="update" dev="Xianda Ke" due-to="Xianda Ke, Sebb">SecureRandom shadows JVM class .</action>
+      <action issue="CRYPTO-34" type="fix" dev="Dapeng Sun" due-to="Dapeng Sun, Sebb">JavaSecureRandom should throw Exception if it cannot create the instance .</action>
+      <action issue="CRYPTO-38" type="update" dev="Dapeng Sun" due-to="Dapeng Sun, Gary Gregory">Always use blocks .</action>
+      <action issue="CRYPTO-40" type="add" dev="Xianda Ke" due-to="Xianda Ke, Jerry Chen">Remove the full qualified package name for shadowed classes .</action>
+      <action issue="CRYPTO-42" type="add" dev="Dian Fu" due-to="Dian Fu, Jerry Chen">Remove the header files required for cross platform compilation .</action>
+      <action issue="CRYPTO-45" type="add" dev="Dian Fu" due-to="Dian Fu, Benedikt Ritter">Document how to build Commons Crypto .</action>
+      <action issue="CRYPTO-47" type="fix" dev="Dapeng Sun" due-to="Dapeng Sun">Fix build of MAC_OS .</action>
+      <action issue="CRYPTO-48" type="add" dev="Benedikt Ritter" due-to="Benedikt Ritter, Dapeng Sun">Setup site build as defined in commons-parent pom .</action>
+      <action issue="CRYPTO-49" type="fix" dev="Dapeng Sun" due-to="Dapeng Sun">CRYPTO-1 Fix build of X86 .</action>
+      <action issue="CRYPTO-7" type="update" dev="Ferdinand Xu" due-to="ferdinand xu">Rename source code in Chimera to Apache name space .</action>
+    </release>
+
+  </body>
+</document>

http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/231faf3e/src/changes/release-notes.vm
----------------------------------------------------------------------
diff --git a/src/changes/release-notes.vm b/src/changes/release-notes.vm
new file mode 100644
index 0000000..2411a1b
--- /dev/null
+++ b/src/changes/release-notes.vm
@@ -0,0 +1,122 @@
+## Licensed to the Apache Software Foundation (ASF) under one
+## or more contributor license agreements.  See the NOTICE file
+## distributed with this work for additional information
+## regarding copyright ownership.  The ASF licenses this file
+## to you under the Apache License, Version 2.0 (the
+## "License"); you may not use this file except in compliance
+## with the License.  You may obtain a copy of the License at
+##
+##  http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing,
+## software distributed under the License is distributed on an
+## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+## KIND, either express or implied.  See the License for the
+## specific language governing permissions and limitations
+## under the License.
+##
+              ${project.name} ${version}
+                  RELEASE NOTES
+
+The ${developmentTeam} is pleased to announce the release of ${project.name} ${version}
+
+$introduction.replaceAll("(?<!\015)\012", "
+").replaceAll("(?m)^ +","")
+
+## N.B. the available variables are described here:
+## http://maven.apache.org/plugins/maven-changes-plugin/examples/using-a-custom-announcement-template.html
+##
+## Hack to improve layout: replace all pairs of spaces with a single new-line
+$release.description.replaceAll("  ", "
+")
+
+## set up indent sizes. Only change indent1
+#set($props=${project.properties})
+#set($jiralen=$props.get("commons.jira.id").length())
+## indent1 =   POOL-nnnn:
+#set($blanklen=$jiralen+6)## +6 for "-nnnn:"
+## must be at least as long as the longest JIRA id
+#set($blanks="                                  ")
+#set($indent1=$blanks.substring(0,$blanklen))
+## indent2 allows for issue wrapper
+#set($indent2="$indent1   ")
+##
+#macro ( processaction )
+## Use replaceAll to fix up LF-only line ends on Windows.
+#set($action=$actionItem.getAction().replaceAll("\n","
+"))
+## Replace &lt; with < so can embed tag markup
+#set($action=$action.replaceAll("&lt;","<"))
+## use an empty date to mean don't format the entry
+## TODO how to enable leading spaces without compromising html report
+## unfortunately leading spaces are trimmed even from CDATA sections
+#if ($actionItem.getDate() && $actionItem.getDate().length()==0)
+$action
+#else
+## Fix up indentation for multi-line action descriptions
+#set($action=$action.replaceAll("(?m)^  +",$indent2))
+#if ($actionItem.getIssue())
+#set($issue="$actionItem.getIssue():")
+## Pad shorter issue numbers
+#if ($issue.length() < $indent1.length())#set ($issue="$issue ")#end
+#if ($issue.length() < $indent1.length())#set ($issue="$issue ")#end
+#if ($issue.length() < $indent1.length())#set ($issue="$issue ")#end
+#else
+#set($issue=$indent1)
+#end
+#if ($actionItem.getDueTo())
+#set($dueto=" Thanks to $actionItem.getDueTo().")
+#else
+#set($dueto="")
+#end
+o $issue ${action}$dueto
+#end
+#set($action="")
+#set($issue="")
+#set($dueto="")
+#end
+##
+#if ($release.getActions().size() == 0)
+No changes defined in this version.
+#else
+Changes in this version include:
+
+#if ($release.getActions('add').size() !=0)
+New features:
+#foreach($actionItem in $release.getActions('add'))
+#processaction()
+#end
+
+#end
+##
+#if ($release.getActions('fix').size() !=0)
+Fixed Bugs:
+#foreach($actionItem in $release.getActions('fix'))
+#processaction()
+#end
+
+#end
+##
+#if ($release.getActions('update').size() !=0)
+Changes:
+#foreach($actionItem in $release.getActions('update'))
+#processaction()
+#end
+
+#end
+##
+#if ($release.getActions('remove').size() !=0)
+Removed:
+#foreach($actionItem in $release.getActions('remove'))
+#processaction()
+#end
+#end
+## End of main loop
+#end
+
+Historical list of changes: ${project.url}changes-report.html
+
+For complete information on ${project.name}, including instructions on how to submit bug reports,
+patches, or suggestions for improvement, see the Apache ${project.name} website:
+
+${project.url}

http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/231faf3e/src/site/xdoc/download_crypto.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/download_crypto.xml b/src/site/xdoc/download_crypto.xml
index ac12ce0..b0ec43d 100644
--- a/src/site/xdoc/download_crypto.xml
+++ b/src/site/xdoc/download_crypto.xml
@@ -31,10 +31,21 @@ limitations under the License.
  | 2) Set the following properties in the component's pom:              |
  |    - commons.componentid (required, alphabetic, lower case)          |
  |    - commons.release.version (required)                              |
- |    - commons.binary.suffix (optional)                                |
+ |    - 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.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)                    |
  |                                                                      |
  | 3) Example Properties                                                |
+ |    (commons.release.name inherited by parent:                        |
+ |     ${project.artifactId}-${commons.release.version}                 |
  |                                                                      |
  |  <properties>                                                        |
  |    <commons.componentid>math</commons.componentid>                   |
@@ -46,17 +57,17 @@ limitations under the License.
 <document>
   <properties>
     <title>Download Apache Commons Crypto</title>
-    <author email="dev@commons.apache.org">Commons Documentation Team</author>
+    <author email="dev@commons.apache.org">Apache Commons Documentation Team</author>
   </properties>
   <body>
     <section name="Download Apache Commons Crypto">
     <subsection name="Using a Mirror">
       <p>
         We recommend you use a mirror to download our release
-        builds, but you <strong>must</strong> verify the integrity of
+        builds, but you <strong>must</strong> <a href="http://www.apache.org/info/verification.html">verify the integrity</a> of
         the downloaded files using signatures downloaded from our main
         distribution directories. Recent releases (48 hours) may not yet
-        be available from the mirrors.
+        be available from all the mirrors.
       </p>
 
       <p>
@@ -88,10 +99,15 @@ limitations under the License.
       </form>
 
       <p>
-        The <a href="http://www.apache.org/dist/commons/KEYS">KEYS</a>
-        link links to the code signing keys used to sign the product.
-        The <code>PGP</code> link downloads the OpenPGP compatible signature from our main site.
-        The <code>MD5</code> link downloads the checksum from the main site.
+        It is essential that you
+        <a href="https://www.apache.org/info/verification.html">verify the integrity</a>
+        of downloaded files, preferably using the <code>PGP</code> signature (<code>*.asc</code> files);
+        failing that using the <code>MD5</code> hash (<code>*.md5</code> checksum files).
+      </p>
+      <p>
+        The <a href="https://www.apache.org/dist/commons/KEYS">KEYS</a>
+        file contains the public PGP keys used by Apache Commons developers
+        to sign releases.
       </p>
     </subsection>
     </section>
@@ -100,13 +116,13 @@ limitations under the License.
         <table>
           <tr>
               <td><a href="[preferred]/commons/crypto/binaries/commons-crypto-1.0.0-bin.tar.gz">commons-crypto-1.0.0-bin.tar.gz</a></td>
-              <td><a href="http://www.apache.org/dist/commons/crypto/binaries/commons-crypto-1.0.0-bin.tar.gz.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/commons/crypto/binaries/commons-crypto-1.0.0-bin.tar.gz.asc">pgp</a></td>
+              <td><a href="https://www.apache.org/dist/commons/crypto/binaries/commons-crypto-1.0.0-bin.tar.gz.md5">md5</a></td>
+              <td><a href="https://www.apache.org/dist/commons/crypto/binaries/commons-crypto-1.0.0-bin.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
               <td><a href="[preferred]/commons/crypto/binaries/commons-crypto-1.0.0-bin.zip">commons-crypto-1.0.0-bin.zip</a></td>
-              <td><a href="http://www.apache.org/dist/commons/crypto/binaries/commons-crypto-1.0.0-bin.zip.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/commons/crypto/binaries/commons-crypto-1.0.0-bin.zip.asc">pgp</a></td>
+              <td><a href="https://www.apache.org/dist/commons/crypto/binaries/commons-crypto-1.0.0-bin.zip.md5">md5</a></td>
+              <td><a href="https://www.apache.org/dist/commons/crypto/binaries/commons-crypto-1.0.0-bin.zip.asc">pgp</a></td>
           </tr>
         </table>
       </subsection>
@@ -114,13 +130,13 @@ limitations under the License.
         <table>
           <tr>
               <td><a href="[preferred]/commons/crypto/source/commons-crypto-1.0.0-src.tar.gz">commons-crypto-1.0.0-src.tar.gz</a></td>
-              <td><a href="http://www.apache.org/dist/commons/crypto/source/commons-crypto-1.0.0-src.tar.gz.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/commons/crypto/source/commons-crypto-1.0.0-src.tar.gz.asc">pgp</a></td>
+              <td><a href="https://www.apache.org/dist/commons/crypto/source/commons-crypto-1.0.0-src.tar.gz.md5">md5</a></td>
+              <td><a href="https://www.apache.org/dist/commons/crypto/source/commons-crypto-1.0.0-src.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
               <td><a href="[preferred]/commons/crypto/source/commons-crypto-1.0.0-src.zip">commons-crypto-1.0.0-src.zip</a></td>
-              <td><a href="http://www.apache.org/dist/commons/crypto/source/commons-crypto-1.0.0-src.zip.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/commons/crypto/source/commons-crypto-1.0.0-src.zip.asc">pgp</a></td>
+              <td><a href="https://www.apache.org/dist/commons/crypto/source/commons-crypto-1.0.0-src.zip.md5">md5</a></td>
+              <td><a href="https://www.apache.org/dist/commons/crypto/source/commons-crypto-1.0.0-src.zip.asc">pgp</a></td>
           </tr>
         </table>
       </subsection>
@@ -131,7 +147,7 @@ limitations under the License.
         </p>
         <ul>
           <li class="download"><a href="[preferred]/commons/crypto/">browse download area</a></li>
-          <li><a href="http://archive.apache.org/dist/commons/crypto/">archives...</a></li>
+          <li><a href="https://archive.apache.org/dist/commons/crypto/">archives...</a></li>
         </ul>
     </section>
   </body>

http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/231faf3e/src/site/xdoc/issue-tracking.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/issue-tracking.xml b/src/site/xdoc/issue-tracking.xml
index 1f124e0..6239737 100644
--- a/src/site/xdoc/issue-tracking.xml
+++ b/src/site/xdoc/issue-tracking.xml
@@ -44,20 +44,20 @@ limitations under the License.
 <document>
   <properties>
     <title>Apache Commons Crypto Issue tracking</title>
-    <author email="dev@commons.apache.org">Commons Documentation Team</author>
+    <author email="dev@commons.apache.org">Apache Commons Documentation Team</author>
   </properties>
   <body>
 
     <section name="Apache Commons Crypto Issue tracking">
       <p>
-      Apache Commons Crypto uses <a href="http://issues.apache.org/jira/">ASF JIRA</a> for tracking issues.
-      See the <a href="http://issues.apache.org/jira/browse/CRYPTO">Apache Commons Crypto JIRA project page</a>.
+      Apache Commons Crypto uses <a href="https://issues.apache.org/jira/">ASF JIRA</a> for tracking issues.
+      See the <a href="https://issues.apache.org/jira/browse/CRYPTO">Apache Commons Crypto JIRA project page</a>.
       </p>
 
       <p>
-      To use JIRA you may need to <a href="http://issues.apache.org/jira/secure/Signup!default.jspa">create an account</a>
+      To use JIRA you may need to <a href="https://issues.apache.org/jira/secure/Signup!default.jspa">create an account</a>
       (if you have previously created/updated Commons issues using Bugzilla an account will have been automatically
-      created and you can use the <a href="http://issues.apache.org/jira/secure/ForgotPassword!default.jspa">Forgot Password</a>
+      created and you can use the <a href="https://issues.apache.org/jira/secure/ForgotPassword!default.jspa">Forgot Password</a>
       page to get a new password).
       </p>
 
@@ -65,13 +65,13 @@ limitations under the License.
       If you would like to report a bug, or raise an enhancement request with
       Apache Commons Crypto please do the following:
       <ol>
-        <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12320024&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=1&amp;status=3&amp;status=4">Search existing open bugs</a>.
+        <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12320024&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=1&amp;status=3&amp;status=4">Search existing open bugs</a>.
             If you find your issue listed then please add a comment with your details.</li>
         <li><a href="mail-lists.html">Search the mailing list archive(s)</a>.
             You may find your issue or idea has already been discussed.</li>
         <li>Decide if your issue is a bug or an enhancement.</li>
-        <li>Submit either a <a href="http://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12320024&amp;issuetype=1&amp;priority=4&amp;assignee=-1">bug report</a>
-            or <a href="http://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12320024&amp;issuetype=4&amp;priority=4&amp;assignee=-1">enhancement request</a>.</li>
+        <li>Submit either a <a href="https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12320024&amp;issuetype=1&amp;priority=4&amp;assignee=-1">bug report</a>
+            or <a href="https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12320024&amp;issuetype=4&amp;priority=4&amp;assignee=-1">enhancement request</a>.</li>
       </ol>
       </p>
 
@@ -92,9 +92,9 @@ limitations under the License.
       <p>
       You may also find these links useful:
       <ul>
-        <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12320024&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=1&amp;status=3&amp;status=4">All Open Apache Commons Crypto bugs</a></li>
-        <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12320024&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=5&amp;status=6">All Resolved Apache Commons Crypto bugs</a></li>
-        <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12320024&amp;sorter/field=issuekey&amp;sorter/order=DESC">All Apache Commons Crypto bugs</a></li>
+        <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12320024&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=1&amp;status=3&amp;status=4">All Open Apache Commons Crypto bugs</a></li>
+        <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12320024&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=5&amp;status=6">All Resolved Apache Commons Crypto bugs</a></li>
+        <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12320024&amp;sorter/field=issuekey&amp;sorter/order=DESC">All Apache Commons Crypto bugs</a></li>
       </ul>
       </p>
     </section>

http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/231faf3e/src/site/xdoc/mail-lists.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/mail-lists.xml b/src/site/xdoc/mail-lists.xml
index d25b496..892e961 100644
--- a/src/site/xdoc/mail-lists.xml
+++ b/src/site/xdoc/mail-lists.xml
@@ -42,7 +42,7 @@ limitations under the License.
 <document>
   <properties>
     <title>Apache Commons Crypto Mailing Lists</title>
-    <author email="dev@commons.apache.org">Commons Documentation Team</author>
+    <author email="dev@commons.apache.org">Apache Commons Documentation Team</author>
   </properties>
   <body>
 


[2/3] commons-crypto git commit: CRYPTO-55: Add contributors to the contributors list

Posted by sd...@apache.org.
CRYPTO-55: Add contributors to the contributors list


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

Branch: refs/heads/CRYPTO-1.0.0
Commit: cc35be08bb058b5010c76ec90d4139844ca9af38
Parents: 231faf3
Author: Jia Ke <ke...@intel.com>
Authored: Fri May 6 13:27:37 2016 +0800
Committer: Sun Dapeng <sd...@apache.org>
Committed: Fri May 6 13:27:37 2016 +0800

----------------------------------------------------------------------
 pom.xml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/cc35be08/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 228ae10..5526160 100644
--- a/pom.xml
+++ b/pom.xml
@@ -133,6 +133,26 @@ Features
       <id>yliu</id>
     </developer>
   </developers>
+
+  <contributors>
+    <contributor>
+      <name>Colin Ma</name>
+      <email>junjie.ma@intel.com</email>
+    </contributor>
+    <contributor>
+      <name>Xianda Ke</name>
+      <email>xianda.ke@intel.com</email>
+    </contributor>
+    <contributor>
+      <name>Ke Jia</name>
+      <email>ke.a.jia@intel.com</email>
+    </contributor>
+    <contributor>
+      <name>George Kankava </name>
+      <email>george.kankava@devfactory.com</email>
+    </contributor>
+  </contributors>
+
   <properties>
     <commons.componentid>crypto</commons.componentid>
     <commons.release.version>1.0.0</commons.release.version>


[3/3] commons-crypto git commit: CRYPTO-53: Fix assembly, pom.xml, README, NOTICE.txt...etc

Posted by sd...@apache.org.
CRYPTO-53: Fix assembly, pom.xml, README, NOTICE.txt...etc


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

Branch: refs/heads/CRYPTO-1.0.0
Commit: 1335e165ea7a43c4172644e39d6705fded1603fa
Parents: cc35be0
Author: Sun Dapeng <sd...@apache.org>
Authored: Fri May 6 13:32:52 2016 +0800
Committer: Sun Dapeng <sd...@apache.org>
Committed: Fri May 6 13:32:52 2016 +0800

----------------------------------------------------------------------
 src/site/xdoc/userguide.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/1335e165/src/site/xdoc/userguide.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/userguide.xml b/src/site/xdoc/userguide.xml
index 78c30b5..e5b686a 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 7 (or above) and OpenSSL 1.0.1c (or above) for production
+            Commons Crypto relies on standard JDK 6 (or above) and OpenSSL 1.0.1c (or above) for production
             deployment.
           </p>
           <h4>Using Commons Crypto in your Apache Maven build</h4>