You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by js...@apache.org on 2017/09/22 21:55:14 UTC
[geode] branch develop updated: Fix compilation failures from
rebase conflict
This is an automated email from the ASF dual-hosted git repository.
jstewart pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 1779a94 Fix compilation failures from rebase conflict
1779a94 is described below
commit 1779a942d70f432dbc78a8c32670d709310fd993
Author: Jared Stewart <js...@pivotal.io>
AuthorDate: Fri Sep 22 14:51:36 2017 -0700
Fix compilation failures from rebase conflict
---
.../geode/management/internal/cli/shell/GfshDisconnectWithinScript.java | 2 +-
.../apache/geode/rest/internal/web/RestInterfaceIntegrationTest.java | 2 +-
.../org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java | 2 +-
.../apache/geode/rest/internal/web/RestSecurityPostProcessorTest.java | 2 +-
.../org/apache/geode/rest/internal/web/RestSecurityWithSSLTest.java | 2 +-
.../org/apache/geode/rest/internal/web/RestServersIntegrationTest.java | 2 +-
.../geode/rest/internal/web/SwaggerVerificationIntegrationTest.java | 2 +-
.../internal/web/controllers/RestQueryAndFunctionIntegrationTest.java | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/shell/GfshDisconnectWithinScript.java b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/shell/GfshDisconnectWithinScript.java
index d25b23e..2b11b2c 100644
--- a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/shell/GfshDisconnectWithinScript.java
+++ b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/shell/GfshDisconnectWithinScript.java
@@ -19,8 +19,8 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.apache.geode.test.dunit.rules.gfsh.GfshRule;
import org.apache.geode.test.junit.categories.AcceptanceTest;
+import org.apache.geode.test.rules.gfsh.GfshRule;
@Category(AcceptanceTest.class)
public class GfshDisconnectWithinScript {
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestInterfaceIntegrationTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestInterfaceIntegrationTest.java
index 5bae86a..43f8f2e 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestInterfaceIntegrationTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestInterfaceIntegrationTest.java
@@ -75,9 +75,9 @@ import org.apache.geode.pdx.PdxReader;
import org.apache.geode.pdx.PdxSerializable;
import org.apache.geode.pdx.PdxWriter;
import org.apache.geode.pdx.ReflectionBasedAutoSerializer;
-import org.apache.geode.test.dunit.rules.RequiresGeodeHome;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.RestAPITest;
+import org.apache.geode.test.rules.RequiresGeodeHome;
/**
* The GemFireRestInterfaceTest class is a test suite of test cases testing the contract and
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java
index 3c99a26..66c9fa5 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java
@@ -32,11 +32,11 @@ import org.springframework.http.MediaType;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.security.TestSecurityManager;
-import org.apache.geode.test.dunit.rules.RequiresGeodeHome;
import org.apache.geode.test.dunit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.RestAPITest;
import org.apache.geode.test.junit.categories.SecurityTest;
+import org.apache.geode.test.rules.RequiresGeodeHome;
@Category({IntegrationTest.class, SecurityTest.class, RestAPITest.class})
public class RestSecurityIntegrationTest {
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityPostProcessorTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityPostProcessorTest.java
index 27eaa90..08d4448 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityPostProcessorTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityPostProcessorTest.java
@@ -40,11 +40,11 @@ import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.rest.internal.web.controllers.Customer;
import org.apache.geode.rest.internal.web.controllers.RedactingPostProcessor;
import org.apache.geode.security.TestSecurityManager;
-import org.apache.geode.test.dunit.rules.RequiresGeodeHome;
import org.apache.geode.test.dunit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.RestAPITest;
import org.apache.geode.test.junit.categories.SecurityTest;
+import org.apache.geode.test.rules.RequiresGeodeHome;
@Category({IntegrationTest.class, SecurityTest.class, RestAPITest.class})
public class RestSecurityPostProcessorTest {
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityWithSSLTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityWithSSLTest.java
index 1cb52a8..0d0f5c2 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityWithSSLTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityWithSSLTest.java
@@ -34,11 +34,11 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.internal.security.SecurableCommunicationChannel;
import org.apache.geode.security.SimpleTestSecurityManager;
-import org.apache.geode.test.dunit.rules.RequiresGeodeHome;
import org.apache.geode.test.dunit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.RestAPITest;
import org.apache.geode.test.junit.categories.SecurityTest;
+import org.apache.geode.test.rules.RequiresGeodeHome;
@Category({IntegrationTest.class, SecurityTest.class, RestAPITest.class})
public class RestSecurityWithSSLTest {
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestServersIntegrationTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestServersIntegrationTest.java
index 8cf74f7..7aecfe0 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestServersIntegrationTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestServersIntegrationTest.java
@@ -28,10 +28,10 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.internal.AvailablePort;
-import org.apache.geode.test.dunit.rules.RequiresGeodeHome;
import org.apache.geode.test.dunit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.RestAPITest;
+import org.apache.geode.test.rules.RequiresGeodeHome;
@Category({IntegrationTest.class, RestAPITest.class})
public class RestServersIntegrationTest {
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationIntegrationTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationIntegrationTest.java
index 2c25dbe..cedd8e0 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationIntegrationTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationIntegrationTest.java
@@ -20,11 +20,11 @@ import static org.junit.Assert.assertThat;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.security.SimpleTestSecurityManager;
-import org.apache.geode.test.dunit.rules.RequiresGeodeHome;
import org.apache.geode.test.dunit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.RestAPITest;
import org.apache.geode.test.junit.categories.SecurityTest;
+import org.apache.geode.test.rules.RequiresGeodeHome;
import org.apache.http.HttpResponse;
import org.json.JSONObject;
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestQueryAndFunctionIntegrationTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestQueryAndFunctionIntegrationTest.java
index d75b54d..5d4c2eb 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestQueryAndFunctionIntegrationTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestQueryAndFunctionIntegrationTest.java
@@ -72,9 +72,9 @@ import org.apache.geode.internal.GemFireVersion;
import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.management.internal.AgentUtil;
import org.apache.geode.management.internal.ManagementConstants;
-import org.apache.geode.test.dunit.rules.RequiresGeodeHome;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.RestAPITest;
+import org.apache.geode.test.rules.RequiresGeodeHome;
@Category({IntegrationTest.class, RestAPITest.class})
public class RestQueryAndFunctionIntegrationTest {
--
To stop receiving notification emails like this one, please contact
['"commits@geode.apache.org" <co...@geode.apache.org>'].