You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2016/02/22 14:17:13 UTC
[01/12] incubator-tinkerpop git commit: Changed back slashes into
regular ones
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/tp31 f2972e877 -> f8cbe8fbb
Changed back slashes into regular ones
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/317d5c8a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/317d5c8a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/317d5c8a
Branch: refs/heads/tp31
Commit: 317d5c8a2ca1677d634fc9a983eae234e6f2f323
Parents: a6cfc3b
Author: Marvin Froeder <ma...@vizexplorer.com>
Authored: Mon Feb 1 17:39:13 2016 +1300
Committer: Marvin Froeder <ma...@vizexplorer.com>
Committed: Mon Feb 22 09:30:54 2016 +1300
----------------------------------------------------------------------
.../gremlin/spark/structure/io/SparkContextStorage.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/317d5c8a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/SparkContextStorage.java
----------------------------------------------------------------------
diff --git a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/SparkContextStorage.java b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/SparkContextStorage.java
index 76a3299..4b113a3 100644
--- a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/SparkContextStorage.java
+++ b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/SparkContextStorage.java
@@ -75,9 +75,9 @@ public final class SparkContextStorage implements Storage {
@Override
public List<String> ls(final String location) {
final List<String> rdds = new ArrayList<>();
- final String wildCardLocation = (location.endsWith("*") ? location : location + "*").replace(".", "\\.").replace("*", ".*");
+ final String wildCardLocation = (location.endsWith("*") ? location : location + "*").replace(".", "\\.").replace("*", ".*").replace('\\', '/');
for (final RDD<?> rdd : Spark.getRDDs()) {
- if (rdd.name().matches(wildCardLocation))
+ if (rdd.name().replace('\\', '/').matches(wildCardLocation))
rdds.add(rdd.name() + " [" + rdd.getStorageLevel().description() + "]");
}
return rdds;
@@ -103,9 +103,9 @@ public final class SparkContextStorage implements Storage {
@Override
public boolean rm(final String location) {
final List<String> rdds = new ArrayList<>();
- final String wildCardLocation = (location.endsWith("*") ? location : location + "*").replace(".", "\\.").replace("*", ".*");
+ final String wildCardLocation = (location.endsWith("*") ? location : location + "*").replace(".", "\\.").replace("*", ".*").replace('\\', '/');
for (final RDD<?> rdd : Spark.getRDDs()) {
- if (rdd.name().matches(wildCardLocation))
+ if (rdd.name().replace('\\', '/').matches(wildCardLocation))
rdds.add(rdd.name());
}
rdds.forEach(Spark::removeRDD);
[09/12] incubator-tinkerpop git commit: Fixed regex construction
Posted by sp...@apache.org.
Fixed regex construction
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/164fdace
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/164fdace
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/164fdace
Branch: refs/heads/tp31
Commit: 164fdace2e58e9632d8de4bba0fe8bea4c2bd5b2
Parents: 317d5c8
Author: Marvin Froeder <ma...@vizexplorer.com>
Authored: Wed Feb 3 09:17:11 2016 +1300
Committer: Marvin Froeder <ma...@vizexplorer.com>
Committed: Mon Feb 22 09:31:56 2016 +1300
----------------------------------------------------------------------
.../gremlin/spark/structure/io/SparkContextStorage.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/164fdace/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/SparkContextStorage.java
----------------------------------------------------------------------
diff --git a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/SparkContextStorage.java b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/SparkContextStorage.java
index 4b113a3..799c215 100644
--- a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/SparkContextStorage.java
+++ b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/structure/io/SparkContextStorage.java
@@ -75,7 +75,7 @@ public final class SparkContextStorage implements Storage {
@Override
public List<String> ls(final String location) {
final List<String> rdds = new ArrayList<>();
- final String wildCardLocation = (location.endsWith("*") ? location : location + "*").replace(".", "\\.").replace("*", ".*").replace('\\', '/');
+ final String wildCardLocation = (location.endsWith("*") ? location : location + "*").replace('\\', '/').replace(".", "\\.").replace("*", ".*");
for (final RDD<?> rdd : Spark.getRDDs()) {
if (rdd.name().replace('\\', '/').matches(wildCardLocation))
rdds.add(rdd.name() + " [" + rdd.getStorageLevel().description() + "]");
@@ -103,7 +103,7 @@ public final class SparkContextStorage implements Storage {
@Override
public boolean rm(final String location) {
final List<String> rdds = new ArrayList<>();
- final String wildCardLocation = (location.endsWith("*") ? location : location + "*").replace(".", "\\.").replace("*", ".*").replace('\\', '/');
+ final String wildCardLocation = (location.endsWith("*") ? location : location + "*").replace('\\', '/').replace(".", "\\.").replace("*", ".*");
for (final RDD<?> rdd : Spark.getRDDs()) {
if (rdd.name().replace('\\', '/').matches(wildCardLocation))
rdds.add(rdd.name());
[04/12] incubator-tinkerpop git commit: Ignoring rat on eclipse and
appveyor files
Posted by sp...@apache.org.
Ignoring rat on eclipse and appveyor files
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/92edead8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/92edead8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/92edead8
Branch: refs/heads/tp31
Commit: 92edead8ba8c34516e4ecc3febcf60a8be8a6024
Parents: c193d53
Author: Marvin H Froeder <ma...@vizexplorer.com>
Authored: Thu Jan 21 13:46:05 2016 +1300
Committer: Marvin Froeder <ma...@vizexplorer.com>
Committed: Mon Feb 22 09:30:54 2016 +1300
----------------------------------------------------------------------
pom.xml | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/92edead8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8f0bb2b..62eb81c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -264,6 +264,10 @@ limitations under the License.
<excludeSubProjects>false</excludeSubProjects>
<excludes>
<exclude>.travis.yml</exclude>
+ <exclude>appveyor.yml</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.settings/**</exclude>
<exclude>.repository/**</exclude>
<exclude>docs/static/**</exclude>
<exclude>**/target/**</exclude>
[07/12] incubator-tinkerpop git commit: Url separator is always /
even on windows
Posted by sp...@apache.org.
Url separator is always / even on windows
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/9d0c8770
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/9d0c8770
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/9d0c8770
Branch: refs/heads/tp31
Commit: 9d0c87707e828b2ff5dbf8ef3d60051deebb055d
Parents: 0715c4e
Author: Marvin Froeder <ma...@vizexplorer.com>
Authored: Mon Feb 1 13:15:33 2016 +1300
Committer: Marvin Froeder <ma...@vizexplorer.com>
Committed: Mon Feb 22 09:30:54 2016 +1300
----------------------------------------------------------------------
.../java/org/apache/tinkerpop/gremlin/TestHelper.java | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/9d0c8770/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/TestHelper.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/TestHelper.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/TestHelper.java
index 303b1e3..a3c252f 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/TestHelper.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/TestHelper.java
@@ -32,6 +32,8 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
import java.net.URL;
import java.util.Iterator;
import java.util.List;
@@ -50,6 +52,7 @@ import static org.junit.Assert.assertFalse;
public final class TestHelper {
private static final String SEP = File.separator;
+ private static final char URL_SEP = '/';
public static final String TEST_DATA_RELATIVE_DIR = "test-case-data";
private TestHelper() {
@@ -105,9 +108,14 @@ public final class TestHelper {
}
private static String computePath(final Class clazz) {
- final String clsUri = clazz.getName().replace('.', SEP.charAt(0)) + ".class";
+ final String clsUri = clazz.getName().replace('.', URL_SEP) + ".class";
final URL url = clazz.getClassLoader().getResource(clsUri);
- final String clsPath = url.getPath();
+ String clsPath;
+ try {
+ clsPath = new File(url.toURI()).getAbsolutePath();
+ } catch (URISyntaxException e) {
+ throw new RuntimeException("Unable to computePath for " + clazz, e);
+ }
return clsPath.substring(0, clsPath.length() - clsUri.length());
}
[03/12] incubator-tinkerpop git commit: Enabled build on windows
Posted by sp...@apache.org.
Enabled build on windows
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/c193d538
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/c193d538
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/c193d538
Branch: refs/heads/tp31
Commit: c193d538fd8ac9d7b70ca2d64e151a076f6e5138
Parents: 10c978d
Author: Marvin Froeder <ve...@gmail.com>
Authored: Thu Jan 21 13:33:56 2016 +1300
Committer: Marvin Froeder <ma...@vizexplorer.com>
Committed: Mon Feb 22 09:30:54 2016 +1300
----------------------------------------------------------------------
appveyor.yml | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c193d538/appveyor.yml
----------------------------------------------------------------------
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 0000000..92eae9f
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,23 @@
+version: '{build}'
+
+environment:
+ matrix:
+ - JAVA_HOME: C:\Program Files\Java\jdk1.8.0
+
+os: Windows Server 2012
+
+install:
+ - ps: |
+ Add-Type -AssemblyName System.IO.Compression.FileSystem
+ if (!(Test-Path -Path "C:\maven" )) {
+ (new-object System.Net.WebClient).DownloadFile('http://www.us.apache.org/dist/maven/maven-3/3.2.5/binaries/apache-maven-3.2.5-bin.zip', 'C:\maven-bin.zip')
+ [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\maven-bin.zip", "C:\maven")
+ }
+ - cmd: SET PATH=C:\maven\apache-maven-3.2.5\bin;%JAVA_HOME%\bin;%PATH%
+ - cmd: SET MAVEN_OPTS=-XX:MaxPermSize=2g -Xmx4g
+ - cmd: SET JAVA_OPTS=-XX:MaxPermSize=2g -Xmx4g
+ - cmd: mvn --version
+ - cmd: java -version
+
+build_script:
+ - mvn clean install -B -Dci
[05/12] incubator-tinkerpop git commit: Changed back slashes into
regular ones
Posted by sp...@apache.org.
Changed back slashes into regular ones
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/daa6379b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/daa6379b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/daa6379b
Branch: refs/heads/tp31
Commit: daa6379bef196acdbdc769c2a516f1750010f4cc
Parents: 9d0c877
Author: Marvin Froeder <ma...@vizexplorer.com>
Authored: Mon Feb 1 17:19:33 2016 +1300
Committer: Marvin Froeder <ma...@vizexplorer.com>
Committed: Mon Feb 22 09:30:54 2016 +1300
----------------------------------------------------------------------
.../apache/tinkerpop/gremlin/hadoop/HadoopGraphProvider.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/daa6379b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/HadoopGraphProvider.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/HadoopGraphProvider.java b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/HadoopGraphProvider.java
index 9600dad..4a6f06c 100644
--- a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/HadoopGraphProvider.java
+++ b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/HadoopGraphProvider.java
@@ -80,7 +80,7 @@ public class HadoopGraphProvider extends AbstractGraphProvider {
"tinkerpop-classic.kryo",
"tinkerpop-crew.kryo");
for (final String fileName : kryoResources) {
- PATHS.put(fileName, TestHelper.generateTempFileFromResource(GryoResourceAccess.class, fileName, "").getAbsolutePath());
+ PATHS.put(fileName, TestHelper.generateTempFileFromResource(GryoResourceAccess.class, fileName, "").getAbsolutePath().replace('\\', '/'));
}
final List<String> graphsonResources = Arrays.asList(
@@ -89,7 +89,7 @@ public class HadoopGraphProvider extends AbstractGraphProvider {
"tinkerpop-classic.json",
"tinkerpop-crew.json");
for (final String fileName : graphsonResources) {
- PATHS.put(fileName, TestHelper.generateTempFileFromResource(GraphSONResourceAccess.class, fileName, "").getAbsolutePath());
+ PATHS.put(fileName, TestHelper.generateTempFileFromResource(GraphSONResourceAccess.class, fileName, "").getAbsolutePath().replace('\\', '/'));
}
final List<String> scriptResources = Arrays.asList(
@@ -100,7 +100,7 @@ public class HadoopGraphProvider extends AbstractGraphProvider {
"script-input-grateful-dead.groovy",
"script-output-grateful-dead.groovy");
for (final String fileName : scriptResources) {
- PATHS.put(fileName, TestHelper.generateTempFileFromResource(ScriptResourceAccess.class, fileName, "").getAbsolutePath());
+ PATHS.put(fileName, TestHelper.generateTempFileFromResource(ScriptResourceAccess.class, fileName, "").getAbsolutePath().replace('\\', '/'));
}
} catch (Exception e) {
e.printStackTrace();
[06/12] incubator-tinkerpop git commit: TINKERPOP-1041 - give import
thread a chance to run
Posted by sp...@apache.org.
TINKERPOP-1041 - give import thread a chance to run
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/0715c4ef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/0715c4ef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/0715c4ef
Branch: refs/heads/tp31
Commit: 0715c4ef247351cdd994378273f7d1b3aba282a8
Parents: 92edead
Author: Marvin Froeder <ma...@vizexplorer.com>
Authored: Mon Feb 1 09:47:15 2016 +1300
Committer: Marvin Froeder <ma...@vizexplorer.com>
Committed: Mon Feb 22 09:30:54 2016 +1300
----------------------------------------------------------------------
.../tinkerpop/gremlin/groovy/engine/ScriptEnginesTest.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/0715c4ef/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/engine/ScriptEnginesTest.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/engine/ScriptEnginesTest.java b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/engine/ScriptEnginesTest.java
index eb45c0b..9a7e1bf 100644
--- a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/engine/ScriptEnginesTest.java
+++ b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/engine/ScriptEnginesTest.java
@@ -185,6 +185,7 @@ public class ScriptEnginesTest {
successes.incrementAndGet();
} catch (Exception ex) {
if (failures.incrementAndGet() == 500) threadImport.start();
+ Thread.yield();
}
})
);
@@ -194,8 +195,8 @@ public class ScriptEnginesTest {
threadEvalAndTriggerImport.join();
threadImport.join();
- assertTrue(successes.intValue() > 0);
- assertTrue(failures.intValue() >= 500);
+ assertTrue("Success: " + successes.intValue() + " - Failures: " + failures.intValue(), successes.intValue() > 0);
+ assertTrue("Success: " + successes.intValue() + " - Failures: " + failures.intValue(), failures.intValue() >= 500);
engines.close();
}
[10/12] incubator-tinkerpop git commit: Installing maven using choco
Posted by sp...@apache.org.
Installing maven using choco
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/bc58b8ba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/bc58b8ba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/bc58b8ba
Branch: refs/heads/tp31
Commit: bc58b8baa3debec17a076469894c0074afbaad1b
Parents: 884e45d
Author: Marvin Froeder <ve...@gmail.com>
Authored: Mon Feb 15 16:45:40 2016 +1300
Committer: Marvin Froeder <ma...@vizexplorer.com>
Committed: Mon Feb 22 11:29:00 2016 +1300
----------------------------------------------------------------------
appveyor.yml | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/bc58b8ba/appveyor.yml
----------------------------------------------------------------------
diff --git a/appveyor.yml b/appveyor.yml
index e31d2ea..a99752a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,17 +7,8 @@ environment:
os: Windows Server 2012
install:
- - ps: |
- Add-Type -AssemblyName System.IO.Compression.FileSystem
- if (!(Test-Path -Path "C:\maven" )) {
- (new-object System.Net.WebClient).DownloadFile('https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.9/apache-maven-3.3.9-bin.zip', 'C:\maven-bin.zip')
- [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\maven-bin.zip", "C:\maven")
- }
- - cmd: SET PATH=C:\maven\apache-maven-3.3.9\bin;%JAVA_HOME%\bin;%PATH%
- - cmd: SET MAVEN_OPTS=-XX:MaxPermSize=2g -Xmx4g
- - cmd: SET JAVA_OPTS=-XX:MaxPermSize=2g -Xmx4g
- - cmd: mvn --version
- - cmd: java -version
+ - cmd: choco install maven -y -f
+ - cmd: refreshenv
build_script:
- mvn clean install -B -Dci
[11/12] incubator-tinkerpop git commit: Created an appveyor profile
that ignored knowly broken tests
Posted by sp...@apache.org.
Created an appveyor profile that ignored knowly broken tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/1ca95490
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/1ca95490
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/1ca95490
Branch: refs/heads/tp31
Commit: 1ca95490d42892c4adffc867f8900e5e327e8812
Parents: bc58b8b
Author: Marvin Froeder <ma...@vizexplorer.com>
Authored: Sat Feb 13 12:17:02 2016 +1300
Committer: Marvin Froeder <ma...@vizexplorer.com>
Committed: Mon Feb 22 11:35:14 2016 +1300
----------------------------------------------------------------------
appveyor.yml | 2 +-
spark-gremlin/pom.xml | 21 +++++++++++++++++++++
2 files changed, 22 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/1ca95490/appveyor.yml
----------------------------------------------------------------------
diff --git a/appveyor.yml b/appveyor.yml
index a99752a..fe00740 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -11,4 +11,4 @@ install:
- cmd: refreshenv
build_script:
- - mvn clean install -B -Dci
+ - mvn clean install -B -Dci -fae -Pappveyor
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/1ca95490/spark-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/spark-gremlin/pom.xml b/spark-gremlin/pom.xml
index 7d6c666..fb7b2f7 100644
--- a/spark-gremlin/pom.xml
+++ b/spark-gremlin/pom.xml
@@ -393,4 +393,25 @@
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>appveyor</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/SparkHadoopGremlinTest*</exclude>
+ <exclude>**/SparkGraphComputerGroovyProcessIntegrateTest*</exclude>
+ <exclude>**/SparkGraphComputerProcessIntegrateTest*</exclude>
+ <exclude>**/GryoSerializerIntegrateTest*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
\ No newline at end of file
[02/12] incubator-tinkerpop git commit: Downloading hadoop
winutils.exe when using windows
Posted by sp...@apache.org.
Downloading hadoop winutils.exe when using windows
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/a6cfc3b8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/a6cfc3b8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/a6cfc3b8
Branch: refs/heads/tp31
Commit: a6cfc3b822dc00107375f175003fb9379201b21d
Parents: daa6379
Author: Marvin Froeder <ma...@vizexplorer.com>
Authored: Mon Feb 1 17:19:55 2016 +1300
Committer: Marvin Froeder <ma...@vizexplorer.com>
Committed: Mon Feb 22 09:30:54 2016 +1300
----------------------------------------------------------------------
pom.xml | 40 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/a6cfc3b8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 62eb81c..311ddad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1001,5 +1001,45 @@ limitations under the License.
</plugins>
</build>
</profile>
+
+ <profile>
+ <id>windows</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <os>
+ <family>windows</family>
+ </os>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>wagon-maven-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <id>download-hadoop-winutils</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>download-single</goal>
+ </goals>
+ <configuration>
+ <url>http://public-repo-1.hortonworks.com/</url>
+ <fromFile>hdp-win-alpha/winutils.exe</fromFile>
+ <toDir>${project.build.directory}/hadoop_home/bin</toDir>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>-Dlog4j.configuration=${log4j-test.properties} -Dbuild.dir=${project.build.directory} -Dhadoop.home.dir=${project.build.directory}/hadoop_home</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
[12/12] incubator-tinkerpop git commit: Merge branch 'TINKERPOP-1041'
of https://github.com/velo/incubator-tinkerpop into tp31
Posted by sp...@apache.org.
Merge branch 'TINKERPOP-1041' of https://github.com/velo/incubator-tinkerpop into tp31
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/f8cbe8fb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/f8cbe8fb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/f8cbe8fb
Branch: refs/heads/tp31
Commit: f8cbe8fbbff682dd9e6281329511ba39bc1920ae
Parents: f2972e8 1ca9549
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Feb 22 08:17:01 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Feb 22 08:17:01 2016 -0500
----------------------------------------------------------------------
appveyor.yml | 14 +++++++
.../groovy/engine/ScriptEnginesTest.java | 5 ++-
.../apache/tinkerpop/gremlin/TestHelper.java | 12 +++++-
.../gremlin/hadoop/HadoopGraphProvider.java | 6 +--
pom.xml | 44 ++++++++++++++++++++
spark-gremlin/pom.xml | 21 ++++++++++
.../spark/structure/io/SparkContextStorage.java | 8 ++--
7 files changed, 99 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
[08/12] incubator-tinkerpop git commit: Attemp to download maven
using https
Posted by sp...@apache.org.
Attemp to download maven using https
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/884e45d1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/884e45d1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/884e45d1
Branch: refs/heads/tp31
Commit: 884e45d136d74144aa0d51c4ada3822bfc786ee9
Parents: 164fdac
Author: Marvin Froeder <ve...@gmail.com>
Authored: Thu Feb 4 08:08:12 2016 +1300
Committer: Marvin Froeder <ma...@vizexplorer.com>
Committed: Mon Feb 22 09:31:56 2016 +1300
----------------------------------------------------------------------
appveyor.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/884e45d1/appveyor.yml
----------------------------------------------------------------------
diff --git a/appveyor.yml b/appveyor.yml
index 92eae9f..e31d2ea 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -10,10 +10,10 @@ install:
- ps: |
Add-Type -AssemblyName System.IO.Compression.FileSystem
if (!(Test-Path -Path "C:\maven" )) {
- (new-object System.Net.WebClient).DownloadFile('http://www.us.apache.org/dist/maven/maven-3/3.2.5/binaries/apache-maven-3.2.5-bin.zip', 'C:\maven-bin.zip')
+ (new-object System.Net.WebClient).DownloadFile('https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.9/apache-maven-3.3.9-bin.zip', 'C:\maven-bin.zip')
[System.IO.Compression.ZipFile]::ExtractToDirectory("C:\maven-bin.zip", "C:\maven")
}
- - cmd: SET PATH=C:\maven\apache-maven-3.2.5\bin;%JAVA_HOME%\bin;%PATH%
+ - cmd: SET PATH=C:\maven\apache-maven-3.3.9\bin;%JAVA_HOME%\bin;%PATH%
- cmd: SET MAVEN_OPTS=-XX:MaxPermSize=2g -Xmx4g
- cmd: SET JAVA_OPTS=-XX:MaxPermSize=2g -Xmx4g
- cmd: mvn --version