You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2023/07/15 19:35:50 UTC
[commons-fileupload] branch release created (now 6b1324b9)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch release
in repository https://gitbox.apache.org/repos/asf/commons-fileupload.git
at 6b1324b9 Prepare for release candidate
This branch includes the following new commits:
new 6b1324b9 Prepare for release candidate
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[commons-fileupload] 01/01: Prepare for release candidate
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release
in repository https://gitbox.apache.org/repos/asf/commons-fileupload.git
commit 6b1324b9ea65a18be52e926122ec30f4d6d3dd38
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jul 15 15:35:43 2023 -0400
Prepare for release candidate
---
.gitignore | 1 +
commons-fileupload2-core/pom.xml | 35 ++-
commons-fileupload2-distribution/pom.xml | 244 +++++++++++++++++++++
.../src/assembly/bin.xml | 50 +++++
.../src/assembly/src.xml | 42 ++++
commons-fileupload2-jakarta/pom.xml | 39 +++-
commons-fileupload2-javax/pom.xml | 39 +++-
commons-fileupload2-portlet/pom.xml | 43 +++-
pom.xml | 111 ++--------
9 files changed, 500 insertions(+), 104 deletions(-)
diff --git a/.gitignore b/.gitignore
index 46bd3f34..aa7178e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
**/.project
**/site-content/
/commons-fileupload2.iml
+/.DS_Store
diff --git a/commons-fileupload2-core/pom.xml b/commons-fileupload2-core/pom.xml
index 9d6a1b49..f36b2dba 100644
--- a/commons-fileupload2-core/pom.xml
+++ b/commons-fileupload2-core/pom.xml
@@ -21,7 +21,8 @@
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-fileupload2</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M1</version>
+ <relativePath>../</relativePath>
</parent>
<artifactId>commons-fileupload2-core</artifactId>
@@ -54,4 +55,36 @@
</dependency>
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/main/resources</directory>
+ </resource>
+ <!-- include NOTICE/LICENSE in generated jar -->
+ <resource>
+ <directory>${commons.parent.dir}</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ <include>LICENSE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ <!-- include NOTICE/LICENSE in generated test jar -->
+ <testResource>
+ <directory>${commons.parent.dir}</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ <include>LICENSE.txt</include>
+ </includes>
+ </testResource>
+ </testResources>
+ </build>
+
</project>
diff --git a/commons-fileupload2-distribution/pom.xml b/commons-fileupload2-distribution/pom.xml
new file mode 100644
index 00000000..d25b5ecb
--- /dev/null
+++ b/commons-fileupload2-distribution/pom.xml
@@ -0,0 +1,244 @@
+<?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>
+
+ <name>Apache Commons FileUpload Distribution</name>
+ <artifactId>commons-fileupload2-distribution</artifactId>
+ <packaging>pom</packaging>
+ <description>Apache Commons FIleUpload Distribution archives.</description>
+
+ <parent>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-fileupload2</artifactId>
+ <version>2.0.0-M1</version>
+ <relativePath>../</relativePath>
+ </parent>
+
+ <properties>
+ <!-- dist module contains no code and no checkstyle config -->
+ <checkstyle.skip>true</checkstyle.skip>
+ <commons.parent.dir>${basedir}/..</commons.parent.dir>
+ <commons.release.isDistModule>true</commons.release.isDistModule>
+ </properties>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/main/resources</directory>
+ </resource>
+ <!-- include NOTICE/LICENSE in generated jar -->
+ <resource>
+ <directory>${commons.parent.dir}</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ <include>LICENSE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ <!-- include NOTICE/LICENSE in generated test jar -->
+ <testResource>
+ <directory>${commons.parent.dir}</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ <include>LICENSE.txt</include>
+ </includes>
+ </testResource>
+ </testResources>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>release</id>
+ <dependencies>
+ <!-- commons-fileupload2-core -->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-fileupload2-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-fileupload2-core</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-fileupload2-core</artifactId>
+ <version>${project.version}</version>
+ <classifier>javadoc</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-fileupload2-core</artifactId>
+ <version>${project.version}</version>
+ <classifier>tests</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-fileupload2-core</artifactId>
+ <version>${project.version}</version>
+ <classifier>test-sources</classifier>
+ </dependency>
+ <!-- commons-fileupload2-jakarta -->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-fileupload2-jakarta</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-fileupload2-jakarta</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-fileupload2-jakarta</artifactId>
+ <version>${project.version}</version>
+ <classifier>javadoc</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-fileupload2-jakarta</artifactId>
+ <version>${project.version}</version>
+ <classifier>tests</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-fileupload2-jakarta</artifactId>
+ <version>${project.version}</version>
+ <classifier>test-sources</classifier>
+ </dependency>
+ <!-- commons-fileupload2-javax -->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-fileupload2-javax</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-fileupload2-javax</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-fileupload2-javax</artifactId>
+ <version>${project.version}</version>
+ <classifier>javadoc</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-fileupload2-javax</artifactId>
+ <version>${project.version}</version>
+ <classifier>tests</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-fileupload2-javax</artifactId>
+ <version>${project.version}</version>
+ <classifier>test-sources</classifier>
+ </dependency>
+ <!-- commons-fileupload2-portlet -->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-fileupload2-portlet</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-fileupload2-portlet</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-fileupload2-portlet</artifactId>
+ <version>${project.version}</version>
+ <classifier>javadoc</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-fileupload2-portlet</artifactId>
+ <version>${project.version}</version>
+ <classifier>tests</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-fileupload2-portlet</artifactId>
+ <version>${project.version}</version>
+ <classifier>test-sources</classifier>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <!-- As the main Apache POM only builds source zip archives but
+ commons wants both zip and tar.gz and because this is configured
+ in the assembly, we need to use a specific assembly. That also allows
+ naming the final artifact as -src not -source-release.
+ -->
+ <execution>
+ <id>fileupload2-source-release-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>commons-fileupload2-${project.version}</finalName>
+ <descriptors>
+ <descriptor>src/assembly/src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </execution>
+ <execution>
+ <id>binary</id>
+ <configuration>
+ <finalName>commons-fileupload2-${project.version}</finalName>
+ <descriptors>
+ <descriptor>src/assembly/bin.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
diff --git a/commons-fileupload2-distribution/src/assembly/bin.xml b/commons-fileupload2-distribution/src/assembly/bin.xml
new file mode 100644
index 00000000..12e271a1
--- /dev/null
+++ b/commons-fileupload2-distribution/src/assembly/bin.xml
@@ -0,0 +1,50 @@
+<!--
+ 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.
+-->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
+ <id>bin</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <includeSiteDirectory>false</includeSiteDirectory>
+
+ <dependencySets>
+ <dependencySet>
+ <includes>
+ <include>org.apache.commons:commons-fileupload2-core</include>
+ <include>org.apache.commons:commons-fileupload2-jakarta</include>
+ <include>org.apache.commons:commons-fileupload2-javax</include>
+ <include>org.apache.commons:commons-fileupload2-portlet</include>
+ </includes>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ </dependencySets>
+
+ <fileSets>
+ <fileSet>
+ <directory>..</directory>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ <include>RELEASE-NOTES.txt</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+</assembly>
diff --git a/commons-fileupload2-distribution/src/assembly/src.xml b/commons-fileupload2-distribution/src/assembly/src.xml
new file mode 100644
index 00000000..c20f21a2
--- /dev/null
+++ b/commons-fileupload2-distribution/src/assembly/src.xml
@@ -0,0 +1,42 @@
+<?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.
+-->
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 https://maven.apache.org/xsd/assembly-2.2.0.xsd">
+ <id>src</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>${basedir}/..</directory>
+ <excludes>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.settings/</exclude>
+ <exclude>**/.checkstyle/</exclude>
+ <exclude>**/doap_*.rdf</exclude>
+ <exclude>**/bin/</exclude>
+ <exclude>**/.externalToolBuilders/</exclude>
+ <exclude>**/${project.build.directory}/</exclude>
+ <exclude>**/download*.cgi</exclude>
+ <exclude>**/site-content/</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+</assembly>
diff --git a/commons-fileupload2-jakarta/pom.xml b/commons-fileupload2-jakarta/pom.xml
index 28014786..643fabb0 100644
--- a/commons-fileupload2-jakarta/pom.xml
+++ b/commons-fileupload2-jakarta/pom.xml
@@ -21,7 +21,8 @@
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-fileupload2</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M1</version>
+ <relativePath>../</relativePath>
</parent>
<artifactId>commons-fileupload2-jakarta</artifactId>
@@ -41,12 +42,12 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-fileupload2-core</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-fileupload2-core</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M1</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
@@ -72,5 +73,37 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/main/resources</directory>
+ </resource>
+ <!-- include NOTICE/LICENSE in generated jar -->
+ <resource>
+ <directory>${commons.parent.dir}</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ <include>LICENSE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ <!-- include NOTICE/LICENSE in generated test jar -->
+ <testResource>
+ <directory>${commons.parent.dir}</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ <include>LICENSE.txt</include>
+ </includes>
+ </testResource>
+ </testResources>
+ </build>
</project>
diff --git a/commons-fileupload2-javax/pom.xml b/commons-fileupload2-javax/pom.xml
index c0a22c3e..afc29926 100644
--- a/commons-fileupload2-javax/pom.xml
+++ b/commons-fileupload2-javax/pom.xml
@@ -21,7 +21,8 @@
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-fileupload2</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M1</version>
+ <relativePath>../</relativePath>
</parent>
<artifactId>commons-fileupload2-javax</artifactId>
@@ -41,12 +42,12 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-fileupload2-core</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-fileupload2-core</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M1</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
@@ -67,4 +68,36 @@
</dependency>
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/main/resources</directory>
+ </resource>
+ <!-- include NOTICE/LICENSE in generated jar -->
+ <resource>
+ <directory>${commons.parent.dir}</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ <include>LICENSE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ <!-- include NOTICE/LICENSE in generated test jar -->
+ <testResource>
+ <directory>${commons.parent.dir}</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ <include>LICENSE.txt</include>
+ </includes>
+ </testResource>
+ </testResources>
+ </build>
+
</project>
diff --git a/commons-fileupload2-portlet/pom.xml b/commons-fileupload2-portlet/pom.xml
index c800abeb..82eaffb9 100644
--- a/commons-fileupload2-portlet/pom.xml
+++ b/commons-fileupload2-portlet/pom.xml
@@ -21,7 +21,8 @@
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-fileupload2</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M1</version>
+ <relativePath>../</relativePath>
</parent>
<artifactId>commons-fileupload2-portlet</artifactId>
@@ -41,24 +42,24 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-fileupload2-core</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-fileupload2-core</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M1</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-fileupload2-javax</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-fileupload2-javax</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M1</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
@@ -81,4 +82,36 @@
</dependency>
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/main/resources</directory>
+ </resource>
+ <!-- include NOTICE/LICENSE in generated jar -->
+ <resource>
+ <directory>${commons.parent.dir}</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ <include>LICENSE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ <!-- include NOTICE/LICENSE in generated test jar -->
+ <testResource>
+ <directory>${commons.parent.dir}</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ <include>LICENSE.txt</include>
+ </includes>
+ </testResource>
+ </testResources>
+ </build>
+
</project>
diff --git a/pom.xml b/pom.xml
index 0ed44ee9..038746ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,10 +25,10 @@
</parent>
<artifactId>commons-fileupload2</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M1</version>
<packaging>pom</packaging>
- <name>Apache Commons FileUpload Parent</name>
+ <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.
@@ -208,6 +208,7 @@
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/commons-fileupload.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=commons-fileupload.git</url>
</scm>
+
<issueManagement>
<system>jira</system>
<url>https://issues.apache.org/jira/browse/FILEUPLOAD</url>
@@ -226,18 +227,22 @@
<maven.compiler.target>1.8</maven.compiler.target>
<commons.parent.dir>${basedir}</commons.parent.dir>
<commons.componentid>fileupload</commons.componentid>
- <commons.module.name>org.apache.commons.fileupload</commons.module.name>
+ <commons.module.name>org.apache.commons.fileupload2</commons.module.name>
<commons.release.version>2.0.0-M1</commons.release.version>
<commons.release.desc>in the org.apache.commons.fileupload2 namespace for Java 8 or later</commons.release.desc>
<commons.release.2.version>1.5</commons.release.2.version>
- <commons.release.2.desc>in the org.apache.commons.fileupload namespace for Java 6</commons.release.2.desc>
+ <commons.release.2.desc>in the org.apache.commons.fileupload namespace for Java 6 or later</commons.release.2.desc>
<commons.jira.id>FILEUPLOAD</commons.jira.id>
<commons.jira.pid>12310476</commons.jira.pid>
<commons.site.path>fileupload</commons.site.path>
<commons.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-fileupload</commons.scmPubUrl>
<commons.scmPubCheckoutDirectory>site-content</commons.scmPubCheckoutDirectory>
+
+ <commons.siteOutputDirectory>${basedir}/target/site</commons.siteOutputDirectory>
+ <commons.releaseNotesLocation>${commons.parent.dir}/RELEASE-NOTES.txt</commons.releaseNotesLocation>
+
<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>
@@ -254,7 +259,8 @@
<commons.distSvnStagingUrl>scm:svn:https://dist.apache.org/repos/dist/dev/commons/${commons.componentid}</commons.distSvnStagingUrl>
<commons.release.isDistModule>true</commons.release.isDistModule>
<commons.releaseManagerName>Gary Gregory</commons.releaseManagerName>
- <commons.releaseManagerKey>86fdc7e2a11262cb</commons.releaseManagerKey> </properties>
+ <commons.releaseManagerKey>86fdc7e2a11262cb</commons.releaseManagerKey>
+ </properties>
<dependencyManagement>
<dependencies>
@@ -278,25 +284,6 @@
</dependencyManagement>
<build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>${commons.parent.dir}/src/main/assembly/bin.xml</descriptor>
- <descriptor>${commons.parent.dir}/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>clean site deploy</goals>
- </configuration>
- </plugin>
- </plugins>
<pluginManagement>
<plugins>
<plugin>
@@ -309,7 +296,8 @@
<exclude>src/checkstyle/license-header.txt</exclude>
</excludes>
</configuration>
- </plugin><!-- override skip property of parent pom -->
+ </plugin>
+ <!-- override skip property of parent pom for new major release -->
<plugin>
<groupId>com.github.siom79.japicmp</groupId>
<artifactId>japicmp-maven-plugin</artifactId>
@@ -317,44 +305,6 @@
<skip>true</skip>
</configuration>
</plugin>
- <!--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.8,)</versionRange>
- <goals>
- <goal>run</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <execute/>
- </action>
- </pluginExecution>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <versionRange>[1.10,)</versionRange>
- <goals>
- <goal>parse-version</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <execute/>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
@@ -464,41 +414,16 @@
<profiles>
<profile>
- <id>setup-checkout</id>
- <activation>
- <file>
- <missing>site-content</missing>
- </file>
- </activation>
+ <id>release</id>
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-assembly-plugin</artifactId>
<executions>
+ <!-- Don't build the archives here. They are constructed in the dist project -->
<execution>
- <id>prepare-checkout</id>
- <phase>pre-site</phase>
- <goals>
- <goal>run</goal>
- </goals>
<configuration>
- <target>
- <exec executable="svn">
- <arg line="checkout --depth immediates ${commons.scmPubUrl} ${commons.scmPubCheckoutDirectory}"/>
- </exec>
-
- <exec executable="svn">
- <arg line="update --set-depth exclude ${commons.scmPubCheckoutDirectory}/javadocs"/>
- </exec>
-
- <pathconvert pathsep=" " property="dirs">
- <dirset dir="${commons.scmPubCheckoutDirectory}" includes="*"/>
- </pathconvert>
- <exec executable="svn">
- <arg line="update --set-depth infinity ${dirs}"/>
- </exec>
- </target>
+ <skipAssembly>true</skipAssembly>
</configuration>
</execution>
</executions>
@@ -544,6 +469,7 @@
</jdepsExtraArgs>
<outputDirectory>${project.build.directory}</outputDirectory>
<overwriteExistingFiles>true</overwriteExistingFiles>
+ <failOnWarning>false</failOnWarning>
<module>
<moduleInfo>
<name>${commons.module.name}</name>
@@ -562,5 +488,6 @@
<module>commons-fileupload2-jakarta</module>
<module>commons-fileupload2-javax</module>
<module>commons-fileupload2-portlet</module>
+ <module>commons-fileupload2-distribution</module>
</modules>
</project>