You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ud...@apache.org on 2016/09/26 21:01:22 UTC
[1/5] incubator-geode git commit: Fixing spring repo location for
spark connector
Repository: incubator-geode
Updated Branches:
refs/heads/feature/GEODE-1801 e29b7752a -> 4609eace0
Fixing spring repo location for spark connector
The spark connector was pointing to a defunct spring repository.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/4f34424b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/4f34424b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/4f34424b
Branch: refs/heads/feature/GEODE-1801
Commit: 4f34424bb380ed7a53fc332f365423213acffdb7
Parents: a1938b3
Author: Dan Smith <up...@apache.org>
Authored: Fri Sep 23 16:39:41 2016 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Fri Sep 23 16:39:41 2016 -0700
----------------------------------------------------------------------
geode-spark-connector/project/Settings.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4f34424b/geode-spark-connector/project/Settings.scala
----------------------------------------------------------------------
diff --git a/geode-spark-connector/project/Settings.scala b/geode-spark-connector/project/Settings.scala
index 8cfe38f..c6852a6 100644
--- a/geode-spark-connector/project/Settings.scala
+++ b/geode-spark-connector/project/Settings.scala
@@ -30,7 +30,7 @@ object Settings extends Build {
lazy val gfcResolvers = Seq(
//"GemStone Official Release" at "http://dist.gemstone.com/maven/release",
- "Repo for JLine" at "http://repo.springsource.org/libs-release",
+ "Repo for JLine" at "http://repo.spring.io/libs-release",
"Local Maven" at Path.userHome.asFile.toURI.toURL + ".m2/repository",
"Apache Snapshots" at "https://repository.apache.org/content/repositories/snapshots/"
//"Apache Repository" at "https://repository.apache.org/content/repositories/releases/",
[3/5] incubator-geode git commit: Excluding .idea project for the
geode-spark-connector from rat
Posted by ud...@apache.org.
Excluding .idea project for the geode-spark-connector from rat
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/da935065
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/da935065
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/da935065
Branch: refs/heads/feature/GEODE-1801
Commit: da935065b552d6bc52901df95fc1b0062f76a11f
Parents: 71eb6bf
Author: Dan Smith <up...@apache.org>
Authored: Fri Sep 23 17:11:27 2016 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Fri Sep 23 17:11:27 2016 -0700
----------------------------------------------------------------------
gradle/rat.gradle | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/da935065/gradle/rat.gradle
----------------------------------------------------------------------
diff --git a/gradle/rat.gradle b/gradle/rat.gradle
index 0c09c68..7e20c56 100644
--- a/gradle/rat.gradle
+++ b/gradle/rat.gradle
@@ -60,6 +60,7 @@ rat {
'**/*.ipr',
'**/*.iws',
'.idea/**',
+ 'geode-spark-connector/.idea/**',
'**/tags',
// text files
[5/5] incubator-geode git commit: Merge branch 'develop' into
feature/GEODE-1801
Posted by ud...@apache.org.
Merge branch 'develop' into feature/GEODE-1801
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/4609eace
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/4609eace
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/4609eace
Branch: refs/heads/feature/GEODE-1801
Commit: 4609eace077ccbb3cdd8bc83460c210032bfa75d
Parents: e29b775 6555c31
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Tue Sep 27 07:01:02 2016 +1000
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Tue Sep 27 07:01:02 2016 +1000
----------------------------------------------------------------------
.../geode/internal/net/SSLConfigurationFactory.java | 2 +-
.../java/org/apache/geode/internal/net/SocketCreator.java | 2 +-
.../internal/configuration/domain/XmlEntity.java | 10 +++++-----
.../org/apache/geode/pdx/internal/PdxInstanceImpl.java | 6 +++---
geode-examples/gradle.properties | 4 ++--
geode-spark-connector/project/Settings.scala | 2 +-
gradle/rat.gradle | 1 +
7 files changed, 14 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
[2/5] incubator-geode git commit: GEODE-1934: Removing spring-core
dependencies from geode-core
Posted by ud...@apache.org.
GEODE-1934: Removing spring-core dependencies from geode-core
Remving the spring-core usage in geode-core classes that are not cli or
web related. The CLI and web code needs to be split into separate
projects. The rest of the geode-core should not depend on spring-core.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/71eb6bfb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/71eb6bfb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/71eb6bfb
Branch: refs/heads/feature/GEODE-1801
Commit: 71eb6bfbc429e7cc226671c99f682ec4fb31115d
Parents: 4f34424
Author: Dan Smith <up...@apache.org>
Authored: Fri Sep 23 16:40:15 2016 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Fri Sep 23 16:40:15 2016 -0700
----------------------------------------------------------------------
.../geode/internal/net/SSLConfigurationFactory.java | 2 +-
.../java/org/apache/geode/internal/net/SocketCreator.java | 2 +-
.../internal/configuration/domain/XmlEntity.java | 10 +++++-----
.../org/apache/geode/pdx/internal/PdxInstanceImpl.java | 6 +++---
4 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/71eb6bfb/geode-core/src/main/java/org/apache/geode/internal/net/SSLConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/net/SSLConfigurationFactory.java b/geode-core/src/main/java/org/apache/geode/internal/net/SSLConfigurationFactory.java
index 4bea22b..4261248 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/net/SSLConfigurationFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/net/SSLConfigurationFactory.java
@@ -22,8 +22,8 @@ import java.util.Map;
import java.util.Properties;
import org.apache.commons.lang.ArrayUtils;
-import org.springframework.util.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.geode.GemFireConfigException;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.internal.admin.SSLConfig;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/71eb6bfb/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreator.java b/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreator.java
index bc1e896..50a3095 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreator.java
@@ -73,8 +73,8 @@ import javax.net.ssl.TrustManager;
import javax.net.ssl.TrustManagerFactory;
import javax.net.ssl.X509ExtendedKeyManager;
+import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.Logger;
-import org.springframework.util.StringUtils;
import org.apache.geode.GemFireConfigException;
import org.apache.geode.SystemConnectException;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/71eb6bfb/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java
index 47f032e..cde1607 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java
@@ -32,8 +32,8 @@ import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactoryConfigurationError;
import javax.xml.xpath.XPathExpressionException;
+import org.apache.geode.internal.Assert;
import org.apache.logging.log4j.Logger;
-import org.springframework.util.Assert;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.xml.sax.InputSource;
@@ -155,10 +155,10 @@ public class XmlEntity implements DataSerializable {
* @since GemFire 8.1
*/
private final void init() {
- Assert.hasLength(type, "Type cannot be empty");
- Assert.hasLength(prefix, "Prefix cannot be empty");
- Assert.hasLength(namespace, "Namespace cannot be empty");
- Assert.notNull(attributes, "Attributes cannot be null");
+ Assert.assertTrue(!StringUtils.isBlank(type));
+ Assert.assertTrue(!StringUtils.isBlank(prefix));
+ Assert.assertTrue(!StringUtils.isBlank(namespace));
+ Assert.assertTrue(attributes != null);
if (null == xmlDefinition) {
xmlDefinition = loadXmlDefinition();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/71eb6bfb/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxInstanceImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxInstanceImpl.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxInstanceImpl.java
index 10a11d2..b91f47a 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxInstanceImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxInstanceImpl.java
@@ -30,10 +30,10 @@ import java.util.List;
import java.util.SortedSet;
import java.util.TreeSet;
-import org.springframework.util.StringUtils;
-
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
+
+import org.apache.commons.lang.StringUtils;
import org.apache.geode.InternalGemFireException;
import org.apache.geode.distributed.internal.DMStats;
import org.apache.geode.internal.ClassPathLoader;
@@ -221,7 +221,7 @@ public class PdxInstanceImpl extends PdxReaderImpl implements PdxInstance, Senda
//introspect the JSON, does the @type meta-data exist.
String className = extractTypeMetaData();
- if(StringUtils.hasText(className)) {
+ if(StringUtils.isNotBlank(className)) {
try {
String JSON = JSONFormatter.toJSON(this);
ObjectMapper objMapper = USE_STATIC_MAPPER? mapper : createObjectMapper();
[4/5] incubator-geode git commit: Fixing the version of geode the
examples are trying to build against
Posted by ud...@apache.org.
Fixing the version of geode the examples are trying to build against
The examples were still pointing at the M3 snapshot.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/6555c312
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/6555c312
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/6555c312
Branch: refs/heads/feature/GEODE-1801
Commit: 6555c31203d5adfacaf4b6f5074db208f6f169a8
Parents: da93506
Author: Dan Smith <up...@apache.org>
Authored: Mon Sep 26 10:09:20 2016 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Mon Sep 26 10:09:20 2016 -0700
----------------------------------------------------------------------
geode-examples/gradle.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6555c312/geode-examples/gradle.properties
----------------------------------------------------------------------
diff --git a/geode-examples/gradle.properties b/geode-examples/gradle.properties
index 9c7822a..7aa1ef9 100644
--- a/geode-examples/gradle.properties
+++ b/geode-examples/gradle.properties
@@ -14,8 +14,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-geodeVersion = 1.0.0-incubating.M3-SNAPSHOT
+geodeVersion = 1.0.0-incubating-SNAPSHOT
junitVersion = 4.12
mockitocoreVersion = 1.10.19
commonsExecVersion = 1.3
-awaitilityVersion = 1.7.0
\ No newline at end of file
+awaitilityVersion = 1.7.0