Modified: james/server/trunk/protocols/protocols-smtp/pom.xml URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/pom.xml?rev=1426883&r1=1426882&r2=1426883&view=diff ============================================================================== --- james/server/trunk/protocols/protocols-smtp/pom.xml (original) +++ james/server/trunk/protocols/protocols-smtp/pom.xml Sun Dec 30 01:54:30 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,223 +17,217 @@ 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> - <artifactId>james-server</artifactId> - <groupId>org.apache.james</groupId> - <version>3.0-beta5-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <artifactId>james-server</artifactId> + <groupId>org.apache.james</groupId> + <version>3.0-beta5-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.apache.james</groupId> <artifactId>james-server-protocols-smtp</artifactId> + <packaging>bundle</packaging> <name>Apache James Server SMTP</name> <properties> <!-- OSGI stuff --> - <james.osgi.export> - org.apache.james.smtpserver.* - </james.osgi.export> - <james.osgi.import> - org.apache.james.jspf.*;resolution:=optional,* - </james.osgi.import> + <james.osgi.export> + org.apache.james.smtpserver.* + </james.osgi.export> + <james.osgi.import> + org.apache.james.jspf.*;resolution:=optional,* + </james.osgi.import> </properties> <dependencies> - <dependency> - <groupId>org.apache.james</groupId> - <artifactId>james-server-util</artifactId> - </dependency> - <dependency> - <groupId>org.apache.james</groupId> - <artifactId>james-server-dnsservice-library</artifactId> - </dependency> - <dependency> - <groupId>org.apache.james</groupId> - <artifactId>james-server-queue-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.james</groupId> - <artifactId>james-server-filesystem-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.james</groupId> - <artifactId>james-server-data-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.james</groupId> - <artifactId>james-server-lifecycle-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.james</groupId> - <artifactId>james-server-dnsservice-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.james</groupId> - <artifactId>james-server-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.james</groupId> - <artifactId>james-server-protocols-library</artifactId> - </dependency> - <dependency> - <groupId>org.apache.james</groupId> - <artifactId>apache-mailet-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.james.protocols</groupId> - <artifactId>protocols-api</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.james.protocols</groupId> - <artifactId>protocols-smtp</artifactId> - </dependency> - <dependency> - <groupId>org.apache.james.protocols</groupId> - <artifactId>protocols-netty</artifactId> - </dependency> - <dependency> - <groupId>org.apache.james.jspf</groupId> - <artifactId>apache-jspf-resolver</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>commons-configuration</groupId> - <artifactId>commons-configuration</artifactId> - </dependency> - <dependency> - <groupId>${javax.mail.groupId}</groupId> - <artifactId>${javax.mail.artifactId}</artifactId> - </dependency> - <dependency> - <groupId>${javax.activation.groupId}</groupId> - <artifactId>${javax.activation.artifactId}</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-annotation_1.1_spec</artifactId> - </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>james-server-util</artifactId> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>james-server-dnsservice-library</artifactId> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>james-server-queue-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>james-server-filesystem-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>james-server-data-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>james-server-lifecycle-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>james-server-dnsservice-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>james-server-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>james-server-protocols-library</artifactId> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>apache-mailet-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.james.protocols</groupId> + <artifactId>protocols-api</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.james.protocols</groupId> + <artifactId>protocols-smtp</artifactId> + </dependency> + <dependency> + <groupId>org.apache.james.protocols</groupId> + <artifactId>protocols-netty</artifactId> + </dependency> + <dependency> + <groupId>org.apache.james.jspf</groupId> + <artifactId>apache-jspf-resolver</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>commons-configuration</groupId> + <artifactId>commons-configuration</artifactId> + </dependency> + <dependency> + <groupId>${javax.mail.groupId}</groupId> + <artifactId>${javax.mail.artifactId}</artifactId> + </dependency> + <dependency> + <groupId>${javax.activation.groupId}</groupId> + <artifactId>${javax.activation.artifactId}</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty</artifactId> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-annotation_1.1_spec</artifactId> + </dependency> <!-- Test dependencies --> - <dependency> - <artifactId>dnsjava</artifactId> - <groupId>dnsjava</groupId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.james</groupId> - <artifactId>james-server-queue-api</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.james</groupId> - <artifactId>james-server-data-library</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.james</groupId> - <artifactId>james-server-data-library</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.james</groupId> - <artifactId>james-server-dnsservice-api</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.james.protocols</groupId> - <artifactId>protocols-smtp</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>commons-net</groupId> - <artifactId>commons-net</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.james</groupId> - <artifactId>apache-mailet-base</artifactId> - <classifier>tests</classifier> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.james</groupId> - <artifactId>james-server-data-api</artifactId> - <scope>test</scope> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.apache.james</groupId> - <artifactId>james-server-filesystem-api</artifactId> - <scope>test</scope> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.apache.james.protocols</groupId> - <artifactId>protocols-api</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.james</groupId> - <artifactId>james-server-protocols-library</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-nop</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <scope>test</scope> - </dependency> + <dependency> + <artifactId>dnsjava</artifactId> + <groupId>dnsjava</groupId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>james-server-queue-api</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>james-server-data-library</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>james-server-data-library</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>james-server-dnsservice-api</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.james.protocols</groupId> + <artifactId>protocols-smtp</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>commons-net</groupId> + <artifactId>commons-net</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>apache-mailet-base</artifactId> + <classifier>tests</classifier> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>james-server-data-api</artifactId> + <scope>test</scope> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>james-server-filesystem-api</artifactId> + <scope>test</scope> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.apache.james.protocols</groupId> + <artifactId>protocols-api</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>james-server-protocols-library</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-nop</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <!-- - Inherit configuration from parent pom. - --> - <executions> - <execution> - <goals> - <goal>jar</goal> - <!-- - Allow tests to be used by other modules. - Parent pom build failure prevents inheritance. - --> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> + <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/server/trunk/queue/queue-activemq/pom.xml URL: http://svn.apache.org/viewvc/james/server/trunk/queue/queue-activemq/pom.xml?rev=1426883&r1=1426882&r2=1426883&view=diff ============================================================================== --- james/server/trunk/queue/queue-activemq/pom.xml (original) +++ james/server/trunk/queue/queue-activemq/pom.xml Sun Dec 30 01:54:30 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,18 +17,20 @@ 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> <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> <version>3.0-beta5-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.apache.james</groupId> <artifactId>james-server-queue-activemq</artifactId> + <packaging>bundle</packaging> <name>Apache James Server ActiveMQ Queue</name> @@ -132,27 +134,4 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <!-- - Inherit configuration from parent pom. - --> - <executions> - <execution> - <goals> - <goal>jar</goal> - <!-- - Allow tests to be used by other modules. - Parent pom build failure prevents inheritance. - --> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> </project> Modified: james/server/trunk/queue/queue-api/pom.xml URL: http://svn.apache.org/viewvc/james/server/trunk/queue/queue-api/pom.xml?rev=1426883&r1=1426882&r2=1426883&view=diff ============================================================================== --- james/server/trunk/queue/queue-api/pom.xml (original) +++ james/server/trunk/queue/queue-api/pom.xml Sun Dec 30 01:54:30 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,18 +17,20 @@ 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> <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> <version>3.0-beta5-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.apache.james</groupId> <artifactId>james-server-queue-api</artifactId> + <packaging>bundle</packaging> <name>Apache James Server Queue API</name> @@ -53,27 +55,4 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <!-- - Inherit configuration from parent pom. - --> - <executions> - <execution> - <goals> - <goal>jar</goal> - <!-- - Allow tests to be used by other modules. - Parent pom build failure prevents inheritance. - --> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> +</project> \ No newline at end of file Modified: james/server/trunk/queue/queue-file/pom.xml URL: http://svn.apache.org/viewvc/james/server/trunk/queue/queue-file/pom.xml?rev=1426883&r1=1426882&r2=1426883&view=diff ============================================================================== --- james/server/trunk/queue/queue-file/pom.xml (original) +++ james/server/trunk/queue/queue-file/pom.xml Sun Dec 30 01:54:30 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,14 +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> <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> <version>3.0-beta5-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <relativePath>../../pom.xml</relativePath> </parent> <artifactId>james-server-queue-file</artifactId> @@ -68,17 +69,9 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <!-- - Inherit configuration from parent pom. - --> <executions> <execution> <goals> - <goal>jar</goal> - <!-- - Allow tests to be used by other modules. - Parent pom build failure prevents inheritance. - --> <goal>test-jar</goal> </goals> </execution> Modified: james/server/trunk/queue/queue-jms/pom.xml URL: http://svn.apache.org/viewvc/james/server/trunk/queue/queue-jms/pom.xml?rev=1426883&r1=1426882&r2=1426883&view=diff ============================================================================== --- james/server/trunk/queue/queue-jms/pom.xml (original) +++ james/server/trunk/queue/queue-jms/pom.xml Sun Dec 30 01:54:30 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,18 +17,20 @@ 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> <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> <version>3.0-beta5-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.apache.james</groupId> <artifactId>james-server-queue-jms</artifactId> + <packaging>bundle</packaging> <name>Apache James Server JMS Mail Queue</name> @@ -103,17 +105,9 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <!-- - Inherit configuration from parent pom. - --> <executions> <execution> <goals> - <goal>jar</goal> - <!-- - Allow tests to be used by other modules. - Parent pom build failure prevents inheritance. - --> <goal>test-jar</goal> </goals> </execution> Modified: james/server/trunk/util/pom.xml URL: http://svn.apache.org/viewvc/james/server/trunk/util/pom.xml?rev=1426883&r1=1426882&r2=1426883&view=diff ============================================================================== --- james/server/trunk/util/pom.xml (original) +++ james/server/trunk/util/pom.xml Sun Dec 30 01:54:30 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,7 +17,8 @@ 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> @@ -29,19 +30,10 @@ <groupId>org.apache.james</groupId> <artifactId>james-server-util</artifactId> + <packaging>bundle</packaging> <name>Apache James Server Common Utilities</name> - <properties> - <!-- OSGI stuff --> - <james.osgi.export> - org.apache.james.util.* - </james.osgi.export> - <james.osgi.import> - * - </james.osgi.import> - </properties> - <dependencies> <dependency> <groupId>${javax.mail.groupId}</groupId> @@ -50,7 +42,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - </dependency> + </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -58,27 +50,4 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <!-- - Inherit configuration from parent pom. - --> - <executions> - <execution> - <goals> - <goal>jar</goal> - <!-- - Allow tests to be used by other modules. - Parent pom build failure prevents inheritance. - --> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> </project> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
