You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mime4j-dev@james.apache.org by ba...@apache.org on 2011/07/20 12:59:00 UTC
svn commit: r1148696 - in /james/mime4j/trunk: LICENSE LICENSE.txt NOTICE
NOTICE.txt assemble/src/assemble/bin.xml
Author: bago
Date: Wed Jul 20 10:59:00 2011
New Revision: 1148696
URL: http://svn.apache.org/viewvc?rev=1148696&view=rev
Log:
rename LICENSE.txt/NOTICE.txt to LICENSE/NOTICE to follow maven convention and make sure the source package defined in apache parent pom includes our licensing stuff instead of maven defaults.
remove src.xml descriptor from assemble module: we don't need to generate a source package because the "apache-release" profile already creates a correct one for the main pom.
alter bin.xml assembly descriptor to include all of our generated jars (previously it only included core jars).
Added:
james/mime4j/trunk/LICENSE (contents, props changed)
- copied, changed from r1148693, james/mime4j/trunk/LICENSE.txt
james/mime4j/trunk/NOTICE
- copied unchanged from r1148693, james/mime4j/trunk/NOTICE.txt
Removed:
james/mime4j/trunk/LICENSE.txt
james/mime4j/trunk/NOTICE.txt
Modified:
james/mime4j/trunk/assemble/src/assemble/bin.xml
Copied: james/mime4j/trunk/LICENSE (from r1148693, james/mime4j/trunk/LICENSE.txt)
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/LICENSE?p2=james/mime4j/trunk/LICENSE&p1=james/mime4j/trunk/LICENSE.txt&r1=1148693&r2=1148696&rev=1148696&view=diff
==============================================================================
(empty)
Propchange: james/mime4j/trunk/LICENSE
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/mime4j/trunk/LICENSE
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: james/mime4j/trunk/assemble/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/assemble/src/assemble/bin.xml?rev=1148696&r1=1148695&r2=1148696&view=diff
==============================================================================
--- james/mime4j/trunk/assemble/src/assemble/bin.xml (original)
+++ james/mime4j/trunk/assemble/src/assemble/bin.xml Wed Jul 20 10:59:00 2011
@@ -31,12 +31,12 @@
<directory>${project.basedir}/..</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>LICENSE.*</include>
- <include>NOTICE.*</include>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
<include>RELEASE_NOTES.txt</include>
<include>README</include>
</includes>
- </fileSet>
+ </fileSet>
<fileSet>
<directory>${project.basedir}/../core/target</directory>
<outputDirectory>/</outputDirectory>
@@ -44,12 +44,40 @@
<include>apache-mime4j*.jar</include>
</includes>
</fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../dom/target</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>apache-mime4j*.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../storage/target</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>apache-mime4j*.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../benchmark/target</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>apache-mime4j*.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../examples/target</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>apache-mime4j*.jar</include>
+ </includes>
+ </fileSet>
</fileSets>
<dependencySets>
<dependencySet>
<outputDirectory>/lib/</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
- <scope>runtime</scope>
+ <scope>runtime</scope>
<excludes>
<exclude>apache-mime4j*</exclude>
</excludes>