From fbb314102ca4a0d161035a1f0f54a34e1b423381 Mon Sep 17 00:00:00 2001 From: naveenaechan Date: Fri, 24 Nov 2023 09:52:50 +0530 Subject: [PATCH] PLT-191: CI action --- .github/workflows/maven.yml | 54 + janusgraph-all/pom.xml | 2 +- janusgraph-backend-testutils/pom.xml | 2 +- janusgraph-berkeleyje/pom.xml | 2 +- janusgraph-bigtable/pom.xml | 2 +- janusgraph-core/pom.xml | 2 +- .../keycolumnvalue/cache/RedissonCache.java | 77 +- janusgraph-cql/pom.xml | 15 +- janusgraph-dist/pom.xml | 2 +- janusgraph-doc/pom.xml | 2 +- janusgraph-driver/pom.xml | 2 +- janusgraph-es/pom.xml | 2 +- .../example-berkeleyje/pom.xml | 2 +- .../example-berkeleyje/pom.xml.versionsBackup | 41 + janusgraph-examples/example-common/pom.xml | 2 +- .../example-common/pom.xml.versionsBackup | 26 + janusgraph-examples/example-cql/pom.xml | 2 +- .../example-cql/pom.xml.versionsBackup | 42 + janusgraph-examples/example-hbase/pom.xml | 2 +- .../example-hbase/pom.xml.versionsBackup | 48 + .../example-remotegraph/pom.xml | 2 +- .../pom.xml.versionsBackup | 35 + .../example-tinkergraph/pom.xml | 2 +- .../pom.xml.versionsBackup | 30 + janusgraph-examples/pom.xml | 2 +- janusgraph-grpc/pom.xml | 2 +- janusgraph-hadoop/pom.xml | 2 +- janusgraph-hbase/pom.xml | 2 +- janusgraph-inmemory/pom.xml | 2 +- janusgraph-lucene/pom.xml | 2 +- janusgraph-server/pom.xml | 2 +- janusgraph-solr/pom.xml | 2 +- janusgraph-test/pom.xml | 2 +- pom.xml | 2 +- pom.xml.versionsBackup | 1589 +++++++++++++++++ 35 files changed, 1935 insertions(+), 72 deletions(-) create mode 100644 .github/workflows/maven.yml create mode 100644 janusgraph-examples/example-berkeleyje/pom.xml.versionsBackup create mode 100644 janusgraph-examples/example-common/pom.xml.versionsBackup create mode 100644 janusgraph-examples/example-cql/pom.xml.versionsBackup create mode 100644 janusgraph-examples/example-hbase/pom.xml.versionsBackup create mode 100644 janusgraph-examples/example-remotegraph/pom.xml.versionsBackup create mode 100644 janusgraph-examples/example-tinkergraph/pom.xml.versionsBackup create mode 100644 pom.xml.versionsBackup diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml new file mode 100644 index 0000000000..f644df919d --- /dev/null +++ b/.github/workflows/maven.yml @@ -0,0 +1,54 @@ +# This workflow will build a package using Maven and then publish it to GitHub packages when a release is created +# For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#apache-maven-with-a-settings-path + +name: Java CI with Maven + +on: + push: + branches: + - v0.6-cache + +env: + ES_JAVA_OPTS: "-Xms256m -Xmx512m" + BUILD_MAVEN_OPTS: "-DskipTests=true --batch-mode --also-make" + +jobs: + build: + + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + + steps: + - uses: actions/checkout@v2 + + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + + - name: Cache Maven packages + uses: actions/cache@v2 + with: + path: ~/.m2 + key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} + restore-keys: ${{ runner.os }}-m2 + + - name: Get branch name + run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" + id: get_branch + + - name: Build with Maven + - run: | + branch_name=${{ steps.get_branch.outputs.branch }} + if [[ $branch_name == ' v0.6-cache' ]] + then + echo "Building branch ${branch_name}" + mvn clean install -Dcheckstyle.skip -Drat.skip=true -Dit.skip=true -Denforcer.skip=true -Dmaven.javadoc.skip=true ${{ env.BUILD_MAVEN_OPTS }} + + + - name: Publish to GitHub Packages Apache Maven + run: mvn --batch-mode deploy + env: + GITHUB_TOKEN: ${{ secrets.my_pat }} diff --git a/janusgraph-all/pom.xml b/janusgraph-all/pom.xml index ec98a12095..8c91b8dd62 100644 --- a/janusgraph-all/pom.xml +++ b/janusgraph-all/pom.xml @@ -3,7 +3,7 @@ org.janusgraph janusgraph - 0.6.0 + 0.6.6 ../pom.xml janusgraph-all diff --git a/janusgraph-backend-testutils/pom.xml b/janusgraph-backend-testutils/pom.xml index f09b3d8566..6af33eeb92 100644 --- a/janusgraph-backend-testutils/pom.xml +++ b/janusgraph-backend-testutils/pom.xml @@ -4,7 +4,7 @@ org.janusgraph janusgraph - 0.6.0 + 0.6.6 ../pom.xml janusgraph-backend-testutils diff --git a/janusgraph-berkeleyje/pom.xml b/janusgraph-berkeleyje/pom.xml index 10f0b828cc..baaec5e110 100644 --- a/janusgraph-berkeleyje/pom.xml +++ b/janusgraph-berkeleyje/pom.xml @@ -3,7 +3,7 @@ org.janusgraph janusgraph - 0.6.0 + 0.6.6 ../pom.xml janusgraph-berkeleyje diff --git a/janusgraph-bigtable/pom.xml b/janusgraph-bigtable/pom.xml index f64fdb8d2d..eb7e5ec38c 100644 --- a/janusgraph-bigtable/pom.xml +++ b/janusgraph-bigtable/pom.xml @@ -3,7 +3,7 @@ org.janusgraph janusgraph - 0.6.0 + 0.6.6 ../pom.xml janusgraph-bigtable diff --git a/janusgraph-core/pom.xml b/janusgraph-core/pom.xml index 975cfe7ae1..fb62044642 100644 --- a/janusgraph-core/pom.xml +++ b/janusgraph-core/pom.xml @@ -3,7 +3,7 @@ org.janusgraph janusgraph - 0.6.0 + 0.6.6 ../pom.xml janusgraph-core diff --git a/janusgraph-core/src/main/java/org/janusgraph/diskstorage/keycolumnvalue/cache/RedissonCache.java b/janusgraph-core/src/main/java/org/janusgraph/diskstorage/keycolumnvalue/cache/RedissonCache.java index 2717034fcd..fef12e82d5 100644 --- a/janusgraph-core/src/main/java/org/janusgraph/diskstorage/keycolumnvalue/cache/RedissonCache.java +++ b/janusgraph-core/src/main/java/org/janusgraph/diskstorage/keycolumnvalue/cache/RedissonCache.java @@ -7,13 +7,18 @@ import org.redisson.api.RedissonClient; import org.redisson.config.Config; import org.redisson.config.ReadMode; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.Arrays; +import java.util.Objects; import static org.janusgraph.graphdb.configuration.GraphDatabaseConfiguration.*; public class RedissonCache { + private static RedissonClient client; + private static final Logger log = LoggerFactory.getLogger(RedissonCache.class); private static final String REDIS_URL_PREFIX = "redis://"; private static final String COMMA = ","; private static final String JANUSGRAPH_REDIS = "janusgraph-redis"; @@ -25,41 +30,47 @@ public class RedissonCache { private static long watchdogTimeoutInMS; public static RedissonClient getRedissonClient(Configuration configuration) { - redisServerMode = configuration.get(REDIS_CACHE_SERVER_MODE); - connectTimeout = configuration.get(REDIS_CACHE_CONNECTION_TIME_OUT); - keepAlive = configuration.get(REDIS_CACHE_KEEP_ALIVE); - watchdogTimeoutInMS = configuration.get(REDIS_CACHE_LOCK_WATCHDOG_TIMEOUT_MS); - - Config config = new Config(); - switch (redisServerMode) { - case SENTINEL: - config.setLockWatchdogTimeout(watchdogTimeoutInMS) - .useSentinelServers() - .setClientName(JANUSGRAPH_REDIS) - .setReadMode(ReadMode.MASTER_SLAVE) - .setCheckSentinelsList(false) - .setConnectTimeout(connectTimeout) - .setKeepAlive(keepAlive) - .setMasterName(configuration.get(REDIS_CACHE_MASTER_NAME)) - .addSentinelAddress(formatUrls(configuration.get(REDIS_CACHE_SENTINEL_URLS).split(COMMA))) - .setUsername(configuration.get(REDIS_CACHE_USERNAME)) - .setPassword(configuration.get(REDIS_CACHE_PASSWORD)); - break; - case STANDALONE: - config.setLockWatchdogTimeout(watchdogTimeoutInMS) - .useSingleServer() - .setClientName(JANUSGRAPH_REDIS) - .setAddress(formatUrls(configuration.get(REDIS_CACHE_SERVER_URL).split(COMMA))[0]) - .setConnectTimeout(connectTimeout) - .setKeepAlive(keepAlive) - .setUsername(configuration.get(REDIS_CACHE_USERNAME)) - .setPassword(configuration.get(REDIS_CACHE_PASSWORD)); - break; - default: - throw new JanusGraphConfigurationException("Invalid redis server mode"); + synchronized (RedissonClient.class) { + if (Objects.isNull(client)) { + redisServerMode = configuration.get(REDIS_CACHE_SERVER_MODE); + connectTimeout = configuration.get(REDIS_CACHE_CONNECTION_TIME_OUT); + keepAlive = configuration.get(REDIS_CACHE_KEEP_ALIVE); + watchdogTimeoutInMS = configuration.get(REDIS_CACHE_LOCK_WATCHDOG_TIMEOUT_MS); + log.info("Creating connection for redis:{}", redisServerMode); + System.out.println("Creating connection for redis:"+redisServerMode); + Config config = new Config(); + switch (redisServerMode) { + case SENTINEL: + config.setLockWatchdogTimeout(watchdogTimeoutInMS) + .useSentinelServers() + .setClientName(JANUSGRAPH_REDIS) + .setReadMode(ReadMode.MASTER_SLAVE) + .setCheckSentinelsList(false) + .setConnectTimeout(connectTimeout) + .setKeepAlive(keepAlive) + .setMasterName(configuration.get(REDIS_CACHE_MASTER_NAME)) + .addSentinelAddress(formatUrls(configuration.get(REDIS_CACHE_SENTINEL_URLS).split(COMMA))) + .setUsername(configuration.get(REDIS_CACHE_USERNAME)) + .setPassword(configuration.get(REDIS_CACHE_PASSWORD)); + break; + case STANDALONE: + config.setLockWatchdogTimeout(watchdogTimeoutInMS) + .useSingleServer() + .setClientName(JANUSGRAPH_REDIS) + .setAddress(formatUrls(configuration.get(REDIS_CACHE_SERVER_URL).split(COMMA))[0]) + .setConnectTimeout(connectTimeout) + .setKeepAlive(keepAlive) + .setUsername(configuration.get(REDIS_CACHE_USERNAME)) + .setPassword(configuration.get(REDIS_CACHE_PASSWORD)); + break; + default: + throw new JanusGraphConfigurationException("Invalid redis server mode"); + } + client = Redisson.create(config); + } } - return Redisson.create(config); + return client; } private static String[] formatUrls(String[] urls) throws IllegalArgumentException { diff --git a/janusgraph-cql/pom.xml b/janusgraph-cql/pom.xml index 44df3de4fd..9a35e5de03 100644 --- a/janusgraph-cql/pom.xml +++ b/janusgraph-cql/pom.xml @@ -4,7 +4,7 @@ org.janusgraph janusgraph - 0.6.0 + 0.6.6 janusgraph-cql @@ -126,19 +126,6 @@ java-driver-core ${cassandra-driver.version} - - - io.projectreactor - reactor-core - - - org.reactivestreams - reactive-streams - - - io.reactivex.rxjava3 - rxjava - org.json json diff --git a/janusgraph-dist/pom.xml b/janusgraph-dist/pom.xml index d74ecc9009..d0d5ce708a 100644 --- a/janusgraph-dist/pom.xml +++ b/janusgraph-dist/pom.xml @@ -3,7 +3,7 @@ org.janusgraph janusgraph - 0.6.0 + 0.6.6 ../pom.xml pom diff --git a/janusgraph-doc/pom.xml b/janusgraph-doc/pom.xml index 97843e2744..42697e2ee0 100644 --- a/janusgraph-doc/pom.xml +++ b/janusgraph-doc/pom.xml @@ -3,7 +3,7 @@ org.janusgraph janusgraph - 0.6.0 + 0.6.6 ../pom.xml pom diff --git a/janusgraph-driver/pom.xml b/janusgraph-driver/pom.xml index 74fa381461..b4a83f6e15 100644 --- a/janusgraph-driver/pom.xml +++ b/janusgraph-driver/pom.xml @@ -3,7 +3,7 @@ org.janusgraph janusgraph - 0.6.0 + 0.6.6 ../pom.xml janusgraph-driver diff --git a/janusgraph-es/pom.xml b/janusgraph-es/pom.xml index debde022c3..fc9d7cf408 100644 --- a/janusgraph-es/pom.xml +++ b/janusgraph-es/pom.xml @@ -3,7 +3,7 @@ org.janusgraph janusgraph - 0.6.0 + 0.6.6 ../pom.xml janusgraph-es diff --git a/janusgraph-examples/example-berkeleyje/pom.xml b/janusgraph-examples/example-berkeleyje/pom.xml index 6785363200..064f05e273 100644 --- a/janusgraph-examples/example-berkeleyje/pom.xml +++ b/janusgraph-examples/example-berkeleyje/pom.xml @@ -3,7 +3,7 @@ org.janusgraph janusgraph-examples - 0.6.0 + 0.6.6 ../pom.xml example-berkeleyje diff --git a/janusgraph-examples/example-berkeleyje/pom.xml.versionsBackup b/janusgraph-examples/example-berkeleyje/pom.xml.versionsBackup new file mode 100644 index 0000000000..6785363200 --- /dev/null +++ b/janusgraph-examples/example-berkeleyje/pom.xml.versionsBackup @@ -0,0 +1,41 @@ + + 4.0.0 + + org.janusgraph + janusgraph-examples + 0.6.0 + ../pom.xml + + example-berkeleyje + pom + Example-BerkeleyJE: BerkeleyJE Storage, Lucene Index + https://janusgraph.org + + + + + org.janusgraph + example-common + ${project.version} + runtime + + + org.janusgraph + janusgraph-berkeleyje + ${project.version} + runtime + + + org.janusgraph + janusgraph-lucene + ${project.version} + runtime + + + + + org.janusgraph.example.JanusGraphApp + ${project.basedir}/conf/jgex-berkeleyje.properties + + + diff --git a/janusgraph-examples/example-common/pom.xml b/janusgraph-examples/example-common/pom.xml index 8803c4da8d..54e40ee9fb 100644 --- a/janusgraph-examples/example-common/pom.xml +++ b/janusgraph-examples/example-common/pom.xml @@ -3,7 +3,7 @@ org.janusgraph janusgraph-examples - 0.6.0 + 0.6.6 ../pom.xml example-common diff --git a/janusgraph-examples/example-common/pom.xml.versionsBackup b/janusgraph-examples/example-common/pom.xml.versionsBackup new file mode 100644 index 0000000000..8803c4da8d --- /dev/null +++ b/janusgraph-examples/example-common/pom.xml.versionsBackup @@ -0,0 +1,26 @@ + + 4.0.0 + + org.janusgraph + janusgraph-examples + 0.6.0 + ../pom.xml + + example-common + Example-Common: Common Graph Code for Examples + https://janusgraph.org + + + + org.janusgraph + janusgraph-core + ${project.version} + + + + + org.janusgraph.example.JanusGraphApp + ${project.basedir}/conf/jgex-inmemory.properties + + + diff --git a/janusgraph-examples/example-cql/pom.xml b/janusgraph-examples/example-cql/pom.xml index 1368c4e299..09c31d2c49 100644 --- a/janusgraph-examples/example-cql/pom.xml +++ b/janusgraph-examples/example-cql/pom.xml @@ -3,7 +3,7 @@ org.janusgraph janusgraph-examples - 0.6.0 + 0.6.6 ../pom.xml example-cql diff --git a/janusgraph-examples/example-cql/pom.xml.versionsBackup b/janusgraph-examples/example-cql/pom.xml.versionsBackup new file mode 100644 index 0000000000..1368c4e299 --- /dev/null +++ b/janusgraph-examples/example-cql/pom.xml.versionsBackup @@ -0,0 +1,42 @@ + + 4.0.0 + + org.janusgraph + janusgraph-examples + 0.6.0 + ../pom.xml + + example-cql + pom + Example-Cql: Cassandra CQL Storage, Elasticsearch Index + https://janusgraph.org + + + + + org.janusgraph + example-common + ${project.version} + runtime + + + org.janusgraph + janusgraph-cql + ${project.version} + runtime + + + org.janusgraph + janusgraph-es + ${project.version} + runtime + + + + + org.janusgraph.example.JanusGraphApp + ${project.basedir}/conf/jgex-cql.properties + ${project.basedir}/conf/logback.xml + + + diff --git a/janusgraph-examples/example-hbase/pom.xml b/janusgraph-examples/example-hbase/pom.xml index 658aa53fa5..3df79ec352 100644 --- a/janusgraph-examples/example-hbase/pom.xml +++ b/janusgraph-examples/example-hbase/pom.xml @@ -3,7 +3,7 @@ org.janusgraph janusgraph-examples - 0.6.0 + 0.6.6 ../pom.xml example-hbase diff --git a/janusgraph-examples/example-hbase/pom.xml.versionsBackup b/janusgraph-examples/example-hbase/pom.xml.versionsBackup new file mode 100644 index 0000000000..658aa53fa5 --- /dev/null +++ b/janusgraph-examples/example-hbase/pom.xml.versionsBackup @@ -0,0 +1,48 @@ + + 4.0.0 + + org.janusgraph + janusgraph-examples + 0.6.0 + ../pom.xml + + example-hbase + pom + Example-HBase: HBase Storage, Solr Index + https://janusgraph.org + + + + + org.janusgraph + example-common + ${project.version} + runtime + + + org.janusgraph + janusgraph-hbase + ${project.version} + runtime + + + org.apache.hbase + hbase-shaded-client + ${hbase1.version} + runtime + + + org.janusgraph + janusgraph-solr + ${project.version} + runtime + + + + + org.janusgraph.example.JanusGraphApp + ${project.basedir}/conf/jgex-hbase-solr-cloud.properties + ${project.basedir}/conf/logback.xml + + + diff --git a/janusgraph-examples/example-remotegraph/pom.xml b/janusgraph-examples/example-remotegraph/pom.xml index 2481eafe5d..5c6e51d814 100644 --- a/janusgraph-examples/example-remotegraph/pom.xml +++ b/janusgraph-examples/example-remotegraph/pom.xml @@ -3,7 +3,7 @@ org.janusgraph janusgraph-examples - 0.6.0 + 0.6.6 ../pom.xml example-remotegraph diff --git a/janusgraph-examples/example-remotegraph/pom.xml.versionsBackup b/janusgraph-examples/example-remotegraph/pom.xml.versionsBackup new file mode 100644 index 0000000000..2481eafe5d --- /dev/null +++ b/janusgraph-examples/example-remotegraph/pom.xml.versionsBackup @@ -0,0 +1,35 @@ + + 4.0.0 + + org.janusgraph + janusgraph-examples + 0.6.0 + ../pom.xml + + example-remotegraph + Example-RemoteGraph: Example with RemoteGraph + https://janusgraph.org + + + + org.janusgraph + example-common + ${project.version} + + + org.apache.tinkerpop + gremlin-driver + + + org.apache.tinkerpop + gremlin-server + test + + + + + org.janusgraph.example.RemoteGraphApp + ${project.basedir}/conf/jgex-remote.properties + + + diff --git a/janusgraph-examples/example-tinkergraph/pom.xml b/janusgraph-examples/example-tinkergraph/pom.xml index b2e0ca670e..8f7f4f4a41 100644 --- a/janusgraph-examples/example-tinkergraph/pom.xml +++ b/janusgraph-examples/example-tinkergraph/pom.xml @@ -3,7 +3,7 @@ org.janusgraph janusgraph-examples - 0.6.0 + 0.6.6 ../pom.xml example-tinkergraph diff --git a/janusgraph-examples/example-tinkergraph/pom.xml.versionsBackup b/janusgraph-examples/example-tinkergraph/pom.xml.versionsBackup new file mode 100644 index 0000000000..b2e0ca670e --- /dev/null +++ b/janusgraph-examples/example-tinkergraph/pom.xml.versionsBackup @@ -0,0 +1,30 @@ + + 4.0.0 + + org.janusgraph + janusgraph-examples + 0.6.0 + ../pom.xml + + example-tinkergraph + Example-TinkerGraph: Example with TinkerGraph + https://janusgraph.org + + + + org.janusgraph + example-common + ${project.version} + + + org.apache.tinkerpop + tinkergraph-gremlin + + + + + org.janusgraph.example.TinkerGraphApp + ${project.basedir}/conf/jgex-tinkergraph.properties + + + diff --git a/janusgraph-examples/pom.xml b/janusgraph-examples/pom.xml index 4fd72a62e9..4568cd7f7f 100644 --- a/janusgraph-examples/pom.xml +++ b/janusgraph-examples/pom.xml @@ -3,7 +3,7 @@ org.janusgraph janusgraph - 0.6.0 + 0.6.6 ../pom.xml janusgraph-examples diff --git a/janusgraph-grpc/pom.xml b/janusgraph-grpc/pom.xml index 4ef87a1bad..4647ea83f6 100644 --- a/janusgraph-grpc/pom.xml +++ b/janusgraph-grpc/pom.xml @@ -4,7 +4,7 @@ org.janusgraph janusgraph - 0.6.0 + 0.6.6 janusgraph-grpc JanusGraph-gRPC: gRPC Components for JanusGraph diff --git a/janusgraph-hadoop/pom.xml b/janusgraph-hadoop/pom.xml index ef0633af3a..2cc4b21991 100644 --- a/janusgraph-hadoop/pom.xml +++ b/janusgraph-hadoop/pom.xml @@ -3,7 +3,7 @@ org.janusgraph janusgraph - 0.6.0 + 0.6.6 ../pom.xml janusgraph-hadoop diff --git a/janusgraph-hbase/pom.xml b/janusgraph-hbase/pom.xml index aa96e17816..e8188a93f6 100644 --- a/janusgraph-hbase/pom.xml +++ b/janusgraph-hbase/pom.xml @@ -3,7 +3,7 @@ org.janusgraph janusgraph - 0.6.0 + 0.6.6 janusgraph-hbase JanusGraph-HBase: Distributed Graph Database diff --git a/janusgraph-inmemory/pom.xml b/janusgraph-inmemory/pom.xml index bdb707d24e..73f0075a98 100644 --- a/janusgraph-inmemory/pom.xml +++ b/janusgraph-inmemory/pom.xml @@ -4,7 +4,7 @@ org.janusgraph janusgraph - 0.6.0 + 0.6.6 ../pom.xml janusgraph-inmemory diff --git a/janusgraph-lucene/pom.xml b/janusgraph-lucene/pom.xml index ef35094572..6cc41a00d2 100644 --- a/janusgraph-lucene/pom.xml +++ b/janusgraph-lucene/pom.xml @@ -3,7 +3,7 @@ org.janusgraph janusgraph - 0.6.0 + 0.6.6 ../pom.xml janusgraph-lucene diff --git a/janusgraph-server/pom.xml b/janusgraph-server/pom.xml index f7fd56e2ea..a73be3584f 100644 --- a/janusgraph-server/pom.xml +++ b/janusgraph-server/pom.xml @@ -4,7 +4,7 @@ org.janusgraph janusgraph - 0.6.0 + 0.6.6 janusgraph-server JanusGraph-Server: Server Components for JanusGraph diff --git a/janusgraph-solr/pom.xml b/janusgraph-solr/pom.xml index bf80edd547..9c1b82111e 100644 --- a/janusgraph-solr/pom.xml +++ b/janusgraph-solr/pom.xml @@ -3,7 +3,7 @@ org.janusgraph janusgraph - 0.6.0 + 0.6.6 ../pom.xml janusgraph-solr diff --git a/janusgraph-test/pom.xml b/janusgraph-test/pom.xml index dde4466643..26d886a909 100644 --- a/janusgraph-test/pom.xml +++ b/janusgraph-test/pom.xml @@ -3,7 +3,7 @@ org.janusgraph janusgraph - 0.6.0 + 0.6.6 ../pom.xml janusgraph-test diff --git a/pom.xml b/pom.xml index c3ba3f765f..6c4fb5d2a3 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.janusgraph janusgraph - 0.6.0 + 0.6.6 pom 3.0.0 diff --git a/pom.xml.versionsBackup b/pom.xml.versionsBackup new file mode 100644 index 0000000000..c3ba3f765f --- /dev/null +++ b/pom.xml.versionsBackup @@ -0,0 +1,1589 @@ + + 4.0.0 + org.janusgraph + janusgraph + 0.6.0 + pom + + 3.0.0 + + JanusGraph: Distributed Graph Database + https://janusgraph.org + + + JanusGraph is a distributed graph database optimized for processing massive-scale graphs represented over a machine + cluster. + JanusGraph separates the concerns of graph processing and manipulation from storing the graph on disk, + delegating that concern to an extensible set of persistence solutions. + + + + Matthias Broecheler + me@matthiasb.com + http://matthiasb.com + + + Daniel LaRocque + dalaro@hopcount.org + + + Pavel Yaskevich + povel.y@gmail.com + https://github.com/xedin + + + + + Marko A. Rodriguez + marko@markorodriguez.com + https://markorodriguez.com + + + Stephen Mallette + spmva@genoprime.com + https://stephen.genoprime.com + + + 2012 + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + + + scm:git:git@github.com:JanusGraph/janusgraph.git + scm:git:git@github.com:JanusGraph/janusgraph.git + git@github.com:JanusGraph/janusgraph.git + v0.6.0 + + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + 1.0.0,1.1.0-SNAPSHOT + 3.5.1 + 1.7.2 + 5.7.2 + 3.8.0 + 0.3.0 + 4.1.18 + 1.7.30 + 4.5.13 + 4.4.14 + 2.8.5 + 1.6.0 + 2.2.7 + 4.2.0-incubating + 1.21.0 + 1.7.1 + + 1.9.13 + + 2.10.0 + 8.9.0 + 7.14.0 + 1.9.4 + 3.2.2 + 3.6.2 + + 4.1.61.Final + 5.7.0 + 1.12.1 + UTF-8 + UTF-8 + ${project.build.directory}/janusgraph-test + false + 1.6 + + -Xms256m -Xmx768m -XX:+HeapDumpOnOutOfMemoryError -ea ${test.extra.jvm.opts} + -Xms256m -Xmx256m -ea -XX:+HeapDumpOnOutOfMemoryError ${test.extra.jvm.opts} + + false + true + ${basedir} + 3.2.0 + 1.8 + 1.8 + MEMORY_TESTS,PERFORMANCE_TESTS,BRITTLE_TESTS + false + 3.11.10 + 4.13.0 + 4.4.0 + 1.16.0 + 4.2 + 3.15.6 + 1.38.1 + 3.15.3 + 1.21 + + + janusgraph-grpc + janusgraph-driver + janusgraph-core + janusgraph-server + janusgraph-backend-testutils + janusgraph-test + janusgraph-inmemory + janusgraph-berkeleyje + janusgraph-cql + janusgraph-hadoop + janusgraph-hbase + janusgraph-bigtable + janusgraph-es + janusgraph-lucene + janusgraph-all + janusgraph-dist + janusgraph-doc + janusgraph-solr + janusgraph-examples + + + + apache-snapshots + repository.apache.org snapshots + https://repository.apache.org/content/repositories/snapshots + + false + + + true + + + + + ${basedir}/target + + + org.apache.maven.plugins + maven-enforcer-plugin + 3.0.0-M3 + + + enforce-dependency-convergence + + enforce + + + + + + com.google.guava:guava + com.fasterxml.jackson.core:jackson-annotations + com.fasterxml.jackson.core:jackson-databind + com.fasterxml.jackson.core:jackson-core + + + + + + + + + + maven-release-plugin + + + javadoc:aggregate deploy + + + false + + + @{project.version} + + + janusgraph-release + false + + + true + + + -DskipTests=true + + + + org.apache.rat + apache-rat-plugin + 0.13 + + + rat-checks + validate + + check + + + + + false + + **/target/** + **/.classpath + **/.project + **/.settings/** + **/src/main/resources/META-INF/services/** + **/src/test/resources/META-INF/services/** + **/*.iml + **/*.json + **/*.xml + **/*.xml.releaseBackup + docs/** + **/*.md + **/*.txt + **/*.log + **/*.patch + **/*.crt + **/*.sysconfig + **/*.csv + **/*.id + **/*.gz + .editorconfig + CC-BY-4.0.txt + **/cqlshrc + **/regionservers + **/jaas_keytab.conf + **/src/test/resources/excludes + **/src/test/resources/longTests1 + **/src/test/resources/longTests2 + **/src/pkg/static/debian/** + **/src/test/resources/mockito-extensions/** + **/src/test/resources/org/janusgraph/hadoop/formats/edgelist/rdf/** + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.1.2 + + + com.puppycrawl.tools + checkstyle + 8.42 + + + + true + true + ${project.build.sourceDirectories} + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + validate + validate + + check + + + + + + + + + + maven-compiler-plugin + 3.8.1 + + ${compiler.source} + ${compiler.target} + + 500 + + + -Xlint:unchecked + + + + + maven-surefire-plugin + 2.22.2 + + ${default.test.jvm.opts} + alphabetical + false + + 21600 + false + + **/*PerformanceTest.java + **/*ConcurrentTest.java + **/*Groovy*Test.java + **/*ComputerTest.java + **/*ProcessTest.java + **/*ProcessPerformanceTest.java + **/*StructureTest.java + + ${test.excluded.groups} + ${test.skip.default} + + + + log4j.configuration + file:${project.build.directory}/test-classes/log4j.properties + + + + + + tinkerpop-test + + test + + test + + false + 1 + none + 1 + false + + **/*Groovy*Test.java + **/*ComputerTest.java + **/*ProcessTest.java + **/*ProcessPerformanceTest.java + **/*StructureTest.java + + alphabetical + ${test.skip.tp} + + ${project.build.directory} + file:${project.build.directory}/test-classes/log4j.properties + true + + + + + + + maven-failsafe-plugin + 2.22.2 + + + + + log4j.configuration + file:${project.build.directory}/test-classes/log4j.properties + + + + + + maven-deploy-plugin + 2.8.2 + + + maven-jar-plugin + 3.2.0 + + + + ${project.version} + ${tinkerpop.version} + + + + + + maven-resources-plugin + 3.2.0 + + + maven-release-plugin + 2.5.3 + + + maven-javadoc-plugin + ${maven.javadoc.version} + + + maven-assembly-plugin + 3.3.0 + + + maven-source-plugin + 3.2.1 + + + maven-clean-plugin + 3.1.0 + + + maven-dependency-plugin + 3.1.2 + + + maven-gpg-plugin + ${maven.gpg.version} + + + org.codehaus.mojo + build-helper-maven-plugin + 3.2.0 + + + org.codehaus.mojo + exec-maven-plugin + 3.0.0 + + + org.codehaus.mojo + cobertura-maven-plugin + 2.7 + + true + + + + maven-antrun-plugin + 3.0.0 + + + org.jacoco + jacoco-maven-plugin + 0.8.6 + + + + + + + + + org.apache.tinkerpop + gremlin-core + ${tinkerpop.version} + + + org.apache.tinkerpop + gremlin-server + ${tinkerpop.version} + + + com.codahale.metrics + metrics-core + + + + + org.apache.tinkerpop + gremlin-console + ${tinkerpop.version} + + + org.apache.tinkerpop + gremlin-groovy + ${tinkerpop.version} + + + org.apache.tinkerpop + gremlin-driver + ${tinkerpop.version} + + + org.apache.tinkerpop + gremlin-test + ${tinkerpop.version} + + + junit + junit + + + org.ow2.asm + asm + + + org.apache.kerby + kerb-simplekdc + + + + + org.apache.tinkerpop + tinkergraph-gremlin + ${tinkerpop.version} + + + org.apache.tinkerpop + hadoop-gremlin + ${tinkerpop.version} + + + org.apache.tinkerpop + spark-gremlin + ${tinkerpop.version} + + + org.eclipse.jetty.orbit + javax.servlet + + + com.thoughtworks.paranamer + paranamer + + + + + org.apache.commons + commons-configuration2 + + 2.7 + + + + + com.fasterxml.jackson.core + jackson-core + ${jackson2.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson2.version} + + + com.fasterxml.jackson.datatype + jackson-datatype-json-org + ${jackson2.version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson2.version} + + + com.fasterxml.jackson.module + jackson-module-scala_2.12 + ${jackson2.version} + + + com.fasterxml.jackson.module + jackson-module-paranamer + ${jackson2.version} + + + com.google.code.findbugs + jsr305 + 3.0.2 + + + javax.validation + validation-api + 2.0.1.Final + + + + + org.codehaus.jackson + jackson-mapper-asl + ${jackson1.version} + + + org.codehaus.jackson + jackson-core-asl + ${jackson1.version} + + + org.codehaus.jackson + jackson-xc + ${jackson1.version} + + + org.codehaus.jackson + jackson-jaxrs + ${jackson1.version} + + + org.apache.commons + commons-lang3 + 3.11 + + + commons-configuration + commons-configuration + 1.10 + + + commons-collections + commons-collections + ${commons.collections.version} + + + commons-net + commons-net + 3.7.2 + + + commons-beanutils + commons-beanutils + ${commons.beanutils.version} + + + commons-beanutils + commons-beanutils-core + ${commons.beanutils.version} + + + commons-logging + commons-logging + 1.2 + + + org.apache.commons + commons-math + 2.2 + + + org.apache.commons + commons-math3 + 3.6.1 + + + org.yaml + snakeyaml + 1.28 + + + net.oneandone.reflections8 + reflections8 + 0.11.7 + + + xml-apis + xml-apis + 2.0.2 + + + org.apache.zookeeper + zookeeper + ${zookeeper.version} + + + org.apache.avro + avro + 1.10.1 + + + jboss-logging + org.jboss.logging + 3.4.1.Final + + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.slf4j + slf4j-log4j12 + ${slf4j.version} + + + log4j + log4j + 1.2.17 + + + ch.qos.logback + logback-classic + 1.1.3 + + + + org.mortbay.jetty + jetty + 6.1.26 + + + + net.jpountz.lz4 + lz4 + 1.3.0 + + + + io.netty + netty-all + ${netty4.version} + + + io.netty + netty-handler + ${netty4.version} + + + io.netty + netty-common + ${netty4.version} + + + io.netty + netty-resolver + ${netty4.version} + + + io.netty + netty-codec + ${netty4.version} + + + io.netty + netty-transport + ${netty4.version} + + + io.netty + netty-buffer + ${netty4.version} + + + io.netty + netty-transport-native-epoll + ${netty4.version} + + + io.netty + netty-transport-native-unix-common + ${netty4.version} + + + org.objenesis + objenesis + 3.2 + + + + org.junit.platform + junit-platform-launcher + ${junit-platform.version} + + + org.junit.platform + junit-platform-runner + ${junit-platform.version} + + + org.junit.jupiter + junit-jupiter-api + ${junit.version} + + + org.junit.jupiter + junit-jupiter-params + ${junit.version} + + + org.junit.jupiter + junit-jupiter-engine + ${junit.version} + + + org.junit.vintage + junit-vintage-engine + ${junit.version} + + + org.mockito + mockito-core + ${mockito.version} + + + org.mockito + mockito-inline + ${mockito.version} + + + org.mockito + mockito-junit-jupiter + ${mockito.version} + + + + com.google.guava + guava + 29.0-jre + + + com.google.errorprone + error_prone_annotations + 2.7.1 + + + commons-codec + commons-codec + 1.15 + + + commons-cli + commons-cli + 1.4 + + + org.jboss.netty + netty + 3.2.10.Final + + + io.netty + netty + 3.10.6.Final + + + + + org.locationtech.spatial4j + spatial4j + 0.8 + + + + + org.locationtech.jts + jts-core + 1.17.0 + + + + + commons-httpclient + commons-httpclient + 3.1 + + + + + org.apache.httpcomponents + httpclient + ${httpcomponents.httpclient.version} + + + org.apache.httpcomponents + httpcore + ${httpcomponents.httpcore.version} + + + org.apache.httpcomponents + httpcore-nio + ${httpcomponents.httpcore.version} + + + + com.googlecode.json-simple + json-simple + 1.1.1 + + + + commons-io + commons-io + 2.8.0 + + + org.jacoco + org.jacoco.ant + 0.8.6 + + + io.dropwizard.metrics + metrics-core + ${metrics.version} + + + io.dropwizard.metrics + metrics-jvm + ${metrics.version} + + + io.dropwizard.metrics + metrics-graphite + ${metrics.version} + + + io.dropwizard.metrics + metrics-jmx + ${metrics.version} + + + com.boundary + high-scale-lib + 1.0.6 + + + com.clearspring.analytics + stream + 2.9.8 + + + it.unimi.dsi + fastutil + 8.5.2 + + + org.apache.cassandra + cassandra-all + ${cassandra.version} + + + org.javassist + javassist + 3.27.0-GA + + + com.carrotsearch + junit-benchmarks + 0.7.2 + + + com.carrotsearch + hppc + 0.8.2 + + + com.carrotsearch.randomizedtesting + randomizedtesting-runner + 2.7.8 + + + junit + junit + + + + + org.apache.commons + commons-compress + 1.21 + + + com.google.protobuf + protobuf-java + ${protobuf.version} + + + com.google.protobuf + protobuf-java-util + ${protobuf.version} + + + io.grpc + grpc-core + ${grpc.version} + + + io.grpc + grpc-protobuf + ${grpc.version} + + + io.grpc + grpc-stub + ${grpc.version} + + + io.grpc + grpc-testing + ${grpc.version} + + + io.grpc + grpc-netty-shaded + ${grpc.version} + + + org.apache.velocity + velocity + 1.7 + + + commons-lang + commons-lang + + + + + org.apache.ant + ant + 1.10.11 + + + javax.servlet + servlet-api + 2.5 + + + org.elasticsearch.client + elasticsearch-rest-client + ${elasticsearch.version} + + + org.testcontainers + testcontainers + ${testcontainers.version} + + + net.java.dev.jna + jna + + + junit + junit + + + + + org.testcontainers + elasticsearch + ${testcontainers.version} + + + org.testcontainers + cassandra + ${testcontainers.version} + + + com.datastax.cassandra + cassandra-driver-core + + + + + org.testcontainers + solr + ${testcontainers.version} + + + org.testcontainers + junit-jupiter + ${testcontainers.version} + + + org.easymock + easymock + ${easymock.version} + + + io.github.artsok + rerunner-jupiter + 2.1.6 + + + org.xerial.snappy + snappy-java + 1.1.7.6 + + + javax.activation + activation + 1.1.1 + + + org.slf4j + jcl-over-slf4j + 1.7.30 + + + com.nimbusds + nimbus-jose-jwt + 8.2.1 + + + org.apache.commons + commons-text + 1.9 + + + + + + + + org.slf4j + slf4j-api + + + org.slf4j + slf4j-log4j12 + runtime + true + + + log4j + log4j + runtime + true + + + + + + java-11 + + 11 + 11 + + + + + janusgraph-release + + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + package + + jar-no-fork + + + + + + maven-javadoc-plugin + + + attach-javadocs + package + + jar + + + + true + + + + + + maven-gpg-plugin + + + sign-artifacts + package + + sign + + + true + ${gpg.skip} + + *.asc + + + + + + + + + + + hadoop2 + + + + !hadoop.profile + + + + + + + org.apache.hadoop + hadoop-annotations + ${hadoop2.version} + + + org.apache.hadoop + hadoop-auth + ${hadoop2.version} + + + org.apache.hadoop + hadoop-client + ${hadoop2.version} + + + javax.servlet + servlet-api + + + org.apache.commons + commons-compress + + + + + org.apache.hadoop + hadoop-common + ${hadoop2.version} + + + org.apache.hadoop + hadoop-hdfs + ${hadoop2.version} + + + org.apache.hadoop + hadoop-hdfs + ${hadoop2.version} + tests + test-jar + + + org.apache.hadoop + hadoop-mapreduce-client-common + ${hadoop2.version} + + + org.apache.hadoop + hadoop-mapreduce-client-core + ${hadoop2.version} + + + org.apache.hadoop + hadoop-mapreduce-client-jobclient + ${hadoop2.version} + + + org.apache.hadoop + hadoop-mapreduce-client-jobclient + ${hadoop2.version} + tests + test-jar + + + org.apache.hadoop + hadoop-mapreduce-client-shuffle + ${hadoop2.version} + + + org.apache.hadoop + hadoop-yarn-api + ${hadoop2.version} + + + org.apache.hadoop + hadoop-yarn-common + ${hadoop2.version} + + + org.apache.hadoop + hadoop-yarn-server-common + ${hadoop2.version} + + + + + + + coverage + + ${jacoco.opts} + + + + + maven-resources-plugin + + + copy-sources-for-jacoco + process-resources + + copy-resources + + + ${project.build.directory}/jacoco-sources + + + ${project.basedir}/src/main/java/ + false + + + + + + copy-classes-for-jacoco + process-classes + + copy-resources + + + ${project.build.directory}/jacoco-classes + + + ${project.build.directory}/classes/ + false + + + + + + + + maven-dependency-plugin + + + + unpack-dependency-sources + generate-resources + + unpack-dependencies + + + sources + ${project.build.directory}/jacoco-sources + ${project.groupId} + janusgraph-test + + + + unpack-dependency-classes + generate-resources + + unpack-dependencies + + + + + ${project.build.directory}/jacoco-classes + ${project.groupId} + janusgraph-test + + + + + + org.jacoco + jacoco-maven-plugin + + + prepare-jacoco-agent + test-compile + + prepare-agent + + + ${top.level.basedir}/target/jacoco-combined.exec + true + jacoco.opts + + + + + + + maven-antrun-plugin + + + default-cli + post-integration-test + + run + + + + + + + + + + + + + + + + + + + + + + + + + + org.jacoco + org.jacoco.ant + 0.8.6 + + + + + + + + + memory-test + + + test.skip.mem + false + + + + + + maven-surefire-plugin + + + memory-test + + test + + test + + ${mem.jvm.opts} + false + 1 + none + 1 + false + alphabetical + MEMORY_TESTS + + + + + + + + + + + performance-test + + + test.skip.perf + false + + + + + + maven-surefire-plugin + + + performance-test + + test + + test + + ${default.test.jvm.opts} ${perf.jvm.opts} + false + 1 + none + 1 + false + alphabetical + PERFORMANCE_TESTS + + + + + + + + + +