This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 3ab17cbee478d282ca7444d5eae3f0477f05bb59
Author: Jacob Barrett <jbarr...@pivotal.io>
AuthorDate: Tue Jul 3 10:05:27 2018 -0700
GEODE-5363: Cleanup dependencies and format.
---
extensions/geode-modules-session/build.gradle | 2 ++
extensions/geode-modules-tomcat7/build.gradle | 2 ++
extensions/geode-modules-tomcat8/build.gradle | 1 +
extensions/geode-modules/build.gradle | 2 ++
geode-assembly/build.gradle | 3 +++
geode-connectors/build.gradle | 2 ++
.../index/IndexTrackingQueryObserverDUnitTest.java | 3 ++-
.../org/apache/geode/cache/query/dunit/TestObject.java | 15 +++++++++++++++
.../cache/query/internal/index/IndexTrackingTestHook.java | 15 +++++++++++++++
.../apache/geode/internal/DataSerializableJUnitTest.java | 8 +++++++-
10 files changed, 51 insertions(+), 2 deletions(-)
diff --git a/extensions/geode-modules-session/build.gradle
b/extensions/geode-modules-session/build.gradle
index 81adfea..5d455ef 100644
--- a/extensions/geode-modules-session/build.gradle
+++ b/extensions/geode-modules-session/build.gradle
@@ -15,6 +15,8 @@
* limitations under the License.
*/
+evaluationDependsOn(":geode-core")
+
dependencies {
compile project(':extensions/geode-modules-session-internal')
compile project(':geode-core')
diff --git a/extensions/geode-modules-tomcat7/build.gradle
b/extensions/geode-modules-tomcat7/build.gradle
index 63ebdd9..7e5b411 100644
--- a/extensions/geode-modules-tomcat7/build.gradle
+++ b/extensions/geode-modules-tomcat7/build.gradle
@@ -15,6 +15,8 @@
* limitations under the License.
*/
+evaluationDependsOn(":geode-core")
+
dependencies {
compile(project(':extensions/geode-modules')) {
// Remove everything related to Tomcat 6.x
diff --git a/extensions/geode-modules-tomcat8/build.gradle
b/extensions/geode-modules-tomcat8/build.gradle
index f837fc0..0b82b5b 100644
--- a/extensions/geode-modules-tomcat8/build.gradle
+++ b/extensions/geode-modules-tomcat8/build.gradle
@@ -15,6 +15,7 @@
* limitations under the License.
*/
+evaluationDependsOn(":geode-core")
dependencies {
compile(project(':extensions/geode-modules')) {
diff --git a/extensions/geode-modules/build.gradle
b/extensions/geode-modules/build.gradle
index 0986f85..ed007a4 100644
--- a/extensions/geode-modules/build.gradle
+++ b/extensions/geode-modules/build.gradle
@@ -15,6 +15,8 @@
* limitations under the License.
*/
+evaluationDependsOn(":geode-core")
+
dependencies {
compile project(':geode-core')
diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
index 3d3f469..8319b09 100755
--- a/geode-assembly/build.gradle
+++ b/geode-assembly/build.gradle
@@ -14,8 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
import org.gradle.api.internal.artifacts.publish.ArchivePublishArtifact;
+evaluationDependsOn(":geode-core")
+
apply plugin: 'distribution'
// disable artifact generation for this project
diff --git a/geode-connectors/build.gradle b/geode-connectors/build.gradle
index f9e4c88..22a265f 100644
--- a/geode-connectors/build.gradle
+++ b/geode-connectors/build.gradle
@@ -15,6 +15,8 @@
* limitations under the License.
*/
+evaluationDependsOn(":geode-core")
+
repositories {
maven {
url 'https://dl.bintray.com/palantir/releases'
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java
index 7992b54..0c2c92f 100644
---
a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java
+++
b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java
@@ -186,7 +186,8 @@ public class IndexTrackingQueryObserverDUnitTest extends
JUnit4CacheTestCase {
Index keyIndex1 = null;
try {
if (create) {
- keyIndex1 = (IndexProtocol)
qs.createIndex(IndexTrackingTestHook.INDEX_NAME, IndexType.FUNCTIONAL, "ID",
+ keyIndex1 = (IndexProtocol)
qs.createIndex(IndexTrackingTestHook.INDEX_NAME,
+ IndexType.FUNCTIONAL, "ID",
"/portfolio ");
assertNotNull(keyIndex1);
assertTrue(keyIndex1 instanceof PartitionedIndex);
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/dunit/TestObject.java
b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/dunit/TestObject.java
index 91b7353..52e0c78 100644
---
a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/dunit/TestObject.java
+++
b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/dunit/TestObject.java
@@ -1,3 +1,18 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express
+ * or implied. See the License for the specific language governing permissions
and limitations under
+ * the License.
+ */
+
package org.apache.geode.cache.query.dunit;
import java.io.DataInput;
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingTestHook.java
b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingTestHook.java
index 612e8c1..c228f07 100644
---
a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingTestHook.java
+++
b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingTestHook.java
@@ -1,3 +1,18 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express
+ * or implied. See the License for the specific language governing permissions
and limitations under
+ * the License.
+ */
+
package org.apache.geode.cache.query.internal.index;
import static org.junit.Assert.assertEquals;
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/DataSerializableJUnitTest.java
b/geode-core/src/test/java/org/apache/geode/internal/DataSerializableJUnitTest.java
index 5ffd100..5b7cfb5 100755
---
a/geode-core/src/test/java/org/apache/geode/internal/DataSerializableJUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/DataSerializableJUnitTest.java
@@ -14,6 +14,13 @@
*/
package org.apache.geode.internal;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.DataInput;
@@ -49,7 +56,6 @@ import java.util.UUID;
import java.util.Vector;
import java.util.concurrent.TimeUnit;
-import static org.junit.Assert.*;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule;
