Author: norman
Date: Mon May 3 23:53:47 2010
New Revision: 940678
URL: http://svn.apache.org/viewvc?rev=940678&view=rev
Log:
more build adjustments
Modified:
james/mailet/standard/trunk/LICENSE.txt
james/mailet/standard/trunk/NOTICE.txt
james/mailet/standard/trunk/pom.xml
james/mailet/standard/trunk/src/assemble/bin.xml
Modified: james/mailet/standard/trunk/LICENSE.txt
URL:
http://svn.apache.org/viewvc/james/mailet/standard/trunk/LICENSE.txt?rev=940678&r1=940677&r2=940678&view=diff
==============================================================================
--- james/mailet/standard/trunk/LICENSE.txt (original)
+++ james/mailet/standard/trunk/LICENSE.txt Mon May 3 23:53:47 2010
@@ -189,7 +189,4 @@
JUnit, Common Public License - v 1.0
http://www.junit.org/
-
- Bnd, Bundle Tool, The Apache License, Version 2.0
- http://www.aqute.biz/Code/Bnd
\ No newline at end of file
Modified: james/mailet/standard/trunk/NOTICE.txt
URL:
http://svn.apache.org/viewvc/james/mailet/standard/trunk/NOTICE.txt?rev=940678&r1=940677&r2=940678&view=diff
==============================================================================
--- james/mailet/standard/trunk/NOTICE.txt (original)
+++ james/mailet/standard/trunk/NOTICE.txt Mon May 3 23:53:47 2010
@@ -11,11 +11,6 @@
This product also includes software developed by :
- Sun Microsystems (http://java.sun.com/)
-
- This product may include software developed at
- aQute / Peter Kriens (http://www.aqute.biz/)
- Package bnd-0.0.249.jar
- License bnd-0.0.249.LICENSE
- Please read the LICENSE.txt and README.txt files in the root directory of
+ Please read the LICENSE.txt and NOTICE.txt files in the root directory of
this distribution.
\ No newline at end of file
Modified: james/mailet/standard/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/mailet/standard/trunk/pom.xml?rev=940678&r1=940677&r2=940678&view=diff
==============================================================================
--- james/mailet/standard/trunk/pom.xml (original)
+++ james/mailet/standard/trunk/pom.xml Mon May 3 23:53:47 2010
@@ -192,55 +192,6 @@
</execution>
</executions>
</plugin>
- <!-- Add NOTICE and LICENSE to generated JAR -->
- <plugin>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
- <configuration>
- <resourceBundles>
-
<resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
- </resourceBundles>
- <properties>
- <!-- <preProjectText>PRE PROCESS TEXT</preProjectText>
-->
- <postProjectText>This file is automatically generated by
dependencies declared in pom.xml</postProjectText>
- <addLicense>true</addLicense>
- </properties>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.5</version>
- <executions>
- <execution>
- <id>create-javadocs</id>
- <phase>package</phase>
- <goals>
- <goal>javadoc</goal>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-doap-plugin</artifactId>
Modified: james/mailet/standard/trunk/src/assemble/bin.xml
URL:
http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/assemble/bin.xml?rev=940678&r1=940677&r2=940678&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/assemble/bin.xml (original)
+++ james/mailet/standard/trunk/src/assemble/bin.xml Mon May 3 23:53:47 2010
@@ -47,6 +47,9 @@
<outputDirectory>/</outputDirectory>
<includes>
<include>RELEASE_NOTES.txt</include>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+
</includes>
</fileSet>
<fileSet>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
