Skip to content

Commit

Permalink
Minor Version Upgrades & Gremlin Test Server Setup (#252)
Browse files Browse the repository at this point in the history
* add license report plugin & upgrade dependencies for v3.x.x release

* Set up mock gremlin server and remove raw usage of server package

* revert gremlin version

* downgrade Calcite to 1.34 to get Jackson 2.14 as Jackson 2.15 will fail with Gradle 7.5/7.6 in shadow jar building

* address reviews & remove sensitive info

* remove sensitive info

* minor test correction

* test set-up reorder for readability
  • Loading branch information
xiazcy authored Feb 29, 2024
1 parent f65eca1 commit 69aa7df
Show file tree
Hide file tree
Showing 94 changed files with 224 additions and 2,658 deletions.
15 changes: 13 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ plugins {
id 'maven-publish'
id 'io.github.gradle-nexus.publish-plugin' version '1.1.0'
id 'signing'
id 'com.github.jk1.dependency-license-report' version '2.5'
}

group 'software.amazon.neptune'
Expand Down Expand Up @@ -205,18 +206,28 @@ license {
}
}

/**
* License Report Plugin
*/
import com.github.jk1.license.render.*

licenseReport {
configurations = ['runtimeClasspath']
renderers = [new TextReportRenderer(), new SimpleHtmlReportRenderer()]
}

dependencies {
// Dependencies
implementation group: 'commons-beanutils', name: 'commons-beanutils', version: "$beanutilsVersion"
implementation group: 'org.apache.tinkerpop', name: 'gremlin-driver', version: "$gremlinVersion"
implementation group: 'org.apache.tinkerpop', name: 'gremlin-groovy', version: "$gremlinVersion"
implementation group: 'com.amazonaws', name: 'amazon-neptune-sigv4-signer', version: "$amazonSigv4SignerVersion"
implementation group: 'com.amazonaws', name: 'amazon-neptune-sparql-java-sigv4', version: "$amazonSigv4SignerVersion"
implementation group: 'com.amazonaws', name: 'amazon-neptune-gremlin-java-sigv4', version: "$amazonSigv4SignerVersion"
implementation group: 'com.jcraft', name: 'jsch', version: "$jschVersion"
implementation group: 'io.netty', name: 'netty-all', version: "$nettyVersion"
implementation group: 'org.neo4j.driver', name: 'neo4j-java-driver', version: "$neo4jDriverVersion"
implementation group: 'org.apache.jena', name: 'jena-arq', version: "$jenaVersion"
implementation group: 'org.apache.jena', name: 'jena-rdfconnection', version: "$jenaVersion"
implementation group: 'org.slf4j', name: 'slf4j-log4j12', version: "$slf4jVersion"
implementation group: 'com.google.code.gson', name: 'gson', version: "$gsonVersion"
implementation group: 'com.google.guava', name: 'guava', version: "$guavaVersion"
Expand Down Expand Up @@ -249,6 +260,7 @@ dependencies {
testCompileOnly group: 'com.google.code.findbugs', name: 'annotations', version: "$findBugsVersion"
testCompileOnly group: 'com.puppycrawl.tools', name: 'checkstyle', version: "$puppyCrawlVersion"
testImplementation group: 'org.apache.tinkerpop', name: 'tinkergraph-gremlin', version: "$gremlinVersion"
testImplementation group: 'org.apache.tinkerpop', name: 'gremlin-server', version: "$gremlinVersion"
}

shadowJar {
Expand Down Expand Up @@ -280,7 +292,6 @@ shadowJar {
relocate 'org.neo4j', 'shadow.org.neo4j'
relocate 'org.joda', 'shadow.org.joda'
relocate 'org.javatuples', 'shadow.org.javatuples'
relocate 'org.eclipse', 'shadow.org.eclipse'
relocate 'org.checkerframework', 'shadow.org.checkerframework'
relocate 'org.apiguardian', 'shadow.org.apiguardian'
relocate 'org.apache.tinkerpop', 'shadow.org.apache.tinkerpop'
Expand Down
11 changes: 6 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,19 @@ PATCH_VERSION=2
# Uncomment out next line to disable remote integration tests
#runRemoteIntegrationTests=false
# Dependencies
calciteVersion = 1.28.0
calciteVersion = 1.34.0
lombokVersion = 1.18.16
jupiterVersion = 5.4.0
neo4jDBVersion = 3.5.19
neo4jDriverVersion = 4.0.0
neo4jDBVersion = 3.5.35
neo4jDriverVersion = 4.4.12
puppyCrawlVersion = 8.8
findBugsVersion = 3.0.1
gremlinVersion = 3.6.4
slf4jVersion = 1.7.29
slf4jVersion = 1.7.36
amazonSigv4SignerVersion = 2.4.0
nettyVersion = 4.1.52.Final
nettyVersion = 4.1.101.Final
immutablesVersion = 2.8.8
# Staying on Jena 3 as Jena 4 requires Java 11 minimum while we still support Java 8
jenaVersion = 3.17.0
javafakerVersion = 1.0.2
jtextVersion = 0.3.4
Expand Down
1 change: 0 additions & 1 deletion gremlin-server/target/.plxarc

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 69aa7df

Please sign in to comment.