You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by fl...@apache.org on 2022/07/07 10:44:26 UTC
[tinkerpop] branch 3.5-dev updated: Pathing Updates
This is an automated email from the ASF dual-hosted git repository.
florianhockmann pushed a commit to branch 3.5-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/3.5-dev by this push:
new 6aa0d21a3b Pathing Updates
new 47a855a493 Merge pull request #1739 from Bit-Quill/rithin/an-1190-pathing-errs
6aa0d21a3b is described below
commit 6aa0d21a3b9b9ed33825d838e38e182ce15d15f8
Author: Rithin Kumar <ri...@gmail.com>
AuthorDate: Thu Jun 23 16:35:20 2022 -0700
Pathing Updates
---
gremlin-dotnet/src/pom.xml | 8 ++++----
gremlin-dotnet/test/pom.xml | 5 +++++
gremlin-javascript/pom.xml | 9 +++++++--
gremlin-python/pom.xml | 5 +++++
gremlin-server/src/test/scripts/test-server-start.groovy | 8 +++-----
gremlint/pom.xml | 4 ++--
6 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/gremlin-dotnet/src/pom.xml b/gremlin-dotnet/src/pom.xml
index e39d6077e1..211dd3a59c 100644
--- a/gremlin-dotnet/src/pom.xml
+++ b/gremlin-dotnet/src/pom.xml
@@ -56,14 +56,14 @@ limitations under the License.
<scripts>
<script>
def mavenVersion = "${project.version}"
- def platformAgnosticBaseDirPath = new File(".this-definitely-does-not-exist").absolutePath.replace("\\.this-definitely-does-not-exist", "").replace("/.this-definitely-does-not-exist", "").replace("\\", "/")
- def file = new File(platformAgnosticBaseDirPath + "/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj")
+ def platformAgnosticBaseDirPath = project.basedir.getAbsolutePath().replace("\\", "/")
+ def file = new File(platformAgnosticBaseDirPath + "/Gremlin.Net/Gremlin.Net.csproj")
file.write(file.getText("UTF-8").replaceFirst(/<Version>(.*)<\/Version>/, "<Version>" + mavenVersion + "</Version>"))
- file = new File(platformAgnosticBaseDirPath + "/gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.csproj")
+ file = new File(platformAgnosticBaseDirPath + "/Gremlin.Net.Template/Gremlin.Net.Template.csproj")
file.write(file.getText("UTF-8").replaceFirst(/Version="(.*)"/, "Version=\"" + mavenVersion + "\""))
- file = new File(platformAgnosticBaseDirPath + "/gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.nuspec")
+ file = new File(platformAgnosticBaseDirPath + "/Gremlin.Net.Template/Gremlin.Net.Template.nuspec")
file.write(file.getText("UTF-8").replaceFirst(/<version>(.*)<\/version>/, "<version>" + mavenVersion + "</version>"))
</script>
</scripts>
diff --git a/gremlin-dotnet/test/pom.xml b/gremlin-dotnet/test/pom.xml
index e640947354..9f9794b8d0 100644
--- a/gremlin-dotnet/test/pom.xml
+++ b/gremlin-dotnet/test/pom.xml
@@ -32,6 +32,7 @@ limitations under the License.
<skipTests>${maven.test.skip}</skipTests>
<!-- this path only works when maven is started from the direct parent directory, this should be fixed -->
<gremlin.server.dir>${project.parent.parent.basedir}/gremlin-server</gremlin.server.dir>
+ <tinkerpop.root.dir>${project.parent.parent.basedir}</tinkerpop.root.dir>
</properties>
<build>
@@ -188,6 +189,10 @@ limitations under the License.
<name>projectBaseDir</name>
<value>${project.basedir}</value>
</property>
+ <property>
+ <name>tinkerpopRootDir</name>
+ <value>${tinkerpop.root.dir}</value>
+ </property>
</properties>
<scripts>
<script>${gremlin.server.dir}/src/test/scripts/test-server-start.groovy</script>
diff --git a/gremlin-javascript/pom.xml b/gremlin-javascript/pom.xml
index 17c8867604..2a3a0253ce 100644
--- a/gremlin-javascript/pom.xml
+++ b/gremlin-javascript/pom.xml
@@ -29,6 +29,7 @@ limitations under the License.
<maven.test.skip>false</maven.test.skip>
<skipTests>${maven.test.skip}</skipTests>
<gremlin.server.dir>${project.parent.basedir}/gremlin-server</gremlin.server.dir>
+ <tinkerpop.root.dir>${project.parent.basedir}</tinkerpop.root.dir>
<npm.version>6.14.6</npm.version>
<node.version>v10.22.0</node.version>
</properties>
@@ -118,8 +119,8 @@ limitations under the License.
<script>
def mavenVersion = "${project.version}"
def versionForJs = mavenVersion.replace("-SNAPSHOT", "-alpha1")
- def platformAgnosticBaseDirPath = new File(".this-definitely-does-not-exist").absolutePath.replace("\\.this-definitely-does-not-exist", "").replace("/.this-definitely-does-not-exist", "").replace("\\", "/")
- def file = new File(platformAgnosticBaseDirPath + "/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json")
+ def platformAgnosticBaseDirPath = project.basedir.getAbsolutePath().replace("\\", "/")
+ def file = new File(platformAgnosticBaseDirPath + "/src/main/javascript/gremlin-javascript/package.json")
file.write(file.getText("UTF-8").replaceFirst(/"version": "(.*)",/, "\"version\": \"" + versionForJs + "\","))
</script>
</scripts>
@@ -153,6 +154,10 @@ limitations under the License.
<name>projectBaseDir</name>
<value>${project.basedir}</value>
</property>
+ <property>
+ <name>tinkerpopRootDir</name>
+ <value>${tinkerpop.root.dir}</value>
+ </property>
</properties>
<scripts>
<script>${gremlin.server.dir}/src/test/scripts/test-server-start.groovy</script>
diff --git a/gremlin-python/pom.xml b/gremlin-python/pom.xml
index 5e181f3069..6551aa4591 100644
--- a/gremlin-python/pom.xml
+++ b/gremlin-python/pom.xml
@@ -31,6 +31,7 @@ limitations under the License.
<skipTests>${maven.test.skip}</skipTests>
<TEST_TRANSACTIONS>false</TEST_TRANSACTIONS>
<gremlin.server.dir>${project.parent.basedir}/gremlin-server</gremlin.server.dir>
+ <tinkerpop.root.dir>${project.parent.basedir}</tinkerpop.root.dir>
</properties>
<build>
<directory>${basedir}/target</directory>
@@ -331,6 +332,10 @@ limitations under the License.
<name>projectBaseDir</name>
<value>${project.basedir}</value>
</property>
+ <property>
+ <name>tinkerpopRootDir</name>
+ <value>${tinkerpop.root.dir}</value>
+ </property>
</properties>
<scripts>
<script>${gremlin.server.dir}/src/test/scripts/test-server-start.groovy</script>
diff --git a/gremlin-server/src/test/scripts/test-server-start.groovy b/gremlin-server/src/test/scripts/test-server-start.groovy
index 2f20fbd8f9..7119d2b1b2 100644
--- a/gremlin-server/src/test/scripts/test-server-start.groovy
+++ b/gremlin-server/src/test/scripts/test-server-start.groovy
@@ -48,12 +48,10 @@ if (testTransactions) {
log.info("Starting Gremlin Server instances for native testing of ${executionName}")
log.info("Transactions validated (enabled with -DincludeNeo4j and only available on port 45940): " + testTransactions)
-def platformAgnosticBaseDirPath = new File(".this-definitely-does-not-exist").absolutePath
- .replace("\\.this-definitely-does-not-exist", "") // Windows
- .replace("\\", "/") // Windows
- .replace("/.this-definitely-does-not-exist","") // Unix
+def platformAgnosticBaseDirPath = "${tinkerpopRootDir}".replace("\\", "/")
def platformAgnosticGremlinServerDir = platformAgnosticBaseDirPath + "/gremlin-server"
-def platformAgnosticSettingsFile = platformAgnosticGremlinServerDir + "/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml"
+def platformAgnosticSettingsFile = platformAgnosticGremlinServerDir + "/src/test/resources/org" +
+ "/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml"
def settings = Settings.read("${platformAgnosticSettingsFile}")
settings.graphs.graph = platformAgnosticGremlinServerDir + "/src/test/scripts/tinkergraph-empty.properties"
diff --git a/gremlint/pom.xml b/gremlint/pom.xml
index 5cd036882b..e4aaa293b4 100644
--- a/gremlint/pom.xml
+++ b/gremlint/pom.xml
@@ -72,8 +72,8 @@ limitations under the License.
<script>
def mavenVersion = "${project.version}"
def versionForJs = mavenVersion.replace("-SNAPSHOT", "-alpha1")
- def platformAgnosticBaseDirPath = new File(".this-definitely-does-not-exist").absolutePath.replace("\\.this-definitely-does-not-exist", "").replace("/.this-definitely-does-not-exist", "").replace("\\","/")
- def file = new File(platformAgnosticBaseDirPath + "/gremlint/package.json")
+ def platformAgnosticBaseDirPath = project.basedir.getAbsolutePath().replace("\\","/")
+ def file = new File(platformAgnosticBaseDirPath + "/package.json")
file.write(file.getText("UTF-8").replaceFirst(/"version": "(.*)",/, "\"version\": \"" + versionForJs + "\","))
</script>
</scripts>