Author: bago
Date: Fri May 11 01:52:49 2007
New Revision: 537132
URL: http://svn.apache.org/viewvc?view=rev&rev=537132
Log:
Added a MANIFEST.MF for maven generated artifacts.
Added "manifestVersion" to ant build script so that the Manifest can contain
numeric only numbers.
Updated pom.xml artifactId/groupId to match the name used in server/stage.
Renamed "-dev" to "-SNAPSHOT" to have same result from ant and m2.
Added:
james/mailet/trunk/src/main/resources/META-INF/
james/mailet/trunk/src/main/resources/META-INF/MANIFEST.MF
james/mailet/trunk/stage/org.apache/
james/mailet/trunk/stage/org.apache/jars/
james/mailet/trunk/stage/org.apache/jars/apache-jar-resource-bundle-1.2.jar
(with props)
Modified:
james/mailet/trunk/build.xml
james/mailet/trunk/default.properties
james/mailet/trunk/pom.xml
Modified: james/mailet/trunk/build.xml
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/build.xml?view=diff&rev=537132&r1=537131&r2=537132
==============================================================================
--- james/mailet/trunk/build.xml (original)
+++ james/mailet/trunk/build.xml Fri May 11 01:52:49 2007
@@ -252,7 +252,7 @@
<mkdir dir="${build.lib}"/>
- <!-- Make jSieve jar-->
+ <!-- Make Mailet jar-->
<echo message="Making Mailet Jar (${name}-${version}.jar)"/>
<jar
jarfile="${build.lib}/${name}-${version}.jar"
@@ -265,14 +265,14 @@
<attribute name="Extension-Name" value='${extension.name}'/>
<attribute name="Specification-Title" value='${title.spec}'/>
<attribute name="Specification-Vendor" value='${vendor}'/>
- <attribute name="Specification-Version" value='${version}'/>
+ <attribute name="Specification-Version"
value='${manifestVersion}'/>
<attribute name="Implementation-Vendor-Id" value='${vendor.id}'/>
<attribute name="Implementation-Title" value='${title.impl}'/>
<attribute name="Implementation-Vendor" value='${vendor}'/>
- <attribute name="Implementation-Version" value='${version}'/>
+ <attribute name="Implementation-Version"
value='${manifestVersion}'/>
<attribute name="X-Compile-Source-JDK" value='${jdk.source}'/>
<attribute name="X-Compile-Target-JDK" value='${jdk.target}'/>
- </manifest>
+ </manifest>
</jar>
<!--
Modified: james/mailet/trunk/default.properties
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/default.properties?view=diff&rev=537132&r1=537131&r2=537132
==============================================================================
--- james/mailet/trunk/default.properties (original)
+++ james/mailet/trunk/default.properties Fri May 11 01:52:49 2007
@@ -8,7 +8,8 @@
name=mailet
Name=Mailet API
-version=3.0-dev
+version=3.0-SNAPSHOT
+manifestVersion=3.0
year=2007
extension.name=org.apache.mailet
vendor=The Apache Software Foundation
Modified: james/mailet/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/pom.xml?view=diff&rev=537132&r1=537131&r2=537132
==============================================================================
--- james/mailet/trunk/pom.xml (original)
+++ james/mailet/trunk/pom.xml Fri May 11 01:52:49 2007
@@ -28,7 +28,7 @@
| DISCLAIMER DISCLAIMER DISCLAIMER DISCLAIMER DISCLAIMER
-->
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.mailet</groupId>
+ <groupId>org.apache.james</groupId>
<artifactId>mailet</artifactId>
<name>Apache Mailet API</name>
<version>3.0-SNAPSHOT</version>
@@ -40,7 +40,7 @@
<groupId>org.apache.james</groupId>
<artifactId>james-project</artifactId>
<version>1.1-SNAPSHOT</version>
- <relativePath>../james-project/pom.xml</relativePath>
+ <relativePath>../james-project/project/pom.xml</relativePath>
</parent>
<url>http://james.apache.org/mailet</url>
<inceptionYear>2007</inceptionYear>
@@ -69,6 +69,11 @@
</url>
</scm>
+ <!-- This is here because of http://jira.codehaus.org/browse/MRRESOURCES-6
-->
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+
<dependencies>
<dependency>
<groupId>javax.mail</groupId>
@@ -93,20 +98,6 @@
</snapshots>
</repository>
</repositories>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptorRefs>
- <descriptorRef>bin</descriptorRef>
- <descriptorRef>src</descriptorRef>
- </descriptorRefs>
- </configuration>
- </plugin>
- </plugins>
- </build>
<mailingLists>
<mailingList>
@@ -118,6 +109,50 @@
</mailingList>
</mailingLists>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <optimize>true</optimize>
+ <source>1.4</source>
+ <target>1.4</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+
<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ <!-- Add NOTICE and LICENSE to generated JAR -->
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.0-alpha-5</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+
<resourceBundle>org.apache:apache-jar-resource-bundle:1.2</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>
+ </plugins>
+ </build>
+
<reporting>
<plugins>
<plugin>
Added: james/mailet/trunk/src/main/resources/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/src/main/resources/META-INF/MANIFEST.MF?view=auto&rev=537132
==============================================================================
--- james/mailet/trunk/src/main/resources/META-INF/MANIFEST.MF (added)
+++ james/mailet/trunk/src/main/resources/META-INF/MANIFEST.MF Fri May 11
01:52:49 2007
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Ant-Version: Apache Ant 1.7.0
+Created-By: 1.5.0_08-b03 (Sun Microsystems Inc.)
+Extension-Name: org.apache.mailet
+Specification-Title: Apache Mailet API
+Specification-Vendor: The Apache Software Foundation
+Specification-Version: 3.0
+Implementation-Vendor-Id: org.apache
+Implementation-Title: Apache Mailet
+Implementation-Vendor: The Apache Software Foundation
+Implementation-Version: 3.0
+X-Compile-Source-JDK: 1.4
+X-Compile-Target-JDK: 1.4
\ No newline at end of file
Added:
james/mailet/trunk/stage/org.apache/jars/apache-jar-resource-bundle-1.2.jar
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/stage/org.apache/jars/apache-jar-resource-bundle-1.2.jar?view=auto&rev=537132
==============================================================================
Binary file - no diff available.
Propchange:
james/mailet/trunk/stage/org.apache/jars/apache-jar-resource-bundle-1.2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
