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 bt...@apache.org on 2017/08/25 11:21:48 UTC
[23/29] james-project git commit: JAMES-2124 Post rebase sort
JAMES-2124 Post rebase sort
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/435c5e64
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/435c5e64
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/435c5e64
Branch: refs/heads/master
Commit: 435c5e64384bd70ae778f64a0b2a80e65454f6dc
Parents: f8f540a
Author: benwa <bt...@linagora.com>
Authored: Thu Aug 24 15:21:54 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Aug 25 18:18:14 2017 +0700
----------------------------------------------------------------------
protocols/netty/pom.xml | 8 ++++----
server/container/guice/es-metric-reporter/pom.xml | 12 +++++-------
server/container/guice/jpa-smtp/pom.xml | 8 ++++----
server/mailet/mailetcontainer-camel/pom.xml | 8 ++++----
server/protocols/protocols-managesieve/pom.xml | 8 ++++----
5 files changed, 21 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/435c5e64/protocols/netty/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/netty/pom.xml b/protocols/netty/pom.xml
index 4c028ef..fe74d47 100644
--- a/protocols/netty/pom.xml
+++ b/protocols/netty/pom.xml
@@ -39,10 +39,6 @@
<artifactId>protocols-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-util-java8</artifactId>
- </dependency>
- <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
@@ -56,6 +52,10 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-util-java8</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/435c5e64/server/container/guice/es-metric-reporter/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/es-metric-reporter/pom.xml b/server/container/guice/es-metric-reporter/pom.xml
index 171f012..ffe890b 100644
--- a/server/container/guice/es-metric-reporter/pom.xml
+++ b/server/container/guice/es-metric-reporter/pom.xml
@@ -17,15 +17,13 @@
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/xsd/maven-4.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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -39,11 +37,11 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-lifecycle-api</artifactId>
+ <artifactId>james-server-guice-common</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-guice-common</artifactId>
+ <artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -63,4 +61,4 @@
<artifactId>commons-configuration</artifactId>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/435c5e64/server/container/guice/jpa-smtp/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-smtp/pom.xml b/server/container/guice/jpa-smtp/pom.xml
index 1d6e2b5..f180685 100644
--- a/server/container/guice/jpa-smtp/pom.xml
+++ b/server/container/guice/jpa-smtp/pom.xml
@@ -85,15 +85,15 @@
<artifactId>logback-classic</artifactId>
</dependency>
<dependency>
- <groupId>com.internetitem</groupId>
- <artifactId>logback-elasticsearch-appender</artifactId>
- </dependency>
- <dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>com.internetitem</groupId>
+ <artifactId>logback-elasticsearch-appender</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.jayway.awaitility</groupId>
<artifactId>awaitility</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/435c5e64/server/mailet/mailetcontainer-camel/pom.xml
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/pom.xml b/server/mailet/mailetcontainer-camel/pom.xml
index 4e4ad64..539ba09 100644
--- a/server/mailet/mailetcontainer-camel/pom.xml
+++ b/server/mailet/mailetcontainer-camel/pom.xml
@@ -79,10 +79,6 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-util-java8</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>james-server-mailetcontainer-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
@@ -97,6 +93,10 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>james-server-util-java8</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>metrics-api</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/435c5e64/server/protocols/protocols-managesieve/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-managesieve/pom.xml b/server/protocols/protocols-managesieve/pom.xml
index e26d118..201ef1e 100644
--- a/server/protocols/protocols-managesieve/pom.xml
+++ b/server/protocols/protocols-managesieve/pom.xml
@@ -22,10 +22,6 @@
<artifactId>james-server-protocols-library</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-util-java8</artifactId>
- </dependency>
- <dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
</dependency>
@@ -46,6 +42,10 @@
<artifactId>geronimo-annotation_1.1_spec</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-util-java8</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.james.protocols</groupId>
<artifactId>protocols-managesieve</artifactId>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org