Author: niallp
Date: Thu Nov 15 19:26:26 2007
New Revision: 595533
URL: http://svn.apache.org/viewvc?rev=595533&view=rev
Log:
Update m2 build
Added:
commons/proper/fileupload/trunk/src/site/resources/
commons/proper/fileupload/trunk/src/site/resources/images/
- copied from r595528, commons/proper/fileupload/trunk/xdocs/images/
Modified:
commons/proper/fileupload/trunk/pom.xml
commons/proper/fileupload/trunk/src/main/assembly/src.xml
commons/proper/fileupload/trunk/src/site/site.xml
Modified: commons/proper/fileupload/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/pom.xml?rev=595533&r1=595532&r2=595533&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/pom.xml (original)
+++ commons/proper/fileupload/trunk/pom.xml Thu Nov 15 19:26:26 2007
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-parent</artifactId>
- <version>4</version>
+ <version>5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.commons.fileupload</groupId>
@@ -131,24 +131,17 @@
<build>
<sourceDirectory>src/java</sourceDirectory>
<testSourceDirectory>src/test</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>.</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ <include>LICENSE.txt</include>
+ </includes>
+ </resource>
+ </resources>
<plugins>
- <!--
- TODO: remove the following when commons-parent is released
- or switch to commons-parent 2-SNAPSHOT version
- -->
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>src/conf/MANIFEST.MF</manifestFile>
- <manifestEntries>
- <Specification-Version>${project.version}</Specification-Version>
-
<X-Compile-Source-JDK>${maven.compile.source}</X-Compile-Source-JDK>
-
<X-Compile-Target-JDK>${maven.compile.target}</X-Compile-Target-JDK>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
@@ -193,10 +186,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
<configuration>
<issueLinkTemplate>%URL%/../%ISSUE%</issueLinkTemplate>
@@ -216,27 +205,6 @@
<configuration>
<configLocation>src/checkstyle/fileupload_checks.xml</configLocation>
</configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <moduleExcludes>
- <xdoc>**/navigation.xml</xdoc>
- </moduleExcludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jdepend-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: commons/proper/fileupload/trunk/src/main/assembly/src.xml
URL:
http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/main/assembly/src.xml?rev=595533&r1=595532&r2=595533&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/main/assembly/src.xml (original)
+++ commons/proper/fileupload/trunk/src/main/assembly/src.xml Thu Nov 15
19:26:26 2007
@@ -20,6 +20,7 @@
<format>tar.gz</format>
<format>zip</format>
</formats>
+ <baseDirectory>${artifactId}-${version}-src</baseDirectory>
<fileSets>
<fileSet>
<includes>
Modified: commons/proper/fileupload/trunk/src/site/site.xml
URL:
http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/site/site.xml?rev=595533&r1=595532&r2=595533&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/site/site.xml (original)
+++ commons/proper/fileupload/trunk/src/site/site.xml Thu Nov 15 19:26:26 2007
@@ -16,30 +16,14 @@
limitations under the License.
-->
<project name="FileUpload">
- <bannerLeft>
- <name>Apache Commons</name>
- <src>http://commons.apache.org/images/logo.png</src>
- <href>http://commons.apache.org/</href>
- </bannerLeft>
<bannerRight>
<name>Commons FileUpload</name>
- <src>http://commons.apache.org/fileupload/images/logo.png</src>
- <href>http://commons.apache.org/fileupload</href>
+ <src>/images/logo.png</src>
+ <href>/index.html</href>
</bannerRight>
- <skin>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-skin</artifactId>
- <version>1.0</version>
- </skin>
-
<body>
- <links>
- <item name="Apache" href="http://www.apache.org/"/>
- <item name="Commons" href="http://commons.apache.org/"/>
- <item name="FileUpload" href="http://commons.apache.org/fileupload"/>
- </links>
<menu name="Commons FileUpload">
<item name="Overview" href="/index.html"/>
@@ -53,6 +37,5 @@
<item name="SVN repository" href="/source-repository.html"/>
</menu>
- <menu ref="reports" />
</body>
</project>
