This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 6e89015fee56db193add5a7fe7535316c6e18366 Author: Jean Helou <[email protected]> AuthorDate: Mon Nov 16 14:20:30 2020 +0100 JAMES-1902 uses sortpom to fix pom dependencies ordering `src/site/xdoc` recommends to run `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"` to clean up poms I did it for blob and this commit addresses sort failures for `server/container/guice/queue` pom.xml which were incorrect in the previous PR and the `server/container/guice/queue` pom.xml --- server/container/guice/pom.xml | 20 ++++++++++---------- server/container/guice/queue/memory/pom.xml | 2 +- server/container/guice/queue/rabbitmq/pom.xml | 8 ++++---- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/server/container/guice/pom.xml b/server/container/guice/pom.xml index 31e2a18..f499ffe 100644 --- a/server/container/guice/pom.xml +++ b/server/container/guice/pom.xml @@ -56,8 +56,8 @@ <module>mailbox</module> <module>mailbox-plugin-deleted-messages-vault-guice</module> <module>mailbox-plugin-spamassassin</module> - <module>mailrepository-cassandra</module> <module>mailet</module> + <module>mailrepository-cassandra</module> <module>memory-guice</module> <module>onami</module> <module>protocols/imap</module> @@ -70,18 +70,18 @@ <module>protocols/webadmin</module> <module>protocols/webadmin-data</module> <module>protocols/webadmin-jmap</module> + <module>protocols/webadmin-mail-over-web</module> <module>protocols/webadmin-mailbox</module> <module>protocols/webadmin-mailqueue</module> <module>protocols/webadmin-mailrepository</module> <module>protocols/webadmin-rabbitmq-mailqueue</module> <module>protocols/webadmin-swagger</module> - <module>protocols/webadmin-mail-over-web</module> <module>queue/activemq</module> <module>queue/memory</module> <module>queue/rabbitmq</module> - <module>testing</module> <module>sieve-file</module> <module>sieve-jpa</module> + <module>testing</module> </modules> <dependencyManagement> @@ -201,12 +201,12 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-webadmin-rabbitmq-mailqueue</artifactId> + <artifactId>james-server-guice-webadmin-mailrepository</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-webadmin-mailrepository</artifactId> + <artifactId>james-server-guice-webadmin-rabbitmq-mailqueue</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -216,19 +216,19 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-jpa-common-guice</artifactId> + <artifactId>james-server-jmap-rfc-8621</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${james.groupId}</groupId> <artifactId>james-server-jpa-common-guice</artifactId> - <type>test-jar</type> <version>${project.version}</version> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-jmap-rfc-8621</artifactId> + <artifactId>james-server-jpa-common-guice</artifactId> <version>${project.version}</version> + <type>test-jar</type> </dependency> <dependency> <groupId>${james.groupId}</groupId> @@ -247,12 +247,12 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>queue-rabbitmq-guice</artifactId> + <artifactId>queue-memory-guice</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>queue-memory-guice</artifactId> + <artifactId>queue-rabbitmq-guice</artifactId> <version>${project.version}</version> </dependency> <dependency> diff --git a/server/container/guice/queue/memory/pom.xml b/server/container/guice/queue/memory/pom.xml index 0dbeb28..c4e3aa7 100644 --- a/server/container/guice/queue/memory/pom.xml +++ b/server/container/guice/queue/memory/pom.xml @@ -23,7 +23,7 @@ <groupId>org.apache.james</groupId> <artifactId>james-server-guice</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> + <relativePath>../../pom.xml</relativePath> </parent> <artifactId>queue-memory-guice</artifactId> diff --git a/server/container/guice/queue/rabbitmq/pom.xml b/server/container/guice/queue/rabbitmq/pom.xml index 2981294..35752dd 100644 --- a/server/container/guice/queue/rabbitmq/pom.xml +++ b/server/container/guice/queue/rabbitmq/pom.xml @@ -23,7 +23,7 @@ <groupId>org.apache.james</groupId> <artifactId>james-server-guice</artifactId> <version>3.6.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> + <relativePath>../../pom.xml</relativePath> </parent> <artifactId>queue-rabbitmq-guice</artifactId> @@ -46,15 +46,15 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-webadmin-rabbitmq</artifactId> + <artifactId>james-server-queue-api</artifactId> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-queue-api</artifactId> + <artifactId>james-server-queue-rabbitmq</artifactId> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-queue-rabbitmq</artifactId> + <artifactId>james-server-webadmin-rabbitmq</artifactId> </dependency> <dependency> <groupId>${james.groupId}</groupId> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
