Author: bodewig Date: Fri Jul 5 14:42:34 2013 New Revision: 1500025 URL: http://svn.apache.org/r1500025 Log: merge
Modified: commons/proper/compress/branches/LZMA/ (props changed) commons/proper/compress/branches/LZMA/README.txt commons/proper/compress/branches/LZMA/pom.xml Propchange: commons/proper/compress/branches/LZMA/ ------------------------------------------------------------------------------ Merged /commons/proper/compress/trunk:r1491497-1500024 Modified: commons/proper/compress/branches/LZMA/README.txt URL: http://svn.apache.org/viewvc/commons/proper/compress/branches/LZMA/README.txt?rev=1500025&r1=1500024&r2=1500025&view=diff ============================================================================== --- commons/proper/compress/branches/LZMA/README.txt (original) +++ commons/proper/compress/branches/LZMA/README.txt Fri Jul 5 14:42:34 2013 @@ -10,3 +10,26 @@ Original Zip classes from contributors o Original CPIO classes contributed by Markus Kuss and the jRPM project (jrpm.sourceforge.net). + +This distribution includes cryptographic software. The country in +which you currently reside may have restrictions on the import, +possession, use, and/or re-export to another country, of encryption +software. BEFORE using any encryption software, please check your +country's laws, regulations and policies concerning the import, +possession, or use, and re-export of encryption software, to see if +this is permitted. See <http://www.wassenaar.org/> for more +information. + +The U.S. Government Department of Commerce, Bureau of Industry and +Security (BIS), has classified this software as Export Commodity +Control Number (ECCN) 5D002.C.1, which includes information security +software using or performing cryptographic functions with asymmetric +algorithms. The form and manner of this Apache Software Foundation +distribution makes it eligible for export under the License Exception +ENC Technology Software Unrestricted (TSU) exception (see the BIS +Export Administration Regulations, Section 740.13) for both object +code and source code. + +The following provides more details on the included cryptographic +software: + * the 7zip package can read AES encrypted archives Modified: commons/proper/compress/branches/LZMA/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/compress/branches/LZMA/pom.xml?rev=1500025&r1=1500024&r2=1500025&view=diff ============================================================================== --- commons/proper/compress/branches/LZMA/pom.xml (original) +++ commons/proper/compress/branches/LZMA/pom.xml Fri Jul 5 14:42:34 2013 @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.commons</groupId> <artifactId>commons-parent</artifactId> - <version>28</version> + <version>32</version> </parent> <groupId>org.apache.commons</groupId> @@ -35,8 +35,8 @@ These include: bzip2, gzip, pack200, xz </description> <properties> - <maven.compile.source>1.5</maven.compile.source> - <maven.compile.target>1.5</maven.compile.target> + <maven.compiler.source>1.5</maven.compiler.source> + <maven.compiler.target>1.5</maven.compiler.target> <commons.componentid>compress</commons.componentid> <commons.jira.id>COMPRESS</commons.jira.id> <commons.jira.pid>12310904</commons.jira.pid> @@ -199,7 +199,7 @@ These include: bzip2, gzip, pack200, xz <version>2.5</version> <configuration> <minimumTokens>200</minimumTokens> - <targetJdk>${maven.compile.source}</targetJdk> + <targetJdk>${maven.compiler.source}</targetJdk> <rulesets> <ruleset>${basedir}/pmd-ruleset.xml</ruleset> </rulesets> @@ -211,7 +211,7 @@ These include: bzip2, gzip, pack200, xz <artifactId>maven-javadoc-plugin</artifactId> <configuration> <quiet>true</quiet> - <source>${maven.compile.source}</source> + <source>${maven.compiler.source}</source> <encoding>${commons.encoding}</encoding> <docEncoding>${commons.docEncoding}</docEncoding> <linksource>true</linksource>