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/16 09:34:47 UTC
[22/22] james-project git commit: JAMES-2107 Drop assertj version
prior Java 8
JAMES-2107 Drop assertj version prior Java 8
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/f40ce327
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/f40ce327
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/f40ce327
Branch: refs/heads/master
Commit: f40ce327cf78c455ea76aff5c229c27b25ed7c13
Parents: ef85411
Author: benwa <bt...@linagora.com>
Authored: Tue Aug 8 14:20:44 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Aug 16 16:33:00 2017 +0700
----------------------------------------------------------------------
backends-common/pom.xml | 4 ++--
mailbox/pom.xml | 4 ++--
mailet/pom.xml | 8 ++++----
metrics/pom.xml | 2 +-
mpt/pom.xml | 4 ++--
protocols/pom.xml | 4 ++--
server/pom.xml | 8 ++++----
7 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/f40ce327/backends-common/pom.xml
----------------------------------------------------------------------
diff --git a/backends-common/pom.xml b/backends-common/pom.xml
index 54e202e..e4a2b3c 100644
--- a/backends-common/pom.xml
+++ b/backends-common/pom.xml
@@ -34,7 +34,7 @@
<inceptionYear>2015</inceptionYear>
<properties>
- <assertj-3.version>3.2.0</assertj-3.version>
+ <assertj.version>3.2.0</assertj.version>
<junit.version>4.11</junit.version>
<slf4j.version>1.7.25</slf4j.version>
</properties>
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
- <version>${assertj-3.version}</version>
+ <version>${assertj.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/f40ce327/mailbox/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/pom.xml b/mailbox/pom.xml
index deb7713..ffacd09 100644
--- a/mailbox/pom.xml
+++ b/mailbox/pom.xml
@@ -106,7 +106,7 @@
<guava.version>18.0</guava.version>
<jackson-databinding.version>2.6.3</jackson-databinding.version>
<cassandra-unit.version>2.1.9.2</cassandra-unit.version>
- <assertj-3.version>3.2.0</assertj-3.version>
+ <assertj.version>3.2.0</assertj.version>
<logback.version>1.1.7</logback.version>
</properties>
@@ -484,7 +484,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
- <version>${assertj-3.version}</version>
+ <version>${assertj.version}</version>
</dependency>
<!--
END Testing
http://git-wip-us.apache.org/repos/asf/james-project/blob/f40ce327/mailet/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/pom.xml b/mailet/pom.xml
index af5934a..1106b35 100644
--- a/mailet/pom.xml
+++ b/mailet/pom.xml
@@ -54,8 +54,8 @@
<maven-reporting-api.version>3.0</maven-reporting-api.version>
<mime4j.version>0.8.1</mime4j.version>
<qdox.version>1.12.1</qdox.version>
- <assertj-3.version>3.3.0</assertj-3.version>
- <assertj-3-guava.version>3.1.0</assertj-3-guava.version>
+ <assertj.version>3.3.0</assertj.version>
+ <assertj-guava.version>3.1.0</assertj-guava.version>
<slf4j.version>1.7.25</slf4j.version>
<jackson-data.version>2.6.3</jackson-data.version>
<ical4j.version>2.0.2</ical4j.version>
@@ -186,13 +186,13 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
- <version>${assertj-3.version}</version>
+ <version>${assertj.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-guava</artifactId>
- <version>${assertj-3-guava.version}</version>
+ <version>${assertj-guava.version}</version>
</dependency>
<dependency>
<groupId>com.thoughtworks.qdox</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/f40ce327/metrics/pom.xml
----------------------------------------------------------------------
diff --git a/metrics/pom.xml b/metrics/pom.xml
index a5ced25..e820cdd 100644
--- a/metrics/pom.xml
+++ b/metrics/pom.xml
@@ -39,7 +39,7 @@
</modules>
<properties>
- <assertj-3.version>3.3.0</assertj-3.version>
+ <assertj.version>3.3.0</assertj.version>
<es.version>2.2.1</es.version>
<es-reporter.version>2.2.0</es-reporter.version>
<guava.version>18.0</guava.version>
http://git-wip-us.apache.org/repos/asf/james-project/blob/f40ce327/mpt/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/pom.xml b/mpt/pom.xml
index 3728aa8..38b088f 100644
--- a/mpt/pom.xml
+++ b/mpt/pom.xml
@@ -65,7 +65,7 @@
<log4j.version>1.2.16</log4j.version>
<lucene-core.version>3.6.0</lucene-core.version>
<slf4j.version>1.7.25</slf4j.version>
- <assertj-3.version>3.2.0</assertj-3.version>
+ <assertj.version>3.2.0</assertj.version>
<logback.version>1.1.7</logback.version>
</properties>
@@ -446,7 +446,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
- <version>${assertj-3.version}</version>
+ <version>${assertj.version}</version>
</dependency>
<dependency>
<groupId>org.jmock</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/f40ce327/protocols/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/pom.xml b/protocols/pom.xml
index 2e899a3..20ab218 100644
--- a/protocols/pom.xml
+++ b/protocols/pom.xml
@@ -59,7 +59,7 @@
<slf4j.version>1.7.25</slf4j.version>
<jsieve.version>0.7</jsieve.version>
<mockito-core.version>1.9.0</mockito-core.version>
- <assertj-3.version>3.2.0</assertj-3.version>
+ <assertj.version>3.2.0</assertj.version>
</properties>
<dependencyManagement>
@@ -264,7 +264,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
- <version>${assertj-3.version}</version>
+ <version>${assertj.version}</version>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/f40ce327/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index 86d3f16..0ae235f 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -182,8 +182,8 @@
<jackson-data.version>2.6.3</jackson-data.version>
<jetty.version>9.3.5.v20151012</jetty.version>
<cassandra-unit.version>2.1.9.2</cassandra-unit.version>
- <assertj-3-guava.version>3.1.0</assertj-3-guava.version>
- <assertj-3.version>3.3.0</assertj-3.version>
+ <assertj-guava.version>3.1.0</assertj-guava.version>
+ <assertj.version>3.3.0</assertj.version>
<testcontainers-version>1.3.1</testcontainers-version>
<guavate.version>1.0.0</guavate.version>
<metrics.version>3.2.1</metrics.version>
@@ -1191,12 +1191,12 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
- <version>${assertj-3.version}</version>
+ <version>${assertj.version}</version>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-guava</artifactId>
- <version>${assertj-3-guava.version}</version>
+ <version>${assertj-guava.version}</version>
</dependency>
<dependency>
<groupId>org.jmock</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org