You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by xi...@apache.org on 2022/09/13 00:17:26 UTC
[tinkerpop] branch 3.6-dev updated (8af032d906 -> 969b7981e8)
This is an automated email from the ASF dual-hosted git repository.
xiazcy pushed a change to branch 3.6-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
from 8af032d906 Merge branch '3.5-dev' into 3.6-dev
add 33b60d9e34 Dev Environments: Dockerize Testing for JavaScript and .NET & Updates for Go (#1788)
new 92a8ebe508 Merge branch '3.5-dev' into 3.6-dev
new 969b7981e8 Update test server conf for call() tests after merge CTR
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/build-test.yml | 98 ++++-
docker/gremlin-server/docker-entrypoint.sh | 9 +-
.../gremlin-server-integration-secure.yaml | 7 +
.../gremlin-server/gremlin-server-integration.yaml | 14 +-
.../gremlin-test-server}/Dockerfile | 15 +-
.../gremlin-test-server}/wait-for-server.sh | 0
{gremlin-go => gremlin-dotnet}/docker-compose.yml | 47 ++-
.../Gremlin.Net.IntegrationTest/ConfigProvider.cs | 11 +-
.../Gremlin.Net.IntegrationTest/appsettings.json | 3 +-
.../Gremlin.Net.Template.IntegrationTest.csproj | 9 +-
.../ServiceTests.cs | 6 +-
.../appsettings.json | 3 +-
gremlin-dotnet/test/pom.xml | 315 ++++----------
gremlin-go/docker-compose.yml | 31 +-
gremlin-go/docker/docker-entrypoint.sh | 43 --
gremlin-go/docker/generate-all.groovy | 79 ----
.../docker/gremlin-server-integration-secure.yaml | 76 ----
gremlin-go/docker/gremlin-server-integration.yaml | 68 ---
gremlin-go/pom.xml | 24 +-
gremlin-go/run.sh | 8 +-
gremlin-javascript/pom.xml | 465 +++++----------------
.../gremlin-javascript}/docker-compose.yml | 50 ++-
.../javascript/gremlin-javascript/package.json | 3 +
.../javascript/gremlin-javascript/test/helper.js | 11 +-
.../test/integration/sasl-authentication-tests.js | 7 +-
.../tinkergraph-service.properties} | 0
gremlin-server/pom.xml | 18 +
.../src/test/scripts/generate-all.groovy | 5 +
28 files changed, 469 insertions(+), 956 deletions(-)
rename {gremlin-go => docker/gremlin-test-server}/Dockerfile (74%)
rename {gremlin-go => docker/gremlin-test-server}/wait-for-server.sh (100%)
copy {gremlin-go => gremlin-dotnet}/docker-compose.yml (51%)
copy gremlin-dotnet/test/{Gremlin.Net.IntegrationTest => Gremlin.Net.Template.IntegrationTest}/appsettings.json (61%)
delete mode 100644 gremlin-go/docker/docker-entrypoint.sh
delete mode 100644 gremlin-go/docker/generate-all.groovy
delete mode 100644 gremlin-go/docker/gremlin-server-integration-secure.yaml
delete mode 100644 gremlin-go/docker/gremlin-server-integration.yaml
copy {gremlin-go => gremlin-javascript/src/main/javascript/gremlin-javascript}/docker-compose.yml (51%)
copy gremlin-server/{src/test/scripts/tinkergraph-empty.properties => conf/tinkergraph-service.properties} (100%)
[tinkerpop] 01/02: Merge branch '3.5-dev' into 3.6-dev
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiazcy pushed a commit to branch 3.6-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 92a8ebe508025f7b5e9d950e560c6d7781906c32
Merge: 8af032d906 33b60d9e34
Author: Yang Xia <55...@users.noreply.github.com>
AuthorDate: Mon Sep 12 16:18:05 2022 -0700
Merge branch '3.5-dev' into 3.6-dev
.github/workflows/build-test.yml | 98 ++++-
docker/gremlin-server/docker-entrypoint.sh | 9 +-
.../gremlin-server-integration-secure.yaml | 7 +
.../gremlin-server/gremlin-server-integration.yaml | 14 +-
.../gremlin-test-server}/Dockerfile | 15 +-
.../gremlin-test-server}/wait-for-server.sh | 0
{gremlin-go => gremlin-dotnet}/docker-compose.yml | 47 ++-
.../Gremlin.Net.IntegrationTest/ConfigProvider.cs | 11 +-
.../Gremlin.Net.IntegrationTest/appsettings.json | 3 +-
.../Gremlin.Net.Template.IntegrationTest.csproj | 9 +-
.../ServiceTests.cs | 6 +-
.../appsettings.json | 3 +-
gremlin-dotnet/test/pom.xml | 315 ++++----------
gremlin-go/docker-compose.yml | 31 +-
gremlin-go/docker/docker-entrypoint.sh | 43 --
gremlin-go/docker/generate-all.groovy | 79 ----
.../docker/gremlin-server-integration-secure.yaml | 76 ----
gremlin-go/docker/gremlin-server-integration.yaml | 68 ---
gremlin-go/pom.xml | 24 +-
gremlin-go/run.sh | 8 +-
gremlin-javascript/pom.xml | 465 +++++----------------
.../gremlin-javascript}/docker-compose.yml | 50 ++-
.../javascript/gremlin-javascript/package.json | 3 +
.../javascript/gremlin-javascript/test/helper.js | 11 +-
.../test/integration/sasl-authentication-tests.js | 7 +-
gremlin-server/conf/tinkergraph-service.properties | 20 +
gremlin-server/pom.xml | 18 +
.../src/test/scripts/generate-all.groovy | 5 +
28 files changed, 489 insertions(+), 956 deletions(-)
diff --cc docker/gremlin-server/docker-entrypoint.sh
index d007cce805,51290265ca..3662af20f3
--- a/docker/gremlin-server/docker-entrypoint.sh
+++ b/docker/gremlin-server/docker-entrypoint.sh
@@@ -71,12 -74,12 +74,12 @@@ if [ ! -z "${INCLUDE_NEO4J}" ]; the
/opt/gremlin-server/bin/gremlin-server.sh install org.apache.tinkerpop neo4j-gremlin ${GREMLIN_SERVER_VERSION}
fi
- /opt/gremlin-server/bin/gremlin-server.sh conf/gremlin-server-integration.yaml &
+ /opt/gremlin-server/bin/gremlin-server.sh ${TINKERPOP_HOME}/conf/gremlin-server-integration.yaml &
- /opt/gremlin-server/bin/gremlin-server.sh conf/gremlin-server-integration-secure.yaml &
+ /opt/gremlin-server/bin/gremlin-server.sh ${TINKERPOP_HOME}/conf/gremlin-server-integration-secure.yaml &
java -cp /opt/gremlin-test/gremlin-test-${GREMLIN_SERVER_VERSION}-jar-with-dependencies.jar \
- -Dlog4j.configuration="file:/opt/gremlin-server/conf/log4j-server.properties" \
+ -Dlogback.configurationFile="file:/opt/gremlin-server/conf/logback.xml" \
org.apache.tinkerpop.gremlin.server.KdcFixture /opt/gremlin-server &
export JAVA_OPTIONS="-Xms512m -Xmx4096m -Djava.security.krb5.conf=/opt/gremlin-server/target/kdc/krb5.conf"
diff --cc gremlin-javascript/pom.xml
index 92b0a8a766,8b2e05e383..e134a88b01
--- a/gremlin-javascript/pom.xml
+++ b/gremlin-javascript/pom.xml
@@@ -28,276 -28,11 +28,11 @@@ limitations under the License
<properties>
<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>
+ <npm.version>8.1.0</npm.version>
+ <node.version>v16.13.0</node.version>
</properties>
<build>
- <directory>${basedir}/target</directory>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>com.github.eirslett</groupId>
- <artifactId>frontend-maven-plugin</artifactId>
- <version>1.12.1</version>
- </plugin>
- </plugins>
- </pluginManagement>
<plugins>
- <plugin>
- <!--
- Use gmavenplus-plugin to:
- - Generate js sources
- - Start and stop gremlin server for integration tests
- -->
- <groupId>org.codehaus.gmavenplus</groupId>
- <artifactId>gmavenplus-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.tinkerpop</groupId>
- <artifactId>gremlin-server</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tinkerpop</groupId>
- <artifactId>gremlin-test</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tinkerpop</groupId>
- <artifactId>gremlin-language</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tinkerpop</groupId>
- <artifactId>neo4j-gremlin</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons.io.version}</version>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${logback.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- <version>${groovy.version}</version>
- <type>pom</type>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>generate-radish-support</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>execute</goal>
- </goals>
- <configuration>
- <properties>
- <property>
- <name>projectBaseDir</name>
- <value>${project.basedir}/../</value>
- </property>
- </properties>
- <scripts>
- <script>${project.basedir}/build/generate.groovy</script>
- </scripts>
- </configuration>
- </execution>
- <execution>
- <id>update-version</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>execute</goal>
- </goals>
- <configuration>
- <properties>
- <property>
- <name>projectBaseDir</name>
- <value>${project.basedir}</value>
- </property>
- <property>
- <name>mavenVersion</name>
- <value>${project.version}</value>
- </property>
- </properties>
- <scripts>
- <script>
- def versionForJs = mavenVersion.replace("-SNAPSHOT", "-alpha1")
- 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>
- </configuration>
- </execution>
- <execution>
- <id>gremlin-server-start</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>execute</goal>
- </goals>
- <configuration>
- <properties>
- <property>
- <name>skipTests</name>
- <value>${skipTests}</value>
- </property>
- <property>
- <name>gremlinServerDir</name>
- <value>${gremlin.server.dir}</value>
- </property>
- <property>
- <name>settingsFile</name>
- <value>${gremlin.server.dir}/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml</value>
- </property>
- <property>
- <name>executionName</name>
- <value>${project.name}</value>
- </property>
- <property>
- <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>
- </scripts>
- </configuration>
- </execution>
- <execution>
- <id>gremlin-server-stop</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>execute</goal>
- </goals>
- <configuration>
- <properties>
- <property>
- <name>skipTests</name>
- <value>${skipTests}</value>
- </property>
- <property>
- <name>executionName</name>
- <value>${project.name}</value>
- </property>
- </properties>
- <scripts>
- <script>${gremlin.server.dir}/src/test/scripts/test-server-stop.groovy</script>
- </scripts>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>clean</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>com.github.eirslett</groupId>
- <artifactId>frontend-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>install node and npm</id>
- <phase>validate</phase>
- <goals>
- <goal>install-node-and-npm</goal>
- </goals>
- </execution>
- <execution>
- <id>npm install</id>
- <phase>validate</phase>
- <goals>
- <goal>npm</goal>
- </goals>
- <configuration>
- <arguments>install</arguments>
- </configuration>
- </execution>
- <execution>
- <id>npm lint</id>
- <phase>validate</phase>
- <goals>
- <goal>npm</goal>
- </goals>
- <configuration>
- <skip>${skipTests}</skip>
- <arguments>run lint</arguments>
- <failOnError>true</failOnError>
- </configuration>
- </execution>
- <execution>
- <id>grunt jsdoc</id>
- <goals>
- <goal>grunt</goal>
- </goals>
- <phase>generate-resources</phase>
- <configuration>
- <arguments>jsdoc</arguments>
- </configuration>
- </execution>
- <execution>
- <id>npm test</id>
- <phase>integration-test</phase>
- <goals>
- <goal>npm</goal>
- </goals>
- <configuration>
- <skip>${skipTests}</skip>
- <arguments>test --exit</arguments>
- <failOnError>true</failOnError>
- </configuration>
- </execution>
- <execution>
- <id>npm test gherkin features</id>
- <phase>integration-test</phase>
- <goals>
- <goal>npm</goal>
- </goals>
- <configuration>
- <skip>${skipTests}</skip>
- <arguments>run-script features</arguments>
- <failOnError>true</failOnError>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <workingDirectory>src/main/javascript/gremlin-javascript</workingDirectory>
- <nodeVersion>${node.version}</nodeVersion>
- <npmVersion>${npm.version}</npmVersion>
-
- <!--
- transaction testing is disabled unless the -DincludeNeo4j flag enables the include-neo4j
- maven profile which is a standard profile we use to add neo4j to testing explicitly - for
- npm we set this TEST_TRANSACTIONS environment variable that can be accessed in tests to
- determine if we skip transaction oriented tests or not. without neo4j we can't test tx()
- so this is disabled by default and enabled in the include-neo4j profile below
- -->
- <environmentVariables>
- <TEST_TRANSACTIONS>false</TEST_TRANSACTIONS>
- </environmentVariables>
- </configuration>
- </plugin>
<!--
there is no point to building/deploying the jvm stuff - there is no java source really - just poms
-->
@@@ -361,92 -146,59 +146,59 @@@
<artifactId>gmavenplus-plugin</artifactId>
<dependencies>
<dependency>
- <groupId>org.neo4j</groupId>
- <artifactId>neo4j-tinkerpop-api-impl</artifactId>
- <version>0.9-3.4.0</version>
- <exclusions>
- <exclusion>
- <groupId>org.neo4j</groupId>
- <artifactId>neo4j-kernel</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-text</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.github.ben-manes.caffeine</groupId>
- <artifactId>caffeine</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-reflect</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-nop</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.tinkerpop</groupId>
+ <artifactId>gremlin-server</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
- <version>2.11.8</version>
+ <groupId>org.apache.tinkerpop</groupId>
+ <artifactId>gremlin-test</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-reflect</artifactId>
- <version>2.11.8</version>
+ <groupId>org.apache.tinkerpop</groupId>
+ <artifactId>neo4j-gremlin</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
- <version>5.5.0</version>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons.io.version}</version>
</dependency>
<dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-core</artifactId>
- <version>4.2.11</version>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
++ <groupId>ch.qos.logback</groupId>
++ <artifactId>logback-classic</artifactId>
++ <version>${logback.version}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.neo4j</groupId>
- <artifactId>neo4j-kernel</artifactId>
- <version>3.4.11</version>
- <exclusions>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ <version>${groovy.version}</version>
+ <type>pom</type>
+ <scope>runtime</scope>
</dependency>
</dependencies>
+ <executions>
+ <execution>
+ <id>generate-radish-support</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <properties>
+ <property>
+ <name>projectBaseDir</name>
+ <value>${project.basedir}/../</value>
+ </property>
+ </properties>
+ <scripts>
+ <script>${project.basedir}/build/generate.groovy</script>
+ </scripts>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
[tinkerpop] 02/02: Update test server conf for call() tests after merge CTR
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiazcy pushed a commit to branch 3.6-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 969b7981e83c4c13879a1b18fb23a78339ebb708
Author: Yang Xia <55...@users.noreply.github.com>
AuthorDate: Mon Sep 12 17:17:07 2022 -0700
Update test server conf for call() tests after merge CTR
---
gremlin-server/conf/tinkergraph-service.properties | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/gremlin-server/conf/tinkergraph-service.properties b/gremlin-server/conf/tinkergraph-service.properties
index 211b9e4f03..93066ecb00 100644
--- a/gremlin-server/conf/tinkergraph-service.properties
+++ b/gremlin-server/conf/tinkergraph-service.properties
@@ -17,4 +17,6 @@
gremlin.graph=org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph
gremlin.tinkergraph.vertexIdManager=INTEGER
gremlin.tinkergraph.edgeIdManager=INTEGER
-gremlin.tinkergraph.vertexPropertyIdManager=INTEGER
\ No newline at end of file
+gremlin.tinkergraph.vertexPropertyIdManager=LONG
+gremlin.tinkergraph.service=org.apache.tinkerpop.gremlin.tinkergraph.services.TinkerTextSearchFactory
+gremlin.tinkergraph.service=org.apache.tinkerpop.gremlin.tinkergraph.services.TinkerDegreeCentralityFactory