Author: ieugen
Date: Sat Dec 8 17:28:42 2012
New Revision: 1418715
URL: http://svn.apache.org/viewvc?rev=1418715&view=rev
Log:
MAILET-42 Pom refactoring
* pom simplification
* moved to bundle packaging - OSGi-fication
* plugin management for assembly and mailetdoc plugin
* leveraging maven dependency management - apache-mailets is the parent artifact
* general cleaning
Modified:
james/mailet/trunk/ai/classic/pom.xml
james/mailet/trunk/ai/pom.xml
james/mailet/trunk/api/pom.xml
james/mailet/trunk/base/pom.xml
james/mailet/trunk/crypto/pom.xml
james/mailet/trunk/maven-mailetdocs-plugin/pom.xml
james/mailet/trunk/parent/pom.xml
james/mailet/trunk/pom.xml
james/mailet/trunk/standard/pom.xml
Modified: james/mailet/trunk/ai/classic/pom.xml
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/ai/classic/pom.xml?rev=1418715&r1=1418714&r2=1418715&view=diff
==============================================================================
--- james/mailet/trunk/ai/classic/pom.xml (original)
+++ james/mailet/trunk/ai/classic/pom.xml Sat Dec 8 17:28:42 2012
@@ -18,9 +18,9 @@
under the License.
-->
<project
- xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -32,46 +32,24 @@
<artifactId>apache-mailets-ai-classic</artifactId>
<version>0.0.1-SNAPSHOT</version>
+ <packaging>bundle</packaging>
<name>Apache James :: Classic AI Mailets</name>
<description>Classic machine learning approach to SPAM
processing.</description>
- <properties>
- <javax.mail.groupId>org.apache.geronimo.javamail</javax.mail.groupId>
-
<javax.mail.artifactId>geronimo-javamail_1.4_mail</javax.mail.artifactId>
- <target.jdk>1.6</target.jdk>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>apache-mailet</artifactId>
- <scope>compile</scope>
+ <artifactId>apache-mailets-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>apache-mailet-base</artifactId>
- <scope>compile</scope>
+ <artifactId>apache-mailets-base</artifactId>
</dependency>
<dependency>
- <groupId>${javax.mail.groupId}</groupId>
- <artifactId>${javax.mail.artifactId}</artifactId>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
Modified: james/mailet/trunk/ai/pom.xml
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/ai/pom.xml?rev=1418715&r1=1418714&r2=1418715&view=diff
==============================================================================
--- james/mailet/trunk/ai/pom.xml (original)
+++ james/mailet/trunk/ai/pom.xml Sat Dec 8 17:28:42 2012
@@ -38,56 +38,4 @@
<url>http://james.apache.org/mailet/ai</url>
<inceptionYear>2011</inceptionYear>
- <modules>
- <module>classic</module>
- </modules>
-
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/james/mailet/ai/trunk/</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/james/mailet/ai/trunk/</developerConnection>
- <url>http://svn.apache.org/viewvc/james/mailet/ai/trunk/</url>
- </scm>
-
- <distributionManagement>
- <site>
- <id>ai-website</id>
-
<url>scpexe://people.apache.org/www/james.apache.org/mailet/ai</url>
- </site>
- </distributionManagement>
-
- <properties>
- <issue.project.name>JAMESMAILAI</issue.project.name>
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-mailet</artifactId>
- <version>2.4</version>
- <exclusions>
- <exclusion>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-mailet-base</artifactId>
- <version>1.1</version>
- <exclusions>
- <exclusion>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.javamail</groupId>
- <artifactId>geronimo-javamail_1.4_mail</artifactId>
- <version>1.6</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
</project>
Modified: james/mailet/trunk/api/pom.xml
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/api/pom.xml?rev=1418715&r1=1418714&r2=1418715&view=diff
==============================================================================
--- james/mailet/trunk/api/pom.xml (original)
+++ james/mailet/trunk/api/pom.xml Sat Dec 8 17:28:42 2012
@@ -31,51 +31,21 @@
<artifactId>apache-mailets-api</artifactId>
<version>2.5.0-SNAPSHOT</version>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Apache James :: Mailet API</name>
<description>The Apache Mailet API is a flexible specification for mail
processing agents.</description>
<url>http://james.apache.org/mailet/api/</url>
<inceptionYear>2007</inceptionYear>
- <mailingLists>
- <mailingList>
- <name>Apache Mailet API List</name>
- <subscribe>[email protected]</subscribe>
- <unsubscribe>[email protected]</unsubscribe>
- <post>[email protected]</post>
-
<archive>http://mail-archives.apache.org/mod_mbox/james-mailet-api/</archive>
- </mailingList>
- </mailingLists>
-
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/james/mailet/api/trunk</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/james/mailet/api/trunk</developerConnection>
-
<url>http://svn.apache.org/viewcvs.cgi/james/mailet/api/trunk/?root=Apache-SVN</url>
- </scm>
- <issueManagement>
- <system>JIRA</system>
- <url>http://issues.apache.org/jira/browse/MAILET</url>
- </issueManagement>
-
- <distributionManagement>
- <site>
- <id>mailet-website</id>
-
<url>scpexe://people.apache.org/www/james.apache.org/mailet/api/</url>
- </site>
- </distributionManagement>
-
<dependencies>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
- <version>1.4.4</version>
</dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.9</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -83,47 +53,10 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestEntries>
- <Specification-Title>Apache Mailet
API</Specification-Title>
-
<Specification-Version>${project.version}</Specification-Version>
- <Specification-Vendor>The Apache Software
Foundation</Specification-Vendor>
- <Implementation-Title>Apache Mailet
API</Implementation-Title>
-
<Implementation-Version>${project.version}</Implementation-Version>
- <Implementation-Vendor>The Apache Software
Foundation</Implementation-Vendor>
-
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
- <url>${project.url}</url>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- <!-- Add NOTICE and LICENSE to generated JAR -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <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>
+ <groupId>org.apache.james</groupId>
+ <artifactId>maven-mailetdocs-plugin</artifactId>
</plugin>
</plugins>
</build>
+
</project>
Modified: james/mailet/trunk/base/pom.xml
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/base/pom.xml?rev=1418715&r1=1418714&r2=1418715&view=diff
==============================================================================
--- james/mailet/trunk/base/pom.xml (original)
+++ james/mailet/trunk/base/pom.xml Sat Dec 8 17:28:42 2012
@@ -31,7 +31,7 @@
<artifactId>apache-mailets-base</artifactId>
<version>1.2.0-SNAPSHOT</version>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Apache James :: Basic Mailet Toolkit</name>
<description>
@@ -42,43 +42,22 @@
<url>http://james.apache.org/mailet/base/</url>
<inceptionYear>2008</inceptionYear>
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/james/mailet/base/trunk</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/james/mailet/base/trunk</developerConnection>
-
<url>http://svn.apache.org/viewcvs.cgi/james/mailet/base/trunk/?root=Apache-SVN</url>
- </scm>
- <issueManagement>
- <system>JIRA</system>
- <url>http://issues.apache.org/jira/browse/MAILETBASE</url>
- </issueManagement>
-
- <distributionManagement>
- <site>
- <id>mailet-base-website</id>
-
<url>scpexe://people.apache.org/www/james.apache.org/mailet/base/</url>
- </site>
- </distributionManagement>
-
<dependencies>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
- <version>1.4.4</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
- <version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>apache-mailet</artifactId>
- <version>2.5-SNAPSHOT</version>
+ <artifactId>apache-mailets-api</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.9</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -86,51 +65,19 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
-
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- <manifestEntries>
- <Specification-Title>Apache James Mailets
Base</Specification-Title>
-
<Specification-Version>${project.version}</Specification-Version>
- <Specification-Vendor>The Apache Software
Foundation</Specification-Vendor>
- <Implementation-Title>Apache James Mailets
Base</Implementation-Title>
-
<Implementation-Version>${project.version}</Implementation-Version>
- <Implementation-Vendor>The Apache Software
Foundation</Implementation-Vendor>
-
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
- <url>${project.url}</url>
- </manifestEntries>
- </archive>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
<extensions>true</extensions>
<configuration>
<instructions>
<Export-Package>org.apache.mailet.base.*</Export-Package>
- <Embed-Dependency>*;scope=runtime</Embed-Dependency>
</instructions>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.james</groupId>
+ <artifactId>maven-mailetdocs-plugin</artifactId>
+ </plugin>
</plugins>
</build>
</project>
\ No newline at end of file
Modified: james/mailet/trunk/crypto/pom.xml
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/crypto/pom.xml?rev=1418715&r1=1418714&r2=1418715&view=diff
==============================================================================
--- james/mailet/trunk/crypto/pom.xml (original)
+++ james/mailet/trunk/crypto/pom.xml Sat Dec 8 17:28:42 2012
@@ -31,7 +31,7 @@
<artifactId>apache-mailets-crypto</artifactId>
<version>1.1.0-SNAPSHOT</version>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Apache James :: Crypto Mailets</name>
<description>
@@ -41,91 +41,42 @@
<url>http://james.apache.org/mailet/crypto/</url>
<inceptionYear>2008</inceptionYear>
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/james/mailet/crypto/trunk</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/james/mailet/crypto/trunk</developerConnection>
-
<url>http://svn.apache.org/viewcvs.cgi/james/mailet/crypto/trunk/?root=Apache-SVN</url>
- </scm>
- <issueManagement>
- <system>JIRA</system>
- <url>http://issues.apache.org/jira/browse/MAILETCRYPTO</url>
- </issueManagement>
-
- <distributionManagement>
- <site>
- <id>crypto-mailet-website</id>
-
<url>scpexe://people.apache.org/www/james.apache.org/mailet/crypto/</url>
- </site>
- </distributionManagement>
-
<dependencies>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
- <version>1.4.4</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcmail-jdk16</artifactId>
- <version>1.46</version>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>apache-mailet-base</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <artifactId>apache-mailets-base</artifactId>
</dependency>
</dependencies>
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.james</groupId>
- <artifactId>maven-mailetdocs-plugin</artifactId>
- <version>0.2-SNAPSHOT</version>
- </plugin>
- </plugins>
- </pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
-
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- <manifestEntries>
- <Specification-Title>Apache James Cryptography
Mailets</Specification-Title>
-
<Specification-Version>${project.version}</Specification-Version>
- <Specification-Vendor>The Apache Software
Foundation</Specification-Vendor>
- <Implementation-Title>Apache James Cryptography
Mailets</Implementation-Title>
-
<Implementation-Version>${project.version}</Implementation-Version>
- <Implementation-Vendor>The Apache Software
Foundation</Implementation-Vendor>
-
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
- <url>${project.url}</url>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- <extensions>true</extensions>
<configuration>
<instructions>
-
<Export-Package>org.apache.james.mailet.crypto.*</Export-Package>
- <Embed-Dependency>*;scope=runtime</Embed-Dependency>
+ <Export-Package>
+ org.apache.james.mailet.crypto.*
+ </Export-Package>
</instructions>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.james</groupId>
+ <artifactId>maven-mailetdocs-plugin</artifactId>
+ </plugin>
</plugins>
</build>
</project>
Modified: james/mailet/trunk/maven-mailetdocs-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/maven-mailetdocs-plugin/pom.xml?rev=1418715&r1=1418714&r2=1418715&view=diff
==============================================================================
--- james/mailet/trunk/maven-mailetdocs-plugin/pom.xml (original)
+++ james/mailet/trunk/maven-mailetdocs-plugin/pom.xml Sat Dec 8 17:28:42 2012
@@ -41,59 +41,34 @@
<url>http://james.apache.org/mailet/maven-mailetdocs-plugin/</url>
<inceptionYear>2008</inceptionYear>
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/james/mailet/maven-mailetdocs-plugin/trunk</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/james/mailet/maven-mailetdocs-plugin/trunk
- </developerConnection>
-
<url>http://svn.apache.org/viewcvs.cgi/james/mailet/maven-mailetdocs-plugin/trunk/?root=Apache-SVN</url>
- </scm>
- <issueManagement>
- <system>JIRA</system>
- <url>http://issues.apache.org/jira/browse/MAILETDOCS</url>
- </issueManagement>
-
- <distributionManagement>
- <site>
- <id>mailetdocs-website</id>
-
<url>scpexe://people.apache.org/www/james.apache.org/mailet/maven-mailetdocs-plugin/</url>
- </site>
- </distributionManagement>
-
<dependencies>
<dependency>
<groupId>org.apache.maven.artifact</groupId>
<artifactId>maven-artifact</artifactId>
- <version>3.0-alpha-1</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>3.0.3</version>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
- <version>2.1</version>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>3.0</version>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>apache-mailet</artifactId>
- <version>2.5-SNAPSHOT</version>
+ <artifactId>apache-mailets-api</artifactId>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
</dependency>
<dependency>
<groupId>com.thoughtworks.qdox</groupId>
<artifactId>qdox</artifactId>
- <version>1.12</version>
</dependency>
</dependencies>
@@ -111,46 +86,6 @@
</execution>
</executions>
</plugin>
- <!-- Add NOTICE and LICENSE to generated JAR -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
- <configuration>
- <resourceBundles>
- <resourceBundle>
- org.apache:apache-jar-resource-bundle:1.4
- </resourceBundle>
- </resourceBundles>
- <properties>
- <addLicense>true</addLicense>
- </properties>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestEntries>
- <Specification-Title>Apache MailetDocs
Plugin</Specification-Title>
-
<Specification-Version>${project.version}</Specification-Version>
- <Specification-Vendor>The Apache Software
Foundation</Specification-Vendor>
- <Implementation-Title>Apache MailetDocs
Plugin</Implementation-Title>
-
<Implementation-Version>${project.version}</Implementation-Version>
- <Implementation-Vendor>The Apache Software
Foundation</Implementation-Vendor>
-
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
- <url>${project.url}</url>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
Modified: james/mailet/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/parent/pom.xml?rev=1418715&r1=1418714&r2=1418715&view=diff
==============================================================================
--- james/mailet/trunk/parent/pom.xml (original)
+++ james/mailet/trunk/parent/pom.xml Sat Dec 8 17:28:42 2012
@@ -30,28 +30,103 @@
<name>Apache James :: Mailets Parent</name>
<description>Parent pom for mailets projects.</description>
- <issueManagement>
- <url>http://issues.apache.org/jira/browse/MAILET</url>
- </issueManagement>
-
<properties>
- <target.jdk>1.5</target.jdk>
- <plugin.mailetdoc.version>0.1</plugin.mailetdoc.version>
- <issue.project.name>MAILET</issue.project.name>
+ <target.jdk>1.6</target.jdk>
+ <!-- Override the source descriptor -->
+ <sourceReleaseAssemblyDescriptor>src</sourceReleaseAssemblyDescriptor>
+ <plugin.mailetdocs.version>0.1</plugin.mailetdocs.version>
+ <apache-mailets-api.version>2.5.0-SNAPSHOT</apache-mailets-api.version>
+
<apache-mailets-base.version>1.2.0-SNAPSHOT</apache-mailets-base.version>
+
<apache-mailets-ai-classic.version>0.0.1-SNAPSHOT</apache-mailets-ai-classic.version>
+ <javax.version>1.4.4</javax.version>
+ <junit.version>4.10</junit.version>
+ <activation.version>1.1.1</activation.version>
+ <bcmail-jdk16.version>1.46</bcmail-jdk16.version>
+ <commons-collections.version>3.2.1</commons-collections.version>
+ <commons-httpclient.version>3.1</commons-httpclient.version>
+ <!-- maven-mailetdocs-plugin artifacts -->
+ <maven-artifact.version>3.0-alpha-1</maven-artifact.version>
+ <maven-plugin-api.version>3.0.4</maven-plugin-api.version>
+ <maven-reporting-impl.version>2.2</maven-reporting-impl.version>
+ <maven-reporting-api.version>3.0</maven-reporting-api.version>
+ <qdox.version>1.12</qdox.version>
</properties>
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/james/mailet/current</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/james/mailet/current</developerConnection>
-
<url>http://svn.apache.org/viewcvs.cgi/james/mailet/current/?root=Apache-SVN</url>
- </scm>
-
- <distributionManagement>
- <site>
- <id>mailet-umbrella-website</id>
- <url>scpexe://people.apache.org/www/james.apache.org/mailet/</url>
- </site>
- </distributionManagement>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mailets-api</artifactId>
+ <version>${apache-mailets-api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mailets-base</artifactId>
+ <version>${apache-mailets-base.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mailets-ai-classic</artifactId>
+ <version>${apache-mailets-ai-classic.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>${javax.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>${activation.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcmail-jdk16</artifactId>
+ <version>${bcmail-jdk16.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.artifact</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>${maven-artifact.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>${maven-plugin-api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.reporting</groupId>
+ <artifactId>maven-reporting-impl</artifactId>
+ <version>${maven-reporting-impl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.reporting</groupId>
+ <artifactId>maven-reporting-api</artifactId>
+ <version>${maven-reporting-api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>${commons-collections.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>${commons-httpclient.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.thoughtworks.qdox</groupId>
+ <artifactId>qdox</artifactId>
+ <version>${qdox.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ <version>${junit.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<build>
<pluginManagement>
@@ -59,12 +134,35 @@
<plugin>
<groupId>org.apache.james</groupId>
<artifactId>maven-mailetdocs-plugin</artifactId>
- <version>${plugin.mailetdoc.version}</version>
+ <version>${plugin.mailetdocs.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+
<descriptorSourceDirectory>${project.basedir}/src/assemble/</descriptorSourceDirectory>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <!-- append to the packaging phase. -->
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<inherited>true</inherited>
@@ -85,6 +183,8 @@
<exclude>**/.*</exclude>
<exclude>.*/**/*</exclude>
<exclude>**/LICENSE*</exclude>
+ <exclude>**/target/**</exclude>
+ <exclude>**/*.iml</exclude>
</excludes>
</configuration>
</execution>
@@ -115,46 +215,29 @@
</execution>
</executions>
</plugin>
-
+ <!-- Add NOTICE and LICENSE to generated JAR -->
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
<executions>
<execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
<goals>
- <goal>manifest</goal>
+ <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>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Export-Package>org.apache.james.*</Export-Package>
- <Embed-Dependency>*;scope=runtime</Embed-Dependency>
- </instructions>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
-
<!--<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>-->
- <manifestEntries>
-
<Specification-Title>${project.name}</Specification-Title>
-
<Specification-Version>${project.version}</Specification-Version>
- <Specification-Vendor>The Apache Software
Foundation</Specification-Vendor>
-
<Implementation-Title>${project.name}</Implementation-Title>
-
<Implementation-Version>${project.version}</Implementation-Version>
- <Implementation-Vendor>The Apache Software
Foundation</Implementation-Vendor>
-
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
- <url>${project.url}</url>
- </manifestEntries>
- </archive>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -170,4 +253,32 @@
</plugin>
</plugins>
</build>
+
+ <mailingLists>
+ <mailingList>
+ <name>Apache Mailet API List</name>
+ <subscribe>[email protected]</subscribe>
+ <unsubscribe>[email protected]</unsubscribe>
+ <post>[email protected]</post>
+
<archive>http://mail-archives.apache.org/mod_mbox/james-mailet-api/</archive>
+ </mailingList>
+ </mailingLists>
+
+ <issueManagement>
+ <url>http://issues.apache.org/jira/browse/MAILET</url>
+ </issueManagement>
+
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/james/mailet/trunk</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/james/mailet/trunk</developerConnection>
+
<url>http://svn.apache.org/viewcvs.cgi/james/mailet/trunk/?root=Apache-SVN</url>
+ </scm>
+
+ <distributionManagement>
+ <site>
+ <id>mailet-umbrella-website</id>
+ <url>scpexe://people.apache.org/www/james.apache.org/mailet/</url>
+ </site>
+ </distributionManagement>
+
</project>
\ No newline at end of file
Modified: james/mailet/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/pom.xml?rev=1418715&r1=1418714&r2=1418715&view=diff
==============================================================================
--- james/mailet/trunk/pom.xml (original)
+++ james/mailet/trunk/pom.xml Sat Dec 8 17:28:42 2012
@@ -46,5 +46,6 @@
<module>crypto</module>
<module>standard</module>
<module>ai</module>
+ <module>ai/classic</module>
</modules>
</project>
Modified: james/mailet/trunk/standard/pom.xml
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/standard/pom.xml?rev=1418715&r1=1418714&r2=1418715&view=diff
==============================================================================
--- james/mailet/trunk/standard/pom.xml (original)
+++ james/mailet/trunk/standard/pom.xml Sat Dec 8 17:28:42 2012
@@ -31,7 +31,7 @@
<artifactId>apache-mailets-standard</artifactId>
<version>1.2.0-SNAPSHOT</version>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Apache James :: Standard Mailets</name>
<description>
@@ -41,167 +41,42 @@
<url>http://james.apache.org/mailet/standard/</url>
<inceptionYear>2008</inceptionYear>
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/james/mailet/standard/trunk</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/james/mailet/standard/trunk</developerConnection>
-
<url>http://svn.apache.org/viewcvs.cgi/james/mailet/standard/trunk/?root=Apache-SVN</url>
- </scm>
- <issueManagement>
- <system>JIRA</system>
- <url>http://issues.apache.org/jira/browse/MAILETSTANDARD</url>
- </issueManagement>
-
- <distributionManagement>
- <site>
- <id>standard-mailet-website</id>
-
<url>scpexe://people.apache.org/www/james.apache.org/mailet/standard/</url>
- </site>
- </distributionManagement>
-
- <properties>
- <!-- Override the source descriptor -->
- <sourceReleaseAssemblyDescriptor>src</sourceReleaseAssemblyDescriptor>
- <target.jdk>1.6</target.jdk>
- </properties>
-
<dependencies>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
- <version>1.4.4</version>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>apache-mailet-base</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <artifactId>apache-mailets-base</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>apache-mailet-base</artifactId>
+ <artifactId>apache-mailets-base</artifactId>
<type>test-jar</type>
<scope>test</scope>
- <version>1.2-SNAPSHOT</version>
+ <version>${apache-mailets-base.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.james</groupId>
- <artifactId>maven-mailetdocs-plugin</artifactId>
- <version>0.2-SNAPSHOT</version>
- </plugin>
- </plugins>
- </pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
-
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- <manifestEntries>
- <Specification-Title>Apache James Standard
Mailets</Specification-Title>
-
<Specification-Version>${project.version}</Specification-Version>
- <Specification-Vendor>The Apache Software
Foundation</Specification-Vendor>
- <Implementation-Title>Apache James Standard
Mailets</Implementation-Title>
-
<Implementation-Version>${project.version}</Implementation-Version>
- <Implementation-Vendor>The Apache Software
Foundation</Implementation-Vendor>
-
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
-
<X-Compile-Source-JDK>${target.jdk}</X-Compile-Source-JDK>
-
<X-Compile-Target-JDK>${target.jdk}</X-Compile-Target-JDK>
- <url>${project.url}</url>
- </manifestEntries>
- </archive>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Export-Package>
-
org.apache.james.mailet.standard.*;org.apache.james.transport.mailets;org.apache.james.transport.matchers
- </Export-Package>
- <Embed-Dependency>*;scope=runtime</Embed-Dependency>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.james</groupId>
<artifactId>maven-mailetdocs-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <configuration>
-
<descriptorSourceDirectory>${basedir}/src/assemble/</descriptorSourceDirectory>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <!-- append to the packaging phase. -->
- <goals>
- <goal>attached</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <excludes>
- <exclude>NOTICE.txt</exclude>
- <exclude>LICENSE.activation</exclude>
- <exclude>LICENSE.mail</exclude>
- <exclude>LICENSE.apache</exclude>
- <!-- Generated by Maven -->
- <exclude>release.properties</exclude>
- <exclude>dist/**/*</exclude>
- <exclude>target/**/*</exclude>
- <exclude>bin/**/*</exclude>
- </excludes>
- </configuration>
</plugin>
</plugins>
</build>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
