http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/data/data-jdbc/pom.xml ---------------------------------------------------------------------- diff --git a/server/data/data-jdbc/pom.xml b/server/data/data-jdbc/pom.xml index b2c9796..e80b44d 100644 --- a/server/data/data-jdbc/pom.xml +++ b/server/data/data-jdbc/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server</artifactId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/data/data-jmap-cassandra/pom.xml ---------------------------------------------------------------------- diff --git a/server/data/data-jmap-cassandra/pom.xml b/server/data/data-jmap-cassandra/pom.xml index 918d2bb..d1b1f93 100644 --- a/server/data/data-jmap-cassandra/pom.xml +++ b/server/data/data-jmap-cassandra/pom.xml @@ -22,8 +22,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server</artifactId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/data/data-jmap/pom.xml ---------------------------------------------------------------------- diff --git a/server/data/data-jmap/pom.xml b/server/data/data-jmap/pom.xml index 26bd964..155fdd5 100644 --- a/server/data/data-jmap/pom.xml +++ b/server/data/data-jmap/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server</artifactId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/data/data-jpa/pom.xml ---------------------------------------------------------------------- diff --git a/server/data/data-jpa/pom.xml b/server/data/data-jpa/pom.xml index e1b59bf..eab6334 100644 --- a/server/data/data-jpa/pom.xml +++ b/server/data/data-jpa/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server</artifactId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -136,15 +136,6 @@ <groupId>org.apache.openjpa</groupId> <artifactId>openjpa-maven-plugin</artifactId> <version>2.4.2</version> - <executions> - <execution> - <id>enhancer</id> - <phase>process-classes</phase> - <goals> - <goal>enhance</goal> - </goals> - </execution> - </executions> <configuration> <includes>org/apache/james/user/jpa/model/JPAUser.class,org/apache/james/rrt/jpa/model/JPARecipientRewrite.class,org/apache/james/domainlist/jpa/model/JPADomain.class</includes> <addDefaultConstructor>true</addDefaultConstructor> @@ -160,6 +151,15 @@ </property> </toolProperties> </configuration> + <executions> + <execution> + <id>enhancer</id> + <goals> + <goal>enhance</goal> + </goals> + <phase>process-classes</phase> + </execution> + </executions> </plugin> <plugin> <groupId>org.apache.felix</groupId> http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/data/data-ldap-integration-testing/pom.xml ---------------------------------------------------------------------- diff --git a/server/data/data-ldap-integration-testing/pom.xml b/server/data/data-ldap-integration-testing/pom.xml index 91e7fed..e99bd77 100644 --- a/server/data/data-ldap-integration-testing/pom.xml +++ b/server/data/data-ldap-integration-testing/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server</artifactId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/data/data-ldap/pom.xml ---------------------------------------------------------------------- diff --git a/server/data/data-ldap/pom.xml b/server/data/data-ldap/pom.xml index 4f6a8f5..0a144df 100644 --- a/server/data/data-ldap/pom.xml +++ b/server/data/data-ldap/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server</artifactId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/data/data-library/pom.xml ---------------------------------------------------------------------- diff --git a/server/data/data-library/pom.xml b/server/data/data-library/pom.xml index 4d6a18c..7aa1bc1 100644 --- a/server/data/data-library/pom.xml +++ b/server/data/data-library/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server</artifactId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/data/data-memory/pom.xml ---------------------------------------------------------------------- diff --git a/server/data/data-memory/pom.xml b/server/data/data-memory/pom.xml index 989cae5..8e14a9e 100644 --- a/server/data/data-memory/pom.xml +++ b/server/data/data-memory/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server</artifactId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/dns-service/dnsservice-api/pom.xml ---------------------------------------------------------------------- diff --git a/server/dns-service/dnsservice-api/pom.xml b/server/dns-service/dnsservice-api/pom.xml index 23ba212..ee85f8c 100644 --- a/server/dns-service/dnsservice-api/pom.xml +++ b/server/dns-service/dnsservice-api/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server</artifactId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/dns-service/dnsservice-dnsjava/pom.xml ---------------------------------------------------------------------- diff --git a/server/dns-service/dnsservice-dnsjava/pom.xml b/server/dns-service/dnsservice-dnsjava/pom.xml index 7dda33a..25d01b1 100644 --- a/server/dns-service/dnsservice-dnsjava/pom.xml +++ b/server/dns-service/dnsservice-dnsjava/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server</artifactId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/dns-service/dnsservice-library/pom.xml ---------------------------------------------------------------------- diff --git a/server/dns-service/dnsservice-library/pom.xml b/server/dns-service/dnsservice-library/pom.xml index 0f2b6c1..0c7c4e2 100644 --- a/server/dns-service/dnsservice-library/pom.xml +++ b/server/dns-service/dnsservice-library/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server</artifactId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/karaf/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/server/karaf/distribution/pom.xml b/server/karaf/distribution/pom.xml index 0729dbf..8614e16 100644 --- a/server/karaf/distribution/pom.xml +++ b/server/karaf/distribution/pom.xml @@ -3,8 +3,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server</artifactId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -30,8 +30,8 @@ <groupId>org.apache.karaf.assemblies.features</groupId> <artifactId>standard</artifactId> <version>${karaf.version}</version> - <type>xml</type> <classifier>features</classifier> + <type>xml</type> </dependency> </dependencies> @@ -49,21 +49,21 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> + <configuration> + <useDefaultDelimiters>false</useDefaultDelimiters> + <delimiters> + <delimiter>${*}</delimiter> + </delimiters> + </configuration> <executions> <execution> <id>filter</id> - <phase>generate-resources</phase> <goals> <goal>resources</goal> </goals> + <phase>generate-resources</phase> </execution> </executions> - <configuration> - <useDefaultDelimiters>false</useDefaultDelimiters> - <delimiters> - <delimiter>${*}</delimiter> - </delimiters> - </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -72,10 +72,10 @@ <execution> <!-- Uncompress the standard Karaf distribution --> <id>unpack</id> - <phase>generate-resources</phase> <goals> <goal>unpack</goal> </goals> + <phase>generate-resources</phase> <configuration> <artifactItems> <artifactItem> @@ -96,10 +96,10 @@ <executions> <execution> <id>bin</id> - <phase>package</phase> <goals> <goal>single</goal> </goals> + <phase>package</phase> <configuration> <descriptors> <descriptor>src/main/assembly/unix.xml</descriptor> @@ -117,10 +117,10 @@ <executions> <execution> <id>add-features-to-repo</id> - <phase>install</phase> <goals> <goal>add-features-to-repo</goal> </goals> + <phase>install</phase> <inherited>false</inherited> <configuration> <descriptors> http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/karaf/features/pom.xml ---------------------------------------------------------------------- diff --git a/server/karaf/features/pom.xml b/server/karaf/features/pom.xml index c8627f6..9d16221 100644 --- a/server/karaf/features/pom.xml +++ b/server/karaf/features/pom.xml @@ -3,8 +3,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server</artifactId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -37,10 +37,10 @@ <executions> <execution> <id>filter</id> - <phase>generate-resources</phase> <goals> <goal>resources</goal> </goals> + <phase>generate-resources</phase> </execution> </executions> </plugin> @@ -71,10 +71,10 @@ <executions> <execution> <id>attach-artifacts</id> - <phase>package</phase> <goals> <goal>attach-artifact</goal> </goals> + <phase>package</phase> <configuration> <artifacts> <artifact> http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/karaf/integration/pom.xml ---------------------------------------------------------------------- diff --git a/server/karaf/integration/pom.xml b/server/karaf/integration/pom.xml index 3bcc628..a11994c 100644 --- a/server/karaf/integration/pom.xml +++ b/server/karaf/integration/pom.xml @@ -3,8 +3,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server</artifactId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -38,12 +38,12 @@ <scope>test</scope> <exclusions> <exclusion> - <artifactId>org.apache.karaf.client</artifactId> <groupId>org.apache.karaf</groupId> + <artifactId>org.apache.karaf.client</artifactId> </exclusion> <exclusion> - <artifactId>org.eclipse.osgi</artifactId> <groupId>org.eclipse.osgi</groupId> + <artifactId>org.eclipse.osgi</artifactId> </exclusion> </exclusions> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/mailet/integration-testing/pom.xml ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/pom.xml b/server/mailet/integration-testing/pom.xml index 3d0cf1a..82b5000 100644 --- a/server/mailet/integration-testing/pom.xml +++ b/server/mailet/integration-testing/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server</artifactId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/mailet/mailetcontainer-api/pom.xml ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-api/pom.xml b/server/mailet/mailetcontainer-api/pom.xml index 70e8efc..a243ea6 100644 --- a/server/mailet/mailetcontainer-api/pom.xml +++ b/server/mailet/mailetcontainer-api/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server</artifactId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/mailet/mailetcontainer-camel/pom.xml ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-camel/pom.xml b/server/mailet/mailetcontainer-camel/pom.xml index 9a16ed0..4e4ad64 100644 --- a/server/mailet/mailetcontainer-camel/pom.xml +++ b/server/mailet/mailetcontainer-camel/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server</artifactId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/mailet/mailets/pom.xml ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/pom.xml b/server/mailet/mailets/pom.xml index 0b28f93..bf5dda9 100644 --- a/server/mailet/mailets/pom.xml +++ b/server/mailet/mailets/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server</artifactId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/pom.xml ---------------------------------------------------------------------- diff --git a/server/pom.xml b/server/pom.xml index 447d851..a1d76bb 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -24,8 +24,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-project</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-project</artifactId> <version>3.1.0-SNAPSHOT</version> </parent> http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/protocols/fetchmail/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/fetchmail/pom.xml b/server/protocols/fetchmail/pom.xml index 388de19..a2b603d 100644 --- a/server/protocols/fetchmail/pom.xml +++ b/server/protocols/fetchmail/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server</artifactId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml index 8ac2e49..f8831a5 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>jmap-integration-testing</artifactId> <groupId>org.apache.james</groupId> + <artifactId>jmap-integration-testing</artifactId> <version>3.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/protocols/jmap-integration-testing/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/pom.xml b/server/protocols/jmap-integration-testing/pom.xml index 906fc2c..c684796 100644 --- a/server/protocols/jmap-integration-testing/pom.xml +++ b/server/protocols/jmap-integration-testing/pom.xml @@ -22,8 +22,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server</artifactId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/protocols/jmap/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/pom.xml b/server/protocols/jmap/pom.xml index 7674f20..087c516 100644 --- a/server/protocols/jmap/pom.xml +++ b/server/protocols/jmap/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server</artifactId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/protocols/jwt/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jwt/pom.xml b/server/protocols/jwt/pom.xml index f5cf54c..54e804c 100644 --- a/server/protocols/jwt/pom.xml +++ b/server/protocols/jwt/pom.xml @@ -20,8 +20,8 @@ <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/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server</artifactId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/protocols/protocols-imap4/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-imap4/pom.xml b/server/protocols/protocols-imap4/pom.xml index 9dcfa66..c3fdc1c 100644 --- a/server/protocols/protocols-imap4/pom.xml +++ b/server/protocols/protocols-imap4/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server</artifactId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/protocols/protocols-library/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-library/pom.xml b/server/protocols/protocols-library/pom.xml index 083d05a..67f8575 100644 --- a/server/protocols/protocols-library/pom.xml +++ b/server/protocols/protocols-library/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server</artifactId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -47,8 +47,8 @@ <artifactId>james-server-util</artifactId> <exclusions> <exclusion> - <artifactId>mail</artifactId> <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> </exclusion> </exclusions> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/protocols/protocols-lmtp/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-lmtp/pom.xml b/server/protocols/protocols-lmtp/pom.xml index 4c141ef..fc54d39 100644 --- a/server/protocols/protocols-lmtp/pom.xml +++ b/server/protocols/protocols-lmtp/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server</artifactId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -62,20 +62,20 @@ <artifactId>james-server-protocols-smtp</artifactId> <exclusions> <exclusion> - <artifactId>james-server-dnsservice-api</artifactId> <groupId>${project.groupId}</groupId> + <artifactId>james-server-dnsservice-api</artifactId> </exclusion> <exclusion> - <artifactId>james-server-dnsservice-library</artifactId> <groupId>${project.groupId}</groupId> + <artifactId>james-server-dnsservice-library</artifactId> </exclusion> <exclusion> - <artifactId>james-server-queue-api</artifactId> <groupId>${project.groupId}</groupId> + <artifactId>james-server-queue-api</artifactId> </exclusion> <exclusion> - <artifactId>apache-jspf-resolver</artifactId> <groupId>org.apache.james.jspf</groupId> + <artifactId>apache-jspf-resolver</artifactId> </exclusion> </exclusions> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/protocols/protocols-managesieve/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-managesieve/pom.xml b/server/protocols/protocols-managesieve/pom.xml index f11516c..e26d118 100644 --- a/server/protocols/protocols-managesieve/pom.xml +++ b/server/protocols/protocols-managesieve/pom.xml @@ -2,8 +2,8 @@ <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/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server</artifactId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/protocols/protocols-pop3/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-pop3/pom.xml b/server/protocols/protocols-pop3/pom.xml index c331032..c0fd0a5 100644 --- a/server/protocols/protocols-pop3/pom.xml +++ b/server/protocols/protocols-pop3/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server</artifactId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/protocols/protocols-smtp/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/pom.xml b/server/protocols/protocols-smtp/pom.xml index e0bb722..2dd30c7 100644 --- a/server/protocols/protocols-smtp/pom.xml +++ b/server/protocols/protocols-smtp/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server</artifactId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/protocols/webadmin-integration-test/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin-integration-test/pom.xml b/server/protocols/webadmin-integration-test/pom.xml index 6566433..693e3ea 100644 --- a/server/protocols/webadmin-integration-test/pom.xml +++ b/server/protocols/webadmin-integration-test/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server</artifactId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/protocols/webadmin/webadmin-cassandra/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-cassandra/pom.xml b/server/protocols/webadmin/webadmin-cassandra/pom.xml index f336eb7..05e89ba 100644 --- a/server/protocols/webadmin/webadmin-cassandra/pom.xml +++ b/server/protocols/webadmin/webadmin-cassandra/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server</artifactId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/protocols/webadmin/webadmin-core/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-core/pom.xml b/server/protocols/webadmin/webadmin-core/pom.xml index e3b1c74..80052a1 100644 --- a/server/protocols/webadmin/webadmin-core/pom.xml +++ b/server/protocols/webadmin/webadmin-core/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server</artifactId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/protocols/webadmin/webadmin-data/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-data/pom.xml b/server/protocols/webadmin/webadmin-data/pom.xml index 51bc1d6..fc67952 100644 --- a/server/protocols/webadmin/webadmin-data/pom.xml +++ b/server/protocols/webadmin/webadmin-data/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server</artifactId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/protocols/webadmin/webadmin-mailbox/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/pom.xml b/server/protocols/webadmin/webadmin-mailbox/pom.xml index 12e1a48..13b8b4d 100644 --- a/server/protocols/webadmin/webadmin-mailbox/pom.xml +++ b/server/protocols/webadmin/webadmin-mailbox/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server</artifactId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/protocols/webadmin/webadmin-swagger/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-swagger/pom.xml b/server/protocols/webadmin/webadmin-swagger/pom.xml index a2a7bce..9d5d97b 100644 --- a/server/protocols/webadmin/webadmin-swagger/pom.xml +++ b/server/protocols/webadmin/webadmin-swagger/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server</artifactId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> @@ -32,7 +32,6 @@ <name>Apache James :: Server :: Web Admin :: Swagger</name> - <dependencies> <dependency> <groupId>${project.groupId}</groupId> http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/queue/queue-activemq/pom.xml ---------------------------------------------------------------------- diff --git a/server/queue/queue-activemq/pom.xml b/server/queue/queue-activemq/pom.xml index b5d680d..952d425 100644 --- a/server/queue/queue-activemq/pom.xml +++ b/server/queue/queue-activemq/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server</artifactId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/queue/queue-api/pom.xml ---------------------------------------------------------------------- diff --git a/server/queue/queue-api/pom.xml b/server/queue/queue-api/pom.xml index f71380e..1627ca5 100644 --- a/server/queue/queue-api/pom.xml +++ b/server/queue/queue-api/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server</artifactId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/queue/queue-file/pom.xml ---------------------------------------------------------------------- diff --git a/server/queue/queue-file/pom.xml b/server/queue/queue-file/pom.xml index 3cd82a5..eb7020c 100644 --- a/server/queue/queue-file/pom.xml +++ b/server/queue/queue-file/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server</artifactId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/queue/queue-jms/pom.xml ---------------------------------------------------------------------- diff --git a/server/queue/queue-jms/pom.xml b/server/queue/queue-jms/pom.xml index 8d6268e..ce3d955 100644 --- a/server/queue/queue-jms/pom.xml +++ b/server/queue/queue-jms/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server</artifactId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/testing/pom.xml ---------------------------------------------------------------------- diff --git a/server/testing/pom.xml b/server/testing/pom.xml index ecc441c..3836069 100644 --- a/server/testing/pom.xml +++ b/server/testing/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server</artifactId> <version>3.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/src/site/xdoc/contribute.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/contribute.xml b/src/site/xdoc/contribute.xml index bf1238b..7783cfc 100644 --- a/src/site/xdoc/contribute.xml +++ b/src/site/xdoc/contribute.xml @@ -275,7 +275,7 @@ Hopefully, some tools are doing this sorting for you:</li> </ul> <pre> - <code>mvn com.github.ekryd.sortpom:sortpom-maven-plugin:sort -Dsort.keepBlankLines -Dsort.sortDependencies=groupId,artifactId -Dsort.nrOfIndentSpace=4 -Dsort.createBackupFile=false -Dsort.sortModules=true -Dsort.expandEmptyElements=false</code> + <code>mvn com.github.ekryd.sortpom:sortpom-maven-plugin:sort -Dsort.keepBlankLines -Dsort.sortDependencies=groupId,artifactId -Dsort.nrOfIndentSpace=4 -Dsort.createBackupFile=false -Dsort.sortModules=true -Dsort.expandEmptyElements=false -Dsort.predefinedSortOrder="recommended_2008_06"</code> </pre> <p>You should also split multiple attributes each on a new line.</p> <p>You should ensure your POM files, as well as sections ordering follows the <a href="http://maven.apache.org/ref/3.0.3/maven-model/maven.html";>Maven Model</a></p> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
