[maven-release-plugin] copy for tag commons-compress-1.0
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/compress/tags/commons-compress-1.0@774629 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index 7041811..88c8e68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,10 +102,25 @@
<commons.jira.pid>12310904</commons.jira.pid>
<!-- configuration bits for cutting a release candidate -->
<commons.release.version>1.0</commons.release.version>
- <commons.rc.version>RC1</commons.rc.version>
+ <commons.rc.version>RC2</commons.rc.version>
</properties>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <!-- Override plugin versions in parent Pom, which are too old to support manifests -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<!-- create the source and binary assemblies -->
@@ -118,6 +133,18 @@
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -161,6 +188,27 @@
</rulesets>
</configuration>
</plugin>
+ <!-- Override Javadoc config in parent pom to add default manifest entries -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ </manifest>
+ </archive>
+ <aggregate>false</aggregate>
+ <source>${maven.compile.source}</source>
+ <encoding>${commons.encoding}</encoding>
+ <docEncoding>${commons.docEncoding}</docEncoding>
+ <linksource>true</linksource>
+ <links>
+ <link>http://java.sun.com/javase/6/docs/api/</link>
+ </links>
+ </configuration>
+ </plugin>
</plugins>
</reporting>
diff --git a/src/site/site.xml b/src/site/site.xml
index 2439b38..aafc538 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -31,7 +31,7 @@
<item name="Examples" href="/examples.html"/>
<item name="Conventions" href="/conventions.html"/>
<item name="Issue Tracking" href="/issue-tracking.html"/>
- <item name="Download" href="/downloads.html"/>
+ <item name="Download" href="/download_compress.html"/>
<item name="Wiki" href="http://wiki.apache.org/commons/Compress"/>
</menu>
</body>
diff --git a/src/site/xdoc/download_compress.xml b/src/site/xdoc/download_compress.xml
index 238106c..205ed62 100644
--- a/src/site/xdoc/download_compress.xml
+++ b/src/site/xdoc/download_compress.xml
@@ -1,145 +1,145 @@
-<?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 GENERATED BY THE COMMONS BUILD PLUGIN ****|
- |**** DO NOT EDIT DIRECTLY ****|
- |**** ****|
- +======================================================================+
- | TEMPLATE FILE: download-page-template.xml |
- | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |
- +======================================================================+
- | |
- | 1) Re-generate using: mvn commons:download-page |
- | |
- | 2) Set the following properties in the component's pom: |
- | - commons.componentid (required, alphabetic, lower case) |
- | - commons.release.version (required) |
- | - commons.binary.suffix (optional) |
- | (defaults to "-bin", set to "" for pre-maven2 releases) |
- | |
- | 3) Example Properties |
- | |
- | <properties> |
- | <commons.componentid>math</commons.componentid> |
- | <commons.release.version>1.2</commons.release.version> |
- | </properties> |
- | |
- +======================================================================+
--->
-<document>
- <properties>
- <title>Download Commons Compress</title>
- <author email="dev@commons.apache.org">Commons Documentation Team</author>
- </properties>
- <body>
- <section name="Download Commons Compress">
- <p>
- We recommend you use a mirror to download our release
- builds, but you <strong>must</strong> verify the integrity of
- the downloaded files using signatures downloaded from our main
- distribution directories. Recent releases (48 hours) may not yet
- be available from the mirrors.
- </p>
-
- <p>
- You are currently using <b>[preferred]</b>. If you
- encounter a problem with this mirror, please select another
- mirror. If all mirrors are failing, there are <i>backup</i>
- mirrors (at the end of the mirrors list) that should be
- available.
- <br></br>
- [if-any logo]<a href="[link]"><img align="right" src="[logo]" border="0"></img></a>[end]
- </p>
-
- <form action="[location]" method="get" id="SelectMirror">
- <p>
- Other mirrors:
- <select name="Preferred">
- [if-any http]
- [for http]<option value="[http]">[http]</option>[end]
- [end]
- [if-any ftp]
- [for ftp]<option value="[ftp]">[ftp]</option>[end]
- [end]
- [if-any backup]
- [for backup]<option value="[backup]">[backup] (backup)</option>[end]
- [end]
- </select>
- <input type="submit" value="Change"></input>
- </p>
- </form>
-
- <p>
- The <code>KEYS</code> 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.
- </p>
-
- <p>
- For more information concerning Commons Compress, see the
- <a href="index.html" class="name">Commons Compress</a> web site.
- </p>
-
- <p>
- <div class="links"><span class="link"><a href="http://www.apache.org/dist/commons/KEYS">KEYS</a></span></div>
- <ul class="downloads">
- <li class="group"><div class="links"><span class="label">Binary</span></div>
- <ul>
- <li class="download"><a href="[preferred]/commons/compress/binaries/commons-compress-1.0-bin.tar.gz">1.0.tar.gz</a>
- <ul class="attributes">
- <li><span class="md5">[<a href="http://www.apache.org/dist/commons/compress/binaries/commons-compress-1.0-bin.tar.gz.md5">md5</a>]</span>
- <span class="pgp">[<a href="http://www.apache.org/dist/commons/compress/binaries/commons-compress-1.0-bin.tar.gz.asc">pgp</a>]</span>
- </li>
- </ul>
- </li>
- <li class="download"><a href="[preferred]/commons/compress/binaries/commons-compress-1.0-bin.zip">1.0.zip</a>
- <ul class="attributes">
- <li><span class="md5">[<a href="http://www.apache.org/dist/commons/compress/binaries/commons-compress-1.0-bin.zip.md5">md5</a>]</span>
- <span class="pgp">[<a href="http://www.apache.org/dist/commons/compress/binaries/commons-compress-1.0-bin.zip.asc">pgp</a>]</span>
- </li>
- </ul>
- </li>
- </ul>
- </li>
- <li class="group"><div class="links"><span class="label">Source</span></div>
- <ul>
- <li class="download"><a href="[preferred]/commons/compress/source/commons-compress-1.0-src.tar.gz">1.0.tar.gz</a>
- <ul class="attributes">
- <li><span class="md5">[<a href="http://www.apache.org/dist/commons/compress/source/commons-compress-1.0-src.tar.gz.md5">md5</a>]</span>
- <span class="pgp">[<a href="http://www.apache.org/dist/commons/compress/source/commons-compress-1.0-src.tar.gz.asc">pgp</a>]</span>
- </li>
- </ul>
- </li>
- <li class="download"><a href="[preferred]/commons/compress/source/commons-compress-1.0-src.zip">1.0.zip</a>
- <ul class="attributes">
- <li><span class="md5">[<a href="http://www.apache.org/dist/commons/compress/source/commons-compress-1.0-src.zip.md5">md5</a>]</span>
- <span class="pgp">[<a href="http://www.apache.org/dist/commons/compress/source/commons-compress-1.0-src.zip.asc">pgp</a>]</span>
- </li>
- </ul>
- </li>
- </ul>
- </li>
- <li class="download"><a href="[preferred]/commons/compress/">browse download area</a></li>
- <li><a href="http://archive.apache.org/dist/commons/compress/">archives...</a></li>
- </ul>
- </p>
- </section>
- </body>
-</document>
+<?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 GENERATED BY THE COMMONS BUILD PLUGIN ****|
+ |**** DO NOT EDIT DIRECTLY ****|
+ |**** ****|
+ +======================================================================+
+ | TEMPLATE FILE: download-page-template.xml |
+ | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |
+ +======================================================================+
+ | |
+ | 1) Re-generate using: mvn commons:download-page |
+ | |
+ | 2) Set the following properties in the component's pom: |
+ | - commons.componentid (required, alphabetic, lower case) |
+ | - commons.release.version (required) |
+ | - commons.binary.suffix (optional) |
+ | (defaults to "-bin", set to "" for pre-maven2 releases) |
+ | |
+ | 3) Example Properties |
+ | |
+ | <properties> |
+ | <commons.componentid>math</commons.componentid> |
+ | <commons.release.version>1.2</commons.release.version> |
+ | </properties> |
+ | |
+ +======================================================================+
+-->
+<document>
+ <properties>
+ <title>Download Commons Compress</title>
+ <author email="dev@commons.apache.org">Commons Documentation Team</author>
+ </properties>
+ <body>
+ <section name="Download Commons Compress">
+ <p>
+ We recommend you use a mirror to download our release
+ builds, but you <strong>must</strong> verify the integrity of
+ the downloaded files using signatures downloaded from our main
+ distribution directories. Recent releases (48 hours) may not yet
+ be available from the mirrors.
+ </p>
+
+ <p>
+ You are currently using <b>[preferred]</b>. If you
+ encounter a problem with this mirror, please select another
+ mirror. If all mirrors are failing, there are <i>backup</i>
+ mirrors (at the end of the mirrors list) that should be
+ available.
+ <br></br>
+ [if-any logo]<a href="[link]"><img align="right" src="[logo]" border="0"></img></a>[end]
+ </p>
+
+ <form action="[location]" method="get" id="SelectMirror">
+ <p>
+ Other mirrors:
+ <select name="Preferred">
+ [if-any http]
+ [for http]<option value="[http]">[http]</option>[end]
+ [end]
+ [if-any ftp]
+ [for ftp]<option value="[ftp]">[ftp]</option>[end]
+ [end]
+ [if-any backup]
+ [for backup]<option value="[backup]">[backup] (backup)</option>[end]
+ [end]
+ </select>
+ <input type="submit" value="Change"></input>
+ </p>
+ </form>
+
+ <p>
+ The <code>KEYS</code> 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.
+ </p>
+
+ <p>
+ For more information concerning Commons Compress, see the
+ <a href="index.html" class="name">Commons Compress</a> web site.
+ </p>
+
+ <p>
+ <div class="links"><span class="link"><a href="http://www.apache.org/dist/commons/KEYS">KEYS</a></span></div>
+ <ul class="downloads">
+ <li class="group"><div class="links"><span class="label">Binary</span></div>
+ <ul>
+ <li class="download"><a href="[preferred]/commons/compress/binaries/commons-compress-1.0-bin.tar.gz">1.0.tar.gz</a>
+ <ul class="attributes">
+ <li><span class="md5">[<a href="http://www.apache.org/dist/commons/compress/binaries/commons-compress-1.0-bin.tar.gz.md5">md5</a>]</span>
+ <span class="pgp">[<a href="http://www.apache.org/dist/commons/compress/binaries/commons-compress-1.0-bin.tar.gz.asc">pgp</a>]</span>
+ </li>
+ </ul>
+ </li>
+ <li class="download"><a href="[preferred]/commons/compress/binaries/commons-compress-1.0-bin.zip">1.0.zip</a>
+ <ul class="attributes">
+ <li><span class="md5">[<a href="http://www.apache.org/dist/commons/compress/binaries/commons-compress-1.0-bin.zip.md5">md5</a>]</span>
+ <span class="pgp">[<a href="http://www.apache.org/dist/commons/compress/binaries/commons-compress-1.0-bin.zip.asc">pgp</a>]</span>
+ </li>
+ </ul>
+ </li>
+ </ul>
+ </li>
+ <li class="group"><div class="links"><span class="label">Source</span></div>
+ <ul>
+ <li class="download"><a href="[preferred]/commons/compress/source/commons-compress-1.0-src.tar.gz">1.0.tar.gz</a>
+ <ul class="attributes">
+ <li><span class="md5">[<a href="http://www.apache.org/dist/commons/compress/source/commons-compress-1.0-src.tar.gz.md5">md5</a>]</span>
+ <span class="pgp">[<a href="http://www.apache.org/dist/commons/compress/source/commons-compress-1.0-src.tar.gz.asc">pgp</a>]</span>
+ </li>
+ </ul>
+ </li>
+ <li class="download"><a href="[preferred]/commons/compress/source/commons-compress-1.0-src.zip">1.0.zip</a>
+ <ul class="attributes">
+ <li><span class="md5">[<a href="http://www.apache.org/dist/commons/compress/source/commons-compress-1.0-src.zip.md5">md5</a>]</span>
+ <span class="pgp">[<a href="http://www.apache.org/dist/commons/compress/source/commons-compress-1.0-src.zip.asc">pgp</a>]</span>
+ </li>
+ </ul>
+ </li>
+ </ul>
+ </li>
+ <li class="download"><a href="[preferred]/commons/compress/">browse download area</a></li>
+ <li><a href="http://archive.apache.org/dist/commons/compress/">archives...</a></li>
+ </ul>
+ </p>
+ </section>
+ </body>
+</document>
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index c261948..42d4329 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -47,15 +47,13 @@
<subsection name="Status">
<ul>
<li>This component has been promoted to Commons proper</li>
- <li>The code is unreleased</li>
- <li>Methods and classes can and will appear and
- disappear without warning</li>
- <li>If you like the code and want to push it towards a
- release, join the mailing list!</li>
+ <li>The code has been released as version 1.0</li>
</ul>
</subsection>
</section>
<section name="Documentation">
+ <p>Commons Compress requires Java 1.4 or later.</p>
+
<p>The compress component is split into <em>compressors</em> and
<em>archivers</em>. While <em>compressors</em>
(un)compress streams that usually store a single
diff --git a/src/test/java/org/apache/commons/compress/archivers/CpioTestCase.java b/src/test/java/org/apache/commons/compress/archivers/CpioTestCase.java
index e7e6b8c..eb5247e 100644
--- a/src/test/java/org/apache/commons/compress/archivers/CpioTestCase.java
+++ b/src/test/java/org/apache/commons/compress/archivers/CpioTestCase.java
@@ -55,19 +55,21 @@
public void testCpioUnarchive() throws Exception {
final File output = new File(dir, "bla.cpio");
+ final File file1 = getFile("test1.xml");
+ final File file2 = getFile("test2.xml");
+ final long file1Length = file1.length();
+ final long file2Length = file2.length();
+
{
- final File file1 = getFile("test1.xml");
- final File file2 = getFile("test2.xml");
-
final OutputStream out = new FileOutputStream(output);
final ArchiveOutputStream os = new ArchiveStreamFactory().createArchiveOutputStream("cpio", out);
- CpioArchiveEntry entry = new CpioArchiveEntry("test1.xml", file1.length());
+ CpioArchiveEntry entry = new CpioArchiveEntry("test1.xml", file1Length);
entry.setMode(CpioConstants.C_ISREG);
os.putArchiveEntry(entry);
IOUtils.copy(new FileInputStream(file1), os);
os.closeArchiveEntry();
- entry = new CpioArchiveEntry("test2.xml", file2.length());
+ entry = new CpioArchiveEntry("test2.xml", file2Length);
entry.setMode(CpioConstants.C_ISREG);
os.putArchiveEntry(entry);
IOUtils.copy(new FileInputStream(file2), os);
@@ -95,17 +97,13 @@
in.close();
is.close();
- int lineSepLength = System.getProperty("line.separator").length();
-
File t = (File)result.get("test1.xml");
assertTrue("Expected " + t.getAbsolutePath() + " to exist", t.exists());
- assertEquals("length of " + t.getAbsolutePath(),
- 72 + 4 * lineSepLength, t.length());
+ assertEquals("length of " + t.getAbsolutePath(), file1Length, t.length());
t = (File)result.get("test2.xml");
assertTrue("Expected " + t.getAbsolutePath() + " to exist", t.exists());
- assertEquals("length of " + t.getAbsolutePath(),
- 73 + 5 * lineSepLength, t.length());
+ assertEquals("length of " + t.getAbsolutePath(), file2Length, t.length());
}
}
diff --git a/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStreamTest.java b/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStreamTest.java
index ee8aab7..f6aeea5 100644
--- a/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStreamTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStreamTest.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
package org.apache.commons.compress.archivers.cpio;
import java.io.FileInputStream;
