You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ie...@apache.org on 2012/11/29 22:53:51 UTC
svn commit: r1415399 - in /james/mailet: ai/trunk/pom.xml base/trunk/pom.xml
crypto/trunk/pom.xml current/ current/pom.xml
maven-mailetdocs-plugin/trunk/pom.xml project/trunk/pom.xml
standard/trunk/pom.xml
Author: ieugen
Date: Thu Nov 29 21:53:50 2012
New Revision: 1415399
URL: http://svn.apache.org/viewvc?rev=1415399&view=rev
Log:
MAILET-38
General pom cleaning
- policy: remove all unneeded or erroneus stuff.
Modified:
james/mailet/ai/trunk/pom.xml
james/mailet/base/trunk/pom.xml
james/mailet/crypto/trunk/pom.xml
james/mailet/current/ (props changed)
james/mailet/current/pom.xml
james/mailet/maven-mailetdocs-plugin/trunk/pom.xml
james/mailet/project/trunk/pom.xml
james/mailet/standard/trunk/pom.xml
Modified: james/mailet/ai/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/mailet/ai/trunk/pom.xml?rev=1415399&r1=1415398&r2=1415399&view=diff
==============================================================================
--- james/mailet/ai/trunk/pom.xml (original)
+++ james/mailet/ai/trunk/pom.xml Thu Nov 29 21:53:50 2012
@@ -17,10 +17,9 @@
specific language governing permissions and limitations
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">
+<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">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -39,12 +38,6 @@
<url>http://james.apache.org/mailet/ai</url>
<inceptionYear>2011</inceptionYear>
- <!--
-
-
- ========================================
- Modules
- -->
<modules>
<module>classic</module>
</modules>
Modified: james/mailet/base/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/mailet/base/trunk/pom.xml?rev=1415399&r1=1415398&r2=1415399&view=diff
==============================================================================
--- james/mailet/base/trunk/pom.xml (original)
+++ james/mailet/base/trunk/pom.xml Thu Nov 29 21:53:50 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-15"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,17 +17,15 @@
specific language governing permissions and limitations
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">
+<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.james</groupId>
<artifactId>james-project</artifactId>
<version>1.8</version>
- <relativePath></relativePath>
</parent>
<artifactId>apache-mailet-base</artifactId>
@@ -36,9 +34,9 @@
<name>Apache JAMES Basic Mailet Toolkit</name>
<description>
- Apache JAMES Basic Mailet Toolkit is a collection of utilities and lightweight framework
- aimed at developers and testers of mailets. This toolkit is extensively used elsewhere in
- JAMES.
+ Apache JAMES Basic Mailet Toolkit is a collection of utilities and lightweight framework
+ aimed at developers and testers of mailets. This toolkit is extensively used elsewhere in
+ JAMES.
</description>
<url>http://james.apache.org/mailet/base/</url>
<inceptionYear>2008</inceptionYear>
Modified: james/mailet/crypto/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/mailet/crypto/trunk/pom.xml?rev=1415399&r1=1415398&r2=1415399&view=diff
==============================================================================
--- james/mailet/crypto/trunk/pom.xml (original)
+++ james/mailet/crypto/trunk/pom.xml Thu Nov 29 21:53:50 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-15"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,17 +17,15 @@
specific language governing permissions and limitations
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">
+<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.james</groupId>
<artifactId>james-project</artifactId>
<version>1.8</version>
- <relativePath></relativePath>
</parent>
<artifactId>apache-crypto-mailets</artifactId>
@@ -36,8 +34,8 @@
<name>Apache JAMES Crypto Mailets</name>
<description>
- Apache JAMES Cryptographic Mailets is a collection of mailets which use cryptography.
- This includes matching signatures, decrypting, encrypting and signing.
+ Apache JAMES Cryptographic Mailets is a collection of mailets which use cryptography.
+ This includes matching signatures, decrypting, encrypting and signing.
</description>
<url>http://james.apache.org/mailet/crypto/</url>
<inceptionYear>2008</inceptionYear>
@@ -77,7 +75,6 @@
</dependency>
</dependencies>
-
<build>
<pluginManagement>
<plugins>
Propchange: james/mailet/current/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Nov 29 21:53:50 2012
@@ -1,9 +1,8 @@
target
-
.settings
-
.project
-
.classpath
.metadata
stage
+*.iml
+.idea
Modified: james/mailet/current/pom.xml
URL: http://svn.apache.org/viewvc/james/mailet/current/pom.xml?rev=1415399&r1=1415398&r2=1415399&view=diff
==============================================================================
--- james/mailet/current/pom.xml (original)
+++ james/mailet/current/pom.xml Thu Nov 29 21:53:50 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-15"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,17 +17,15 @@
specific language governing permissions and limitations
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">
+<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.james</groupId>
<artifactId>james-project</artifactId>
<version>1.8</version>
- <relativePath></relativePath>
</parent>
<artifactId>mailet-project</artifactId>
Modified: james/mailet/maven-mailetdocs-plugin/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/mailet/maven-mailetdocs-plugin/trunk/pom.xml?rev=1415399&r1=1415398&r2=1415399&view=diff
==============================================================================
--- james/mailet/maven-mailetdocs-plugin/trunk/pom.xml (original)
+++ james/mailet/maven-mailetdocs-plugin/trunk/pom.xml Thu Nov 29 21:53:50 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-15"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,17 +17,15 @@
specific language governing permissions and limitations
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">
+<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.james</groupId>
<artifactId>james-project</artifactId>
<version>1.8</version>
- <relativePath></relativePath>
</parent>
<artifactId>maven-mailetdocs-plugin</artifactId>
@@ -36,15 +34,16 @@
<name>Mailetdocs Maven Plugin</name>
<description>
- This plugin generates documentation for Mailets by collating
- information available from implementation source.
+ This plugin generates documentation for Mailets by collating
+ information available from implementation source.
</description>
<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>
+ <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>
@@ -99,12 +98,12 @@
<repositories>
<!-- needed for javamail -->
- <repository>
- <id>maven2-repository.dev.java.net</id>
- <name>Java.net Repository for Maven</name>
- <url>http://download.java.net/maven/2/</url>
- <layout>default</layout>
- </repository>
+ <!--<repository>-->
+ <!--<id>maven2-repository.dev.java.net</id>-->
+ <!--<name>Java.net Repository for Maven</name>-->
+ <!--<url>http://download.java.net/maven/2/</url>-->
+ <!--<layout>default</layout>-->
+ <!--</repository>-->
</repositories>
<build>
@@ -143,33 +142,6 @@
</execution>
</executions>
</plugin>
- <!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-doap-plugin</artifactId>
- <executions>
- <execution>
- <id>site</id>
- <phase>site</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <doapOptions>
- <programmingLanguage>java</programmingLanguage>
- <category>mail</category>
- <download-page>http://james.apache.org/download.cgi</download-page>
- </doapOptions>
- <asfExtOptions>
- <included>true</included>
- <pmc>http://james.apache.org</pmc>
- <name>Apache JAMES</name>
- </asfExtOptions>
- </configuration>
- </plugin>
- -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Modified: james/mailet/project/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/mailet/project/trunk/pom.xml?rev=1415399&r1=1415398&r2=1415399&view=diff
==============================================================================
--- james/mailet/project/trunk/pom.xml (original)
+++ james/mailet/project/trunk/pom.xml Thu Nov 29 21:53:50 2012
@@ -11,17 +11,15 @@
OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations 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">
+<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.james</groupId>
<artifactId>james-project</artifactId>
<version>1.8</version>
- <relativePath></relativePath>
</parent>
<groupId>org.apache.james</groupId>
@@ -29,26 +27,13 @@
<version>1-SNAPSHOT</version>
<packaging>pom</packaging>
-
<name>Apache James Parent Project For Mailets</name>
<description>Parent pom for mailets projects.</description>
- <!--
-
-
- ========================================
- Issue Management
- -->
<issueManagement>
- <url>http://issues.apache.org/jira/browse/${issue.project.name}</url>
+ <url>http://issues.apache.org/jira/browse/${project.name}</url>
</issueManagement>
- <!--
-
-
- ========================================
- Properties
- -->
<properties>
<target.jdk>1.5</target.jdk>
<plugin.mailetdoc.version>0.1</plugin.mailetdoc.version>
@@ -56,14 +41,6 @@
</properties>
<build>
- <!--
-
-
-
-
- =============================================
- Plugin management
- -->
<pluginManagement>
<plugins>
<plugin>
@@ -73,25 +50,7 @@
</plugin>
</plugins>
</pluginManagement>
-
- <!--
-
-
-
-
- =============================================
- Plugins
- -->
<plugins>
-
- <!--
-
-
-
-
- =============================================
- Apache Rat
- -->
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
@@ -117,15 +76,6 @@
</execution>
</executions>
</plugin>
-
- <!--
-
-
-
-
- =============================================
- Source
- -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
@@ -138,16 +88,6 @@
</execution>
</executions>
</plugin>
-
- <!--
-
-
-
-
- =============================================
- Javadoc
- -->
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
@@ -162,14 +102,6 @@
</executions>
</plugin>
- <!--
-
-
-
-
- =============================================
- OSGI
- -->
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
@@ -191,15 +123,6 @@
</configuration>
</plugin>
- <!--
-
-
-
-
- =============================================
- Jar
- -->
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
@@ -219,35 +142,11 @@
</archive>
</configuration>
</plugin>
- <!--
-
-
-
-
- =============================================
- Site
- -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
-
<configuration>
-
- <!--
-
-
-
- =====================================
- Reports
- -->
<reportPlugins combine.children="append">
- <!--
-
-
-
- =================================
- Mailetdocs
- -->
<plugin>
<groupId>org.apache.james</groupId>
<artifactId>maven-mailetdocs-plugin</artifactId>
Modified: james/mailet/standard/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/pom.xml?rev=1415399&r1=1415398&r2=1415399&view=diff
==============================================================================
--- james/mailet/standard/trunk/pom.xml (original)
+++ james/mailet/standard/trunk/pom.xml Thu Nov 29 21:53:50 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-15"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,17 +17,15 @@
specific language governing permissions and limitations
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">
+<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.james</groupId>
<artifactId>james-project</artifactId>
<version>1.8</version>
- <relativePath></relativePath>
</parent>
<artifactId>apache-standard-mailets</artifactId>
@@ -36,8 +34,8 @@
<name>Apache JAMES Standard Mailets</name>
<description>
- Apache JAMES Standard Mailets is a rich collection of general purpose mailets
- with limited dependencies. These mailets can be used in any mailet container.
+ Apache JAMES Standard Mailets is a rich collection of general purpose mailets
+ with limited dependencies. These mailets can be used in any mailet container.
</description>
<url>http://james.apache.org/mailet/standard/</url>
<inceptionYear>2008</inceptionYear>
@@ -62,6 +60,7 @@
<properties>
<!-- Override the source descriptor -->
<sourceReleaseAssemblyDescriptor>src</sourceReleaseAssemblyDescriptor>
+ <target.jdk>1.6</target.jdk>
</properties>
<dependencies>
@@ -90,7 +89,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.9</version>
+ <version>4.10</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -149,7 +148,9 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>org.apache.james.mailet.standard.*;org.apache.james.transport.mailets;org.apache.james.transport.matchers</Export-Package>
+ <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>
@@ -158,35 +159,6 @@
<groupId>org.apache.james</groupId>
<artifactId>maven-mailetdocs-plugin</artifactId>
</plugin>
- <!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-doap-plugin</artifactId>
- <executions>
- <execution>
- <id>site</id>
- <phase>site</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <doapOptions>
- <programmingLanguage>java</programmingLanguage>
- <category>mail</category>
- <download-page>http://james.apache.org/download.cgi</download-page>
- </doapOptions>
-
- <asfExtOptions>
- <included>true</included>
- <pmc>http://james.apache.org</pmc>
- <name>Apache JAMES</name>
- </asfExtOptions>
-
- </configuration>
- </plugin>
- -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
@@ -197,7 +169,8 @@
<executions>
<execution>
<id>make-assembly</id>
- <phase>package</phase> <!-- append to the packaging phase. -->
+ <phase>package</phase>
+ <!-- append to the packaging phase. -->
<goals>
<goal>attached</goal>
</goals>
@@ -221,7 +194,6 @@
<exclude>LICENSE.activation</exclude>
<exclude>LICENSE.mail</exclude>
<exclude>LICENSE.apache</exclude>
-
<!-- Generated by Maven -->
<exclude>release.properties</exclude>
<exclude>dist/**/*</exclude>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org