Author: jochen
Date: Fri May 13 09:20:45 2016
New Revision: 1743630
URL: http://svn.apache.org/viewvc?rev=1743630&view=rev
Log:
Minor fixes, to make maven-javadoc-plugin happy.
Added:
commons/proper/fileupload/branches/b1_3/pom.xml.releaseBackup
Modified:
commons/proper/fileupload/branches/b1_3/pom.xml
commons/proper/fileupload/branches/b1_3/src/main/java/org/apache/commons/fileupload/DefaultFileItemFactory.java
commons/proper/fileupload/branches/b1_3/src/main/java/org/apache/commons/fileupload/FileUploadBase.java
commons/proper/fileupload/branches/b1_3/src/main/java/org/apache/commons/fileupload/MultipartStream.java
Modified: commons/proper/fileupload/branches/b1_3/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/fileupload/branches/b1_3/pom.xml?rev=1743630&r1=1743629&r2=1743630&view=diff
==============================================================================
--- commons/proper/fileupload/branches/b1_3/pom.xml (original)
+++ commons/proper/fileupload/branches/b1_3/pom.xml Fri May 13 09:20:45 2016
@@ -26,7 +26,7 @@
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.3.2-SNAPSHOT</version>
+ <version>1.3.2</version>
<name>Apache Commons FileUpload</name>
<description>
@@ -167,9 +167,9 @@
</contributors>
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/fileupload/trunk</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/fileupload/trunk</developerConnection>
- <url>http://svn.apache.org/viewvc/commons/proper/fileupload/trunk</url>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/fileupload/tags/commons-fileupload-1.3.2</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/fileupload/tags/commons-fileupload-1.3.2</developerConnection>
+
<url>http://svn.apache.org/viewvc/commons/proper/fileupload/tags/commons-fileupload-1.3.2</url>
</scm>
<issueManagement>
<system>jira</system>
@@ -260,7 +260,7 @@
</goals>
</pluginExecutionFilter>
<action>
-
<ignore></ignore>
+ <ignore />
</action>
</pluginExecution>
</pluginExecutions>
Added: commons/proper/fileupload/branches/b1_3/pom.xml.releaseBackup
URL:
http://svn.apache.org/viewvc/commons/proper/fileupload/branches/b1_3/pom.xml.releaseBackup?rev=1743630&view=auto
==============================================================================
--- commons/proper/fileupload/branches/b1_3/pom.xml.releaseBackup (added)
+++ commons/proper/fileupload/branches/b1_3/pom.xml.releaseBackup Fri May 13
09:20:45 2016
@@ -0,0 +1,331 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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 xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-parent</artifactId>
+ <version>40</version>
+ </parent>
+
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.3.2-SNAPSHOT</version>
+
+ <name>Apache Commons FileUpload</name>
+ <description>
+ The Apache Commons FileUpload component provides a simple yet flexible
means of adding support for multipart
+ file upload functionality to servlets and web applications.
+ </description>
+ <url>http://commons.apache.org/proper/commons-fileupload/</url>
+ <inceptionYear>2002</inceptionYear>
+
+ <developers>
+ <developer>
+ <name>Martin Cooper</name>
+ <id>martinc</id>
+ <email>mart...@apache.org</email>
+ <organization>Yahoo!</organization>
+ </developer>
+ <developer>
+ <name>dIon Gillard</name>
+ <id>dion</id>
+ <email>d...@apache.org</email>
+ <organization>Multitask Consulting</organization>
+ </developer>
+ <developer>
+ <name>John McNally</name>
+ <id>jmcnally</id>
+ <email>jmcna...@collab.net</email>
+ <organization>CollabNet</organization>
+ </developer>
+ <developer>
+ <name>Daniel Rall</name>
+ <id>dlr</id>
+ <email>d...@finemaltcoding.com</email>
+ <organization>CollabNet</organization>
+ </developer>
+ <developer>
+ <name>Jason van Zyl</name>
+ <id>jvanzyl</id>
+ <email>ja...@zenplex.com</email>
+ <organization>Zenplex</organization>
+ </developer>
+ <developer>
+ <name>Robert Burrell Donkin</name>
+ <id>rdonkin</id>
+ <email>rdon...@apache.org</email>
+ <organization />
+ </developer>
+ <developer>
+ <name>Sean C. Sullivan</name>
+ <id>sullis</id>
+ <email>sean |at| seansullivan |dot| com</email>
+ <organization />
+ </developer>
+ <developer>
+ <name>Jochen Wiedmann</name>
+ <id>jochen</id>
+ <email>jochen.wiedm...@gmail.com</email>
+ <organization />
+ </developer>
+ <developer>
+ <name>Simone Tripodi</name>
+ <id>simonetripodi</id>
+ <email>simonetrip...@apache.org</email>
+ <organization>Adobe</organization>
+ </developer>
+ <developer>
+ <name>Gary Gregory</name>
+ <id>ggregory</id>
+ <email>ggreg...@apache.org</email>
+ <organization />
+ </developer>
+ </developers>
+
+ <contributors>
+ <contributor>
+ <name>Aaron Freeman</name>
+ <email>aa...@sendthisfile.com</email>
+ </contributor>
+ <contributor>
+ <name>Daniel Fabian</name>
+ <email>dfab...@google.com</email>
+ </contributor>
+ <contributor>
+ <name>Jörg Heinicke</name>
+ <email>joerg.heini...@gmx.de</email>
+ </contributor>
+ <contributor>
+ <name>Stepan Koltsov</name>
+ <email>y...@mx1.ru</email>
+ </contributor>
+ <contributor>
+ <name>Michael Macaluso</name>
+ <email>michael.pub...@wavecorp.com</email>
+ </contributor>
+ <contributor>
+ <name>Amichai Rothman</name>
+ <email>amich...@amichais.net</email>
+ </contributor>
+ <contributor>
+ <name>Alexander Sova</name>
+ <email>b...@noir.crocodile.org</email>
+ </contributor>
+ <contributor>
+ <name>Paul Spurr</name>
+ <email>psp...@gmail.com</email>
+ </contributor>
+ <contributor>
+ <name>Thomas Vandahl</name>
+ <email>t...@apache.org</email>
+ </contributor>
+ <contributor>
+ <name>Henry Yandell</name>
+ <email>bay...@apache.org</email>
+ </contributor>
+ <contributor>
+ <name>Jan Novotný</name>
+ <email>novotn...@gmail.com</email>
+ </contributor>
+ <contributor>
+ <name>frank</name>
+ <email>mailsur...@gmail.com</email>
+ </contributor>
+ <contributor>
+ <name>Rafal Krzewski</name>
+ <email>rafal.krzew...@e-point.pl</email>
+ </contributor>
+ <contributor>
+ <name>Sean Legassick</name>
+ <email>s...@informage.net</email>
+ </contributor>
+ <contributor>
+ <name>Oleg Kalnichevski</name>
+ <email>o...@ural.ru</email>
+ </contributor>
+ <contributor>
+ <name>David Sean Taylor</name>
+ <email>tay...@apache.org</email>
+ </contributor>
+ </contributors>
+
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/fileupload/trunk</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/fileupload/trunk</developerConnection>
+ <url>http://svn.apache.org/viewvc/commons/proper/fileupload/trunk</url>
+ </scm>
+ <issueManagement>
+ <system>jira</system>
+ <url>http://issues.apache.org/jira/browse/FILEUPLOAD</url>
+ </issueManagement>
+
+ <properties>
+ <maven.compiler.source>1.5</maven.compiler.source>
+ <maven.compiler.target>1.5</maven.compiler.target>
+ <maven.compile.encoding>ISO-8859-1</maven.compile.encoding>
+ <commons.componentid>fileupload</commons.componentid>
+ <commons.release.version>1.3.1</commons.release.version>
+ <commons.rc.version>RC1</commons.rc.version>
+ <commons.jira.id>FILEUPLOAD</commons.jira.id>
+ <commons.jira.pid>12310476</commons.jira.pid>
+
<commons.osgi.export>!org.apache.commons.fileupload.util.mime,org.apache.commons.*;version=${project.version};-noimport:=true</commons.osgi.export>
+ <commons.osgi.import>!javax.portlet,*</commons.osgi.import>
+ <commons.osgi.dynamicImport>javax.portlet</commons.osgi.dynamicImport>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>portlet-api</groupId>
+ <artifactId>portlet-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.2</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>${basedir}/src/main/assembly/bin.xml</descriptor>
+ <descriptor>${basedir}/src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <preparationGoals>clean site verify</preparationGoals>
+ <goals>deploy</goals>
+ </configuration>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e
settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+
org.apache.maven.plugins
+ </groupId>
+ <artifactId>
+
maven-antrun-plugin
+ </artifactId>
+
<versionRange>[1.7,)</versionRange>
+ <goals>
+
<goal>run</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+
<ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changes-plugin</artifactId>
+ <version>${commons.changes.version}</version>
+ <configuration>
+ <issueLinkTemplate>%URL%/../%ISSUE%</issueLinkTemplate>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>changes-report</report>
+ <!-- NPE, retry from time to time <report>jira-report</report>
-->
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.10</version>
+ <configuration>
+
<configLocation>${basedir}/src/checkstyle/fileupload_checks.xml</configLocation>
+
<suppressionsLocation>${basedir}/src/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
+ <enableRulesSummary>false</enableRulesSummary>
+
<headerLocation>${basedir}/src/checkstyle/license-header.txt</headerLocation>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>2.7.1</version>
+ <configuration>
+ <targetJdk>${maven.compiler.target}</targetJdk>
+ <rulesets>
+ <ruleset>${basedir}/src/checkstyle/fileupload_basic.xml</ruleset>
+ </rulesets>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ <version>${commons.clirr.version}</version>
+ <configuration>
+ <comparisonArtifacts>
+ <comparisonArtifact>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.3</version>
+ </comparisonArtifact>
+ </comparisonArtifacts>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+
+</project>
Modified:
commons/proper/fileupload/branches/b1_3/src/main/java/org/apache/commons/fileupload/DefaultFileItemFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/fileupload/branches/b1_3/src/main/java/org/apache/commons/fileupload/DefaultFileItemFactory.java?rev=1743630&r1=1743629&r2=1743630&view=diff
==============================================================================
---
commons/proper/fileupload/branches/b1_3/src/main/java/org/apache/commons/fileupload/DefaultFileItemFactory.java
(original)
+++
commons/proper/fileupload/branches/b1_3/src/main/java/org/apache/commons/fileupload/DefaultFileItemFactory.java
Fri May 13 09:20:45 2016
@@ -28,14 +28,13 @@ import org.apache.commons.fileupload.dis
* disk, is configurable, as is the directory in which temporary files will be
* created.</p>
*
- * <p>If not otherwise configured, the default configuration values are as
+ * If not otherwise configured, the default configuration values are as
* follows:
* <ul>
* <li>Size threshold is 10KB.</li>
* <li>Repository is the system default temp directory, as returned by
* <code>System.getProperty("java.io.tmpdir")</code>.</li>
* </ul>
- * </p>
*
* @version $Id$
*
Modified:
commons/proper/fileupload/branches/b1_3/src/main/java/org/apache/commons/fileupload/FileUploadBase.java
URL:
http://svn.apache.org/viewvc/commons/proper/fileupload/branches/b1_3/src/main/java/org/apache/commons/fileupload/FileUploadBase.java?rev=1743630&r1=1743629&r2=1743630&view=diff
==============================================================================
---
commons/proper/fileupload/branches/b1_3/src/main/java/org/apache/commons/fileupload/FileUploadBase.java
(original)
+++
commons/proper/fileupload/branches/b1_3/src/main/java/org/apache/commons/fileupload/FileUploadBase.java
Fri May 13 09:20:45 2016
@@ -1361,7 +1361,7 @@ public abstract class FileUploadBase {
/**
* @deprecated 1.2 Replaced by
- * {@link #SizeLimitExceededException(String, long, long)}
+ * {@code SizeLimitExceededException(String, long, long)}
*/
@Deprecated
public SizeLimitExceededException() {
@@ -1370,7 +1370,7 @@ public abstract class FileUploadBase {
/**
* @deprecated 1.2 Replaced by
- * {@link #SizeLimitExceededException(String, long, long)}
+ * {@code #SizeLimitExceededException(String, long, long)}
* @param message The exceptions detail message.
*/
@Deprecated
Modified:
commons/proper/fileupload/branches/b1_3/src/main/java/org/apache/commons/fileupload/MultipartStream.java
URL:
http://svn.apache.org/viewvc/commons/proper/fileupload/branches/b1_3/src/main/java/org/apache/commons/fileupload/MultipartStream.java?rev=1743630&r1=1743629&r2=1743630&view=diff
==============================================================================
---
commons/proper/fileupload/branches/b1_3/src/main/java/org/apache/commons/fileupload/MultipartStream.java
(original)
+++
commons/proper/fileupload/branches/b1_3/src/main/java/org/apache/commons/fileupload/MultipartStream.java
Fri May 13 09:20:45 2016
@@ -50,7 +50,7 @@ import org.apache.commons.fileupload.uti
* header-part := 1*header CRLF<br>
* header := header-name ":" header-value<br>
* header-name := <printable ascii characters except ":"><br>
- * header-value := <any ascii characters except CR & LF><br>
+ * header-value := <any ascii characters except CR & LF><br>
* body-data := <arbitrary data><br>
* </code>
*
