james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From adup...@apache.org
Subject [03/11] james-project git commit: Revert "JAMES-1862 Upgrade testcontainers"
Date Tue, 06 Dec 2016 10:42:08 GMT
Revert "JAMES-1862 Upgrade testcontainers"

This reverts commit c704a92479af450114b69f28ea9abbc5387a6c86.


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/ae47b3b1
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/ae47b3b1
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/ae47b3b1

Branch: refs/heads/master
Commit: ae47b3b1662fe96edc89710c49197a7fccd2aebf
Parents: 152e69a
Author: Antoine Duprat <aduprat@apache.org>
Authored: Tue Dec 6 11:41:06 2016 +0100
Committer: Antoine Duprat <aduprat@apache.org>
Committed: Tue Dec 6 11:41:06 2016 +0100

----------------------------------------------------------------------
 .../src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java  | 3 +--
 mpt/pom.xml                                                       | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/ae47b3b1/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java
b/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java
index e27c9e0..46214b2 100644
--- a/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java
+++ b/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/ForwardSmtpTest.java
@@ -52,7 +52,7 @@ public class ForwardSmtpTest extends AbstractSimpleScriptedTestProtocol
{
     public static final String PASSWORD = "secret";
 
     private final TemporaryFolder folder = new TemporaryFolder();
-    private final GenericContainer<?> fakeSmtp = new SwarmGenericContainer("weave/rest-smtp-sink:latest")
+    private final GenericContainer fakeSmtp = new SwarmGenericContainer("weave/rest-smtp-sink:latest")
             .withAffinityToContainer();
     
     @Rule
@@ -66,7 +66,6 @@ public class ForwardSmtpTest extends AbstractSimpleScriptedTestProtocol
{
     }
 
     @Before
-    @SuppressWarnings("deprecation")
     public void setUp() throws Exception {
         super.setUp();
         InetAddress containerIp = InetAddresses.forString(fakeSmtp.getContainerInfo().getNetworkSettings().getIpAddress());

http://git-wip-us.apache.org/repos/asf/james-project/blob/ae47b3b1/mpt/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/pom.xml b/mpt/pom.xml
index a8feadb..99375bb 100644
--- a/mpt/pom.xml
+++ b/mpt/pom.xml
@@ -472,7 +472,7 @@
             <dependency>
                 <groupId>org.testcontainers</groupId>
                 <artifactId>testcontainers</artifactId>
-                <version>1.1.7</version>
+                <version>1.0.2</version>
             </dependency>
         </dependencies>
     </dependencyManagement>


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message