Author: ieugen
Date: Sun Dec 23 22:28:24 2012
New Revision: 1425542
URL: http://svn.apache.org/viewvc?rev=1425542&view=rev
Log:
MAILET-88 prepare for release
* merged parent/pom.xml and pom.xml and removed parent/ module from project
Removed:
james/mailet/trunk/base/src/assemble/bin.xml
james/mailet/trunk/base/src/assemble/src.xml
james/mailet/trunk/crypto/src/assemble/LICENSE-binary.txt
james/mailet/trunk/crypto/src/assemble/bin.xml
james/mailet/trunk/crypto/src/assemble/src.xml
james/mailet/trunk/parent/pom.xml
james/mailet/trunk/standard/src/assemble/bin.xml
james/mailet/trunk/standard/src/assemble/src.xml
Modified:
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/mailetdocs-maven-plugin/pom.xml
james/mailet/trunk/pom.xml
james/mailet/trunk/standard/pom.xml
Modified: james/mailet/trunk/ai/pom.xml
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/ai/pom.xml?rev=1425542&r1=1425541&r2=1425542&view=diff
==============================================================================
--- james/mailet/trunk/ai/pom.xml (original)
+++ james/mailet/trunk/ai/pom.xml Sun Dec 23 22:28:24 2012
@@ -26,7 +26,7 @@
<groupId>org.apache.james</groupId>
<artifactId>apache-mailet</artifactId>
<version>2.5.0-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>apache-mailet-ai</artifactId>
Modified: james/mailet/trunk/api/pom.xml
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/api/pom.xml?rev=1425542&r1=1425541&r2=1425542&view=diff
==============================================================================
--- james/mailet/trunk/api/pom.xml (original)
+++ james/mailet/trunk/api/pom.xml Sun Dec 23 22:28:24 2012
@@ -26,7 +26,7 @@
<groupId>org.apache.james</groupId>
<artifactId>apache-mailet</artifactId>
<version>2.5.0-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
+ <relativePath>../</relativePath>
</parent>
<artifactId>apache-mailet-api</artifactId>
Modified: james/mailet/trunk/base/pom.xml
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/base/pom.xml?rev=1425542&r1=1425541&r2=1425542&view=diff
==============================================================================
--- james/mailet/trunk/base/pom.xml (original)
+++ james/mailet/trunk/base/pom.xml Sun Dec 23 22:28:24 2012
@@ -26,7 +26,7 @@
<groupId>org.apache.james</groupId>
<artifactId>apache-mailet</artifactId>
<version>2.5.0-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
+ <relativePath>../</relativePath>
</parent>
<artifactId>apache-mailet-base</artifactId>
Modified: james/mailet/trunk/crypto/pom.xml
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/crypto/pom.xml?rev=1425542&r1=1425541&r2=1425542&view=diff
==============================================================================
--- james/mailet/trunk/crypto/pom.xml (original)
+++ james/mailet/trunk/crypto/pom.xml Sun Dec 23 22:28:24 2012
@@ -26,7 +26,7 @@
<groupId>org.apache.james</groupId>
<artifactId>apache-mailet</artifactId>
<version>2.5.0-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
+ <relativePath>../</relativePath>
</parent>
<artifactId>apache-mailet-crypto</artifactId>
@@ -70,10 +70,6 @@
</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>
Modified: james/mailet/trunk/mailetdocs-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/mailetdocs-maven-plugin/pom.xml?rev=1425542&r1=1425541&r2=1425542&view=diff
==============================================================================
--- james/mailet/trunk/mailetdocs-maven-plugin/pom.xml (original)
+++ james/mailet/trunk/mailetdocs-maven-plugin/pom.xml Sun Dec 23 22:28:24 2012
@@ -26,7 +26,7 @@
<groupId>org.apache.james</groupId>
<artifactId>apache-mailet</artifactId>
<version>2.5.0-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
+ <relativePath>../</relativePath>
</parent>
<artifactId>mailetdocs-maven-plugin</artifactId>
Modified: james/mailet/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/pom.xml?rev=1425542&r1=1425541&r2=1425542&view=diff
==============================================================================
--- james/mailet/trunk/pom.xml (original)
+++ james/mailet/trunk/pom.xml Sun Dec 23 22:28:24 2012
@@ -24,22 +24,42 @@
<parent>
<groupId>org.apache.james</groupId>
- <artifactId>apache-mailet</artifactId>
- <version>2.5.0-SNAPSHOT</version>
- <relativePath>./parent</relativePath>
+ <artifactId>james-project</artifactId>
+ <version>1.8.1</version>
+ <relativePath/>
</parent>
- <artifactId>apache-mailet-aggregator</artifactId>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mailet</artifactId>
<version>2.5.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Apache James :: Mailets Aggregator</name>
- <description>Apache James Mailets Aggregator</description>
+ <name>Apache James :: Mailets parent and aggregator</name>
+ <description>Apache James Mailets parent and aggregator</description>
<url>http://james.apache.org/mailet/</url>
<inceptionYear>2008</inceptionYear>
+ <properties>
+ <target.jdk>1.6</target.jdk>
+ <!-- Override the source descriptor -->
+
<sourceReleaseAssemblyDescriptor>project</sourceReleaseAssemblyDescriptor>
+ <plugin.mailetdocs.version>0.1</plugin.mailetdocs.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>
+
+
<modules>
- <module>parent</module>
<module>api</module>
<module>base</module>
<module>mailetdocs-maven-plugin</module>
@@ -48,9 +68,147 @@
<module>ai</module>
</modules>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mailet-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mailet-base</artifactId>
+ <version>${project.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>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.james</groupId>
+ <artifactId>maven-mailetdocs-plugin</artifactId>
+ <version>${plugin.mailetdocs.version}</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.3.7</version>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <inherited>true</inherited>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <configuration>
+ <excludes>
+ <exclude>NOTICE.*</exclude>
+ <exclude>LICENSE.*</exclude>
+ <!-- Generated by Maven -->
+ <exclude>release.properties</exclude>
+ <exclude>dist/**/*</exclude>
+ <!-- Eclipse -->
+ <exclude>**/.*</exclude>
+ <exclude>.*/**/*</exclude>
+ <exclude>**/LICENSE*</exclude>
+ <exclude>**/target/**</exclude>
+ <exclude>**/*.iml</exclude>
+ </excludes>
+ </configuration>
+ </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>
+ <!-- <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-site-plugin</artifactId>
<configuration>
@@ -64,4 +222,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>
Modified: james/mailet/trunk/standard/pom.xml
URL:
http://svn.apache.org/viewvc/james/mailet/trunk/standard/pom.xml?rev=1425542&r1=1425541&r2=1425542&view=diff
==============================================================================
--- james/mailet/trunk/standard/pom.xml (original)
+++ james/mailet/trunk/standard/pom.xml Sun Dec 23 22:28:24 2012
@@ -26,7 +26,7 @@
<groupId>org.apache.james</groupId>
<artifactId>apache-mailet</artifactId>
<version>2.5.0-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
+ <relativePath>../</relativePath>
</parent>
<artifactId>apache-mailet-standard</artifactId>
@@ -74,10 +74,6 @@
<groupId>org.apache.james</groupId>
<artifactId>maven-mailetdocs-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- </plugin>
</plugins>
</build>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
