Author: bago
Date: Thu Aug 14 04:21:40 2008
New Revision: 685855
URL: http://svn.apache.org/viewvc?rev=685855&view=rev
Log:
Added bnd to the NOTICE.txt included in the src distribution.
Added javadocs folder to the bin distribution.
Added NOTICE.base and LICENSE.apache to the src distribution (it must include
anything we have in svn, to be reproducible)
Fixed/Updated some maven plugin dependency.
Modified:
james/jsieve/trunk/NOTICE.txt
james/jsieve/trunk/pom.xml
james/jsieve/trunk/src/assemble/bin.xml
james/jsieve/trunk/src/assemble/src.xml
Modified: james/jsieve/trunk/NOTICE.txt
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/NOTICE.txt?rev=685855&r1=685854&r2=685855&view=diff
==============================================================================
--- james/jsieve/trunk/NOTICE.txt (original)
+++ james/jsieve/trunk/NOTICE.txt Thu Aug 14 04:21:40 2008
@@ -7,3 +7,14 @@
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+
+ This product may include software developed at
+ aQute / Peter Kriens (http://www.aqute.biz/)
+ Package in stage\biz.aQute\jars\bnd-0.0.249.jar
+ License in stage\biz.aQute\jars\bnd-0.0.249.LICENSE
+
+ This product may include/use software, JUnit (http://www.junit.org/),
+ developed by Kent Beck, Erich Gamma, and David Saff
+ License: Common Public License Version 1.0
+ (http://www.opensource.org/licenses/cpl.php)
+
\ No newline at end of file
Modified: james/jsieve/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/pom.xml?rev=685855&r1=685854&r2=685855&view=diff
==============================================================================
--- james/jsieve/trunk/pom.xml (original)
+++ james/jsieve/trunk/pom.xml Thu Aug 14 04:21:40 2008
@@ -177,17 +177,15 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-2</version>
- <configuration>
-
<descriptorSourceDirectory>${basedir}/src/assemble/</descriptorSourceDirectory>
- </configuration>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.4</version>
<executions>
<execution>
- <id>make-assembly</id>
+ <id>create-javadocs</id> <!-- this is used for inheritance merges
-->
<phase>package</phase> <!-- append to the packaging phase. -->
<goals>
- <goal>attached</goal>
+ <goal>javadoc</goal> <!-- goals == mojos -->
+ <goal>jar</goal> <!-- goals == mojos -->
</goals>
</execution>
</executions>
@@ -219,13 +217,6 @@
<resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
</resourceBundles>
<properties>
- <!-- <preProjectText>PRE PROCESS TEXT</preProjectText>
-->
- <postProjectText>This product includes/uses software,
JUnit (http://www.junit.org/),
-developed by Kent Beck, Erich Gamma, and David Saff
-License: Common Public License Version 1.0
(http://www.opensource.org/licenses/cpl.php)
-
-This file is automatically generated by dependencies declared in pom.xml
-
</postProjectText>
<addLicense>true</addLicense>
</properties>
</configuration>
@@ -235,7 +226,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.1</version>
+ <version>1.4.3</version>
<executions>
<execution>
<id>bundle-manifest</id>
@@ -256,6 +247,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
+ <version>2.0.4</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -266,15 +258,17 @@
</executions>
</plugin>
<plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-2</version>
+ <configuration>
+
<descriptorSourceDirectory>${basedir}/src/assemble/</descriptorSourceDirectory>
+ </configuration>
<executions>
<execution>
- <id>create-javadocs</id> <!-- this is used for inheritance merges
-->
+ <id>make-assembly</id>
<phase>package</phase> <!-- append to the packaging phase. -->
<goals>
- <goal>javadoc</goal> <!-- goals == mojos -->
- <goal>jar</goal> <!-- goals == mojos -->
+ <goal>attached</goal>
</goals>
</execution>
</executions>
@@ -318,7 +312,7 @@
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-6</version>
+ <version>2.0-beta-7</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -340,7 +334,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>javacc-maven-plugin</artifactId>
- <version>2.4</version>
+ <version>2.4.1</version>
</plugin>
</plugins>
</reporting>
Modified: james/jsieve/trunk/src/assemble/bin.xml
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/assemble/bin.xml?rev=685855&r1=685854&r2=685855&view=diff
==============================================================================
--- james/jsieve/trunk/src/assemble/bin.xml (original)
+++ james/jsieve/trunk/src/assemble/bin.xml Thu Aug 14 04:21:40 2008
@@ -42,7 +42,7 @@
</includes>
</fileSet>
<fileSet>
- <directory>target/site/apidocs</directory>
+ <directory>target/apidocs</directory>
<outputDirectory>javadocs</outputDirectory>
</fileSet>
</fileSets>
Modified: james/jsieve/trunk/src/assemble/src.xml
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/assemble/src.xml?rev=685855&r1=685854&r2=685855&view=diff
==============================================================================
--- james/jsieve/trunk/src/assemble/src.xml (original)
+++ james/jsieve/trunk/src/assemble/src.xml Thu Aug 14 04:21:40 2008
@@ -36,8 +36,6 @@
<exclude>.*/**</exclude>
<exclude>**.bak</exclude>
<exclude>*.jar</exclude>
- <exclude>NOTICE.base</exclude>
- <exclude>LICENSE.apache</exclude>
</excludes>
<useDefaultExcludes>true</useDefaultExcludes>
</fileSet>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
