This is an automated email from the ASF dual-hosted git repository.
guoshoujing pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-hugegraph-toolchain.git
The following commit(s) were added to refs/heads/master by this push:
new 296d13a refact: adopt all modules run actions well in toolchain &
enhance the ci logic (#268)
296d13a is described below
commit 296d13ab19772b27e7238adc494b17ca17685cde
Author: imbajin <[email protected]>
AuthorDate: Mon May 9 17:49:11 2022 +0800
refact: adopt all modules run actions well in toolchain & enhance the ci
logic (#268)
---
.github/{workflows => outdated}/cla.yml | 1 +
.github/workflows/ci.yml | 78 ---
.../ci.yml => .github/workflows/client-ci.yml | 16 +-
.../ci.yml => .github/workflows/hubble-ci.yml | 20 +-
.../ci.yml => .github/workflows/loader-ci.yml | 32 +-
.github/workflows/release.yml | 3 +-
.../ci.yml => .github/workflows/tools-ci.yml | 17 +-
assembly/descriptor/assembly.xml | 54 ++
assembly/static/conf/log4j2.xml | 41 ++
assembly/static/lib/ojdbc8-12.2.0.1.jar | Bin 0 -> 4036257 bytes
hugegraph-loader/checkstyle.xml => checkstyle.xml | 2 +-
hugegraph-client/.travis.yml | 30 -
.../travis/install-hugegraph-from-source.sh | 8 +-
hugegraph-client/pom.xml | 2 +-
hugegraph-hubble/.travis.yml | 43 --
hugegraph-hubble/hubble-be/pom.xml | 7 +-
.../assembly/travis/install-hugegraph-hubble.sh | 10 +-
.../hubble-dist/assembly/travis/run-api-test.sh | 3 +
hugegraph-hubble/hubble-dist/pom.xml | 19 +-
hugegraph-hubble/pom.xml | 25 +-
.../travis/install-hugegraph-from-source.sh | 4 +-
.../assembly/travis/install-hugegraph-from-tar.sh | 2 +-
hugegraph-loader/assembly/travis/install-mysql.sh | 42 +-
hugegraph-loader/pom.xml | 6 +-
hugegraph-tools/.travis.yml | 27 -
.../travis/install-hugegraph-from-source.sh | 6 +-
hugegraph-tools/checkstyle.xml | 87 ---
hugegraph-tools/pom.xml | 6 +-
pom.xml | 681 ++++++++-------------
29 files changed, 476 insertions(+), 796 deletions(-)
diff --git a/.github/workflows/cla.yml b/.github/outdated/cla.yml
similarity index 96%
rename from .github/workflows/cla.yml
rename to .github/outdated/cla.yml
index a182b95..469652c 100644
--- a/.github/workflows/cla.yml
+++ b/.github/outdated/cla.yml
@@ -1,3 +1,4 @@
+# due to the permission with apache action, stop use cla action now
name: "CLA Assistant"
on:
issue_comment:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
deleted file mode 100644
index 0e7c849..0000000
--- a/.github/workflows/ci.yml
+++ /dev/null
@@ -1,78 +0,0 @@
-# TODO: refactor it later
-name: hugegraph-toolchain ci
-
-on:
- push:
- branches:
- - master
- - /^release-.*$/
- - /^test-.*$/
- pull_request:
- branches:
- - master
- - /^release-.*$/
- - /^test-.*$/
-
-jobs:
- build:
- runs-on: ubuntu-20.04
- env:
- TRAVIS_DIR: assembly/travis
- STATIC_DIR: assembly/static
- COMMIT_ID: 1d031c5905cbef008dd5fb468576b0e6a9445181
- DB_USER: root
- DB_PASS: root
- DB_DATABASE: load_test
- steps:
- - name: Install JDK 8
- uses: actions/setup-java@v2
- with:
- java-version: '8'
- distribution: 'zulu'
-
- - name: Cache Maven packages
- uses: actions/cache@v2
- with:
- path: ~/.m2
- key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
- restore-keys: ${{ runner.os }}-m2
-
- - name: Checkout
- uses: actions/checkout@v2
- with:
- fetch-depth: 2
-
- - name: Compile
- run: |
- mvn install:install-file -Dfile=$STATIC_DIR/lib/ojdbc8-12.2.0.1.jar
-DgroupId=com.oracle -DartifactId=ojdbc8 -Dversion=12.2.0.1 -Dpackaging=jar
- mvn compile -Dmaven.javadoc.skip=true | grep -v
"Downloading\|Downloaded"
-
- - name: Init Mysql Env
- uses: mirromutth/[email protected]
- with:
- host port: 3306 # Optional, default value is 3306. The port of host
- container port: 3306 # Optional, default value is 3306. The port of
container
- character set server: 'utf8mb4' # Optional, default value is
'utf8mb4'. The '--character-set-server' option for mysqld
- collation server: 'utf8mb4_general_ci' # Optional, default value is
'utf8mb4_general_ci'. The '--collation-server' option for mysqld
- mysql version: '5.7' # Optional, default value is "latest". The
version of the MySQL
- mysql database: ${{ env.DB_DATABASE }} # Optional, default value is
"test". The specified database which will be create
- mysql root password: ${{ env.DB_PASS }} # Required if "mysql user"
is empty, default is empty. The root superuser password
- #mysql user: 'root' # Required if "mysql root password" is empty,
default is empty. The superuser for the specified database. Can use secrets, too
- #mysql password: ${{ secrets.DatabasePassword }} # Required if
"mysql user" exists. The password for the "mysql user"
-
- - name: Prepare env and service
- run: |
- $TRAVIS_DIR/install-hadoop.sh
- $TRAVIS_DIR/install-hugegraph-from-source.sh $COMMIT_ID
-
- - name: Run test
- run: |
- mvn test -P unit
- mvn test -P file
- mvn test -P hdfs
- mvn test -P jdbc
-
- - name: Upload coverage to Codecov
- uses: codecov/codecov-action@v1
- with:
- file: target/jacoco.xml
diff --git a/hugegraph-client/.github/workflows/ci.yml
b/.github/workflows/client-ci.yml
similarity index 76%
rename from hugegraph-client/.github/workflows/ci.yml
rename to .github/workflows/client-ci.yml
index 2be805f..d954d09 100644
--- a/hugegraph-client/.github/workflows/ci.yml
+++ b/.github/workflows/client-ci.yml
@@ -1,4 +1,4 @@
-name: hugegraph-client ci
+name: hugegraph-client-ci
on:
push:
@@ -6,17 +6,23 @@ on:
- master
- /^release-.*$/
- /^test-.*$/
+ paths:
+ - hugegraph-client/**
+ - pom.xml
pull_request:
branches:
- master
- /^release-.*$/
- /^test-.*$/
+ paths:
+ - hugegraph-client/**
+ - pom.xml
jobs:
build:
runs-on: ubuntu-20.04
env:
- TRAVIS_DIR: assembly/travis
+ TRAVIS_DIR: hugegraph-client/assembly/travis
COMMIT_ID: 1d031c5905cbef008dd5fb468576b0e6a9445181
strategy:
fail-fast: false
@@ -43,7 +49,8 @@ jobs:
- name: Compile
run: |
- mvn compile -Dmaven.javadoc.skip=true | grep -v
"Downloading\|Downloaded"
+ cd hugegraph-client && ls *
+ mvn -e compile -Dmaven.javadoc.skip=true | grep -v
"Downloading\|Downloaded"
- name: Prepare env and service
run: |
@@ -51,11 +58,12 @@ jobs:
- name: Run test
run: |
+ cd hugegraph-client && ls *
mvn test -Dtest=UnitTestSuite
mvn test -Dtest=ApiTestSuite
mvn test -Dtest=FuncTestSuite
- name: Upload coverage to Codecov
- uses: codecov/codecov-action@v1
+ uses: codecov/[email protected]
with:
file: target/jacoco.xml
diff --git a/hugegraph-hubble/.github/workflows/ci.yml
b/.github/workflows/hubble-ci.yml
similarity index 79%
rename from hugegraph-hubble/.github/workflows/ci.yml
rename to .github/workflows/hubble-ci.yml
index 8afd977..ca570ce 100644
--- a/hugegraph-hubble/.github/workflows/ci.yml
+++ b/.github/workflows/hubble-ci.yml
@@ -1,4 +1,4 @@
-name: hugegraph-hubble ci
+name: hugegraph-hubble-ci
on:
push:
@@ -7,15 +7,21 @@ on:
- /^release-.*$/
- /^test-.*$/
- /^v[0-9]\..*$/
+ paths:
+ - hugegraph-hubble/**
+ - pom.xml
pull_request:
branches:
- master
- /^release-.*$/
- /^test-.*$/
- /^v[0-9]\..*$/
+ paths:
+ - hugegraph-hubble/**
+ - pom.xml
env:
- TRAVIS_DIR: hubble-dist/assembly/travis
+ TRAVIS_DIR: hugegraph-hubble/hubble-dist/assembly/travis
SERVER_VERSION: 0.12.0
jobs:
@@ -66,7 +72,8 @@ jobs:
- name: Compile
run: |
- mvn clean compile -Dmaven.javadoc.skip=true | grep -v
"Downloading\|Downloaded"
+ cd hugegraph-hubble && ls *
+ mvn -e clean compile -Dmaven.javadoc.skip=true | grep -v
"Downloading\|Downloaded"
- name: Prepare env and service
run: |
@@ -74,15 +81,16 @@ jobs:
$TRAVIS_DIR/install-hugegraph.sh $SERVER_VERSION
- name: Unit test
- run: mvn test -P unit-test
+ run: cd hugegraph-hubble && mvn test -P unit-test
- name: API test
env:
CI: false
run: |
- $TRAVIS_DIR/run-api-test.sh
+ cd hugegraph-hubble && ls
+ hubble-dist/assembly/travis/run-api-test.sh
- name: Upload coverage to Codecov
- uses: codecov/codecov-action@v1
+ uses: codecov/[email protected]
with:
file: target/site/jacoco/*.xml
diff --git a/hugegraph-loader/.github/workflows/ci.yml
b/.github/workflows/loader-ci.yml
similarity index 50%
rename from hugegraph-loader/.github/workflows/ci.yml
rename to .github/workflows/loader-ci.yml
index e139b40..dcbc5a3 100644
--- a/hugegraph-loader/.github/workflows/ci.yml
+++ b/.github/workflows/loader-ci.yml
@@ -1,4 +1,4 @@
-name: hugegraph-loader ci
+name: hugegraph-loader-ci
on:
push:
@@ -6,18 +6,24 @@ on:
- master
- /^release-.*$/
- /^test-.*$/
+ paths:
+ - hugegraph-loader/**
+ - pom.xml
pull_request:
branches:
- master
- /^release-.*$/
- /^test-.*$/
+ paths:
+ - hugegraph-loader/**
+ - pom.xml
jobs:
build:
runs-on: ubuntu-20.04
env:
- TRAVIS_DIR: assembly/travis
- STATIC_DIR: assembly/static
+ TRAVIS_DIR: hugegraph-loader/assembly/travis
+ STATIC_DIR: hugegraph-loader/assembly/static
COMMIT_ID: 1d031c5905cbef008dd5fb468576b0e6a9445181
DB_USER: root
DB_PASS: root
@@ -44,34 +50,24 @@ jobs:
- name: Compile
run: |
mvn install:install-file -Dfile=$STATIC_DIR/lib/ojdbc8-12.2.0.1.jar
-DgroupId=com.oracle -DartifactId=ojdbc8 -Dversion=12.2.0.1 -Dpackaging=jar
- mvn compile -Dmaven.javadoc.skip=true | grep -v
"Downloading\|Downloaded"
-
- - name: Init Mysql Env
- uses: mirromutth/[email protected]
- with:
- host port: 3306 # Optional, default value is 3306. The port of host
- container port: 3306 # Optional, default value is 3306. The port of
container
- character set server: 'utf8mb4' # Optional, default value is
'utf8mb4'. The '--character-set-server' option for mysqld
- collation server: 'utf8mb4_general_ci' # Optional, default value is
'utf8mb4_general_ci'. The '--collation-server' option for mysqld
- mysql version: '5.7' # Optional, default value is "latest". The
version of the MySQL
- mysql database: ${{ env.DB_DATABASE }} # Optional, default value is
"test". The specified database which will be create
- mysql root password: ${{ env.DB_PASS }} # Required if "mysql user"
is empty, default is empty. The root superuser password
- #mysql user: 'root' # Required if "mysql root password" is empty,
default is empty. The superuser for the specified database. Can use secrets, too
- #mysql password: ${{ secrets.DatabasePassword }} # Required if
"mysql user" exists. The password for the "mysql user"
+ cd hugegraph-loader && ls *
+ mvn -e compile -Dmaven.javadoc.skip=true | grep -v
"Downloading\|Downloaded"
- name: Prepare env and service
run: |
$TRAVIS_DIR/install-hadoop.sh
+ $TRAVIS_DIR/install-mysql.sh ${{ env.DB_DATABASE }} ${{ env.DB_PASS
}}
$TRAVIS_DIR/install-hugegraph-from-source.sh $COMMIT_ID
- name: Run test
run: |
+ cd hugegraph-loader && ls
mvn test -P unit
mvn test -P file
mvn test -P hdfs
mvn test -P jdbc
- name: Upload coverage to Codecov
- uses: codecov/codecov-action@v1
+ uses: codecov/[email protected]
with:
file: target/jacoco.xml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3698c37..aef83b5 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,4 +1,5 @@
-name: release package
+# TODO: unify all modules later
+name: release-package
on:
release:
diff --git a/hugegraph-tools/.github/workflows/ci.yml
b/.github/workflows/tools-ci.yml
similarity index 75%
rename from hugegraph-tools/.github/workflows/ci.yml
rename to .github/workflows/tools-ci.yml
index 0b88e42..e134753 100644
--- a/hugegraph-tools/.github/workflows/ci.yml
+++ b/.github/workflows/tools-ci.yml
@@ -1,20 +1,27 @@
-name: hugegraph-tools ci
+name: hugegraph-tools-ci
on:
push:
branches:
- master
- /^release-.*$/
- /^test-.*$/
+ paths:
+ - hugegraph-tools/**
+ - pom.xml
pull_request:
branches:
- master
- /^release-.*$/
- /^test-.*$/
+ paths:
+ - hugegraph-tools/**
+ - pom.xml
+
jobs:
build:
runs-on: ubuntu-20.04
env:
- TRAVIS_DIR: assembly/travis
+ TRAVIS_DIR: hugegraph-tools/assembly/travis
COMMIT_ID: 1d031c5905cbef008dd5fb468576b0e6a9445181
steps:
- name: Install JDK 8
@@ -34,14 +41,16 @@ jobs:
fetch-depth: 2
- name: Compile
run: |
- mvn compile -Dmaven.javadoc.skip=true
+ cd hugegraph-tools && ls *
+ mvn -e compile -Dmaven.javadoc.skip=true
- name: Prepare env and service
run: |
$TRAVIS_DIR/install-hugegraph-from-source.sh $COMMIT_ID
- name: Run test
run: |
+ cd hugegraph-tools && ls *
mvn test -Dtest=FuncTestSuite
- name: Upload coverage to Codecov
- uses: codecov/codecov-action@v1
+ uses: codecov/[email protected]
with:
file: target/jacoco.xml
diff --git a/assembly/descriptor/assembly.xml b/assembly/descriptor/assembly.xml
new file mode 100644
index 0000000..8bb3eb6
--- /dev/null
+++ b/assembly/descriptor/assembly.xml
@@ -0,0 +1,54 @@
+<assembly>
+ <id>distribution</id>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <formats>
+ <format>dir</format>
+ </formats>
+
+ <fileSets>
+ <fileSet>
+ <directory>${assembly.static.dir}/bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ <includes>
+ <include>*</include>
+ </includes>
+ <fileMode>755</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>${assembly.static.dir}</directory>
+ <outputDirectory>/</outputDirectory>
+ <filtered>false</filtered>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>README*</include>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.build.directory}</directory>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+ <dependencySets>
+ <!-- Code jars -->
+ <dependencySet>
+ <outputDirectory>/lib</outputDirectory>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ <useProjectArtifact>false</useProjectArtifact>
+ <includes>
+ <include>*:*:jar:*</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
diff --git a/assembly/static/conf/log4j2.xml b/assembly/static/conf/log4j2.xml
new file mode 100644
index 0000000..429d8ab
--- /dev/null
+++ b/assembly/static/conf/log4j2.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<configuration status="error">
+ <Properties>
+ <property name="log-charset">UTF-8</property>
+ </Properties>
+ <appenders>
+ <Console name="console" target="SYSTEM_OUT">
+ <ThresholdFilter level="DEBUG" onMatch="ACCEPT" onMismatch="DENY"/>
+ <PatternLayout charset="${log-charset}" pattern="%-d{yyyy-MM-dd
HH:mm:ss} [%t] [%-5p] %c{1.} %x - %m%n" />
+ </Console>
+
+ <RollingFile name="file" fileName="logs/hugegraph-loader.log"
+ filePattern="logs/hugegraph-loader-%d{yyyy-MM-dd}-%i.log">
+ <ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
+ <PatternLayout charset="${log-charset}" pattern="%-d{yyyy-MM-dd
HH:mm:ss} [%t] [%-5p] %c{1.} %x - %m%n" />
+ <SizeBasedTriggeringPolicy size="10MB"/>
+ </RollingFile>
+ </appenders>
+ <loggers>
+ <root level="INFO">
+ <appender-ref ref="file"/>
+ </root>
+ <logger name="org.apache.cassandra" level="WARN" additivity="false">
+ <appender-ref ref="file"/>
+ </logger>
+ <logger name="org.apache.hadoop" level="WARN" additivity="false">
+ <appender-ref ref="file"/>
+ </logger>
+ <logger name="io.netty" level="WARN" additivity="false">
+ <appender-ref ref="file"/>
+ </logger>
+ <logger name="org.apache.commons" level="WARN" additivity="false">
+ <appender-ref ref="file"/>
+ </logger>
+
+ <logger name="com.baidu.hugegraph" level="INFO" additivity="false">
+ <appender-ref ref="file"/>
+ </logger>
+ </loggers>
+</configuration>
diff --git a/assembly/static/lib/ojdbc8-12.2.0.1.jar
b/assembly/static/lib/ojdbc8-12.2.0.1.jar
new file mode 100644
index 0000000..bf41243
Binary files /dev/null and b/assembly/static/lib/ojdbc8-12.2.0.1.jar differ
diff --git a/hugegraph-loader/checkstyle.xml b/checkstyle.xml
similarity index 98%
rename from hugegraph-loader/checkstyle.xml
rename to checkstyle.xml
index ea62227..b70dfa7 100644
--- a/hugegraph-loader/checkstyle.xml
+++ b/checkstyle.xml
@@ -19,7 +19,7 @@
<module name="TreeWalker">
<!--检查行长度-->
<module name="LineLength">
- <property name="max" value="80"/>
+ <property name="max" value="100"/>
<!--可以忽略的行-->
<property name="ignorePattern"
value="^package.*|^import.*|a
href|href|http://|https://|ftp://"/>
diff --git a/hugegraph-client/.travis.yml b/hugegraph-client/.travis.yml
deleted file mode 100644
index 7babb8d..0000000
--- a/hugegraph-client/.travis.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-language: java
-
-jdk:
- - openjdk8
-
-sudo: required
-
-branches:
- only:
- - master
- - /^release-.*$/
- - /^test-.*$/
-
-install: mvn compile -Dmaven.javadoc.skip=true | grep -v
"Downloading\|Downloaded"
-
-before_script:
- - $TRAVIS_DIR/install-hugegraph-from-source.sh $TRAVIS_BRANCH | grep -v
"Downloading\|Downloaded"
-
-script:
- - mvn test -Dtest=UnitTestSuite
- - mvn test -Dtest=ApiTestSuite
- - mvn test -Dtest=FuncTestSuite
-
-after_success:
- - bash <(curl -s https://codecov.io/bash)
-
-env:
- global:
- - TRAVIS_DIR=assembly/travis
- - COMMIT_ID=461948ee262cc696853a8c8ba1306e6b371e3e89
diff --git a/hugegraph-client/assembly/travis/install-hugegraph-from-source.sh
b/hugegraph-client/assembly/travis/install-hugegraph-from-source.sh
index c594320..829bf1e 100755
--- a/hugegraph-client/assembly/travis/install-hugegraph-from-source.sh
+++ b/hugegraph-client/assembly/travis/install-hugegraph-from-source.sh
@@ -8,13 +8,13 @@ if [[ $# -ne 1 ]]; then
fi
COMMIT_ID=$1
-HUGEGRAPH_GIT_URL="https://github.com/hugegraph/hugegraph.git";
+HUGEGRAPH_GIT_URL="https://github.com/apache/incubator-hugegraph.git";
GIT_DIR=hugegraph
# download code and compile
-git clone --depth 100 ${HUGEGRAPH_GIT_URL}
+git clone --depth 100 ${HUGEGRAPH_GIT_URL} $GIT_DIR
cd "${GIT_DIR}"
-git checkout ${COMMIT_ID}
+git checkout "${COMMIT_ID}"
mvn package -DskipTests
TAR=$(echo hugegraph-*.tar.gz)
@@ -22,7 +22,7 @@ tar -zxvf "${TAR}" -C ../
cd ../
rm -rf "${GIT_DIR}"
-HTTP_SERVER_DIR=$(echo hugegraph-*)
+HTTP_SERVER_DIR=$(echo hugegraph-*.*)
HTTPS_SERVER_DIR="hugegraph_https"
cp -r "${HTTP_SERVER_DIR}" "${HTTPS_SERVER_DIR}"
diff --git a/hugegraph-client/pom.xml b/hugegraph-client/pom.xml
index 409096e..ad96ede 100644
--- a/hugegraph-client/pom.xml
+++ b/hugegraph-client/pom.xml
@@ -12,7 +12,7 @@
<artifactId>hugegraph-client</artifactId>
<packaging>jar</packaging>
- <name>${artifactId}}</name>
+ <name>${project.artifactId}</name>
<url>https://github.com/apache/incubator-hugegraph-toolchain/tree/master/hugegraph-client</url>
<description>
hugegraph-client is a Java-written client of HugeGraph, providing
diff --git a/hugegraph-hubble/.travis.yml b/hugegraph-hubble/.travis.yml
deleted file mode 100644
index cd7f5aa..0000000
--- a/hugegraph-hubble/.travis.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-sudo: required
-
-language: java
-jdk:
- - oraclejdk8
-
-dist: trusty
-
-cache:
- directories:
- - $HOME/.m2
- - $HOME/.cache/pip
- - $HOME/downloads
-
-branches:
- only:
- - master
- - /^release-.*$/
- - /^test-.*$/
-
-install:
- - mvn compile -Dmaven.javadoc.skip=true | grep -v "Downloading\|Downloaded"
- - sudo pip install -r ${TRAVIS_DIR}/requirements.txt
-
-before_script:
- - $TRAVIS_DIR/download-hugegraph.sh $SERVER_VERSION
- - $TRAVIS_DIR/hugegraph-server1/install-hugegraph.sh
- - $TRAVIS_DIR/hugegraph-server2/install-hugegraph.sh
- - $TRAVIS_DIR/install-hugegraph-hubble.sh
- - jps
-
-script:
- - mvn test -Punit-test
- - $TRAVIS_DIR/run-api-test.sh
- - $TRAVIS_DIR/build-report.sh
-
-after_success:
- - bash <(curl -s https://codecov.io/bash)
-
-env:
- global:
- - TRAVIS_DIR=hubble-dist/assembly/travis
- - SERVER_VERSION=0.10.4
diff --git a/hugegraph-hubble/hubble-be/pom.xml
b/hugegraph-hubble/hubble-be/pom.xml
index 075689e..5de00d4 100644
--- a/hugegraph-hubble/hubble-be/pom.xml
+++ b/hugegraph-hubble/hubble-be/pom.xml
@@ -2,12 +2,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.hugegraph</groupId>
<artifactId>hugegraph-hubble</artifactId>
<version>${revision}</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>hubble-be</artifactId>
@@ -62,13 +62,15 @@
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
- <version>2.8.0</version>
</dependency>
<dependency>
<groupId>com.baidu.hugegraph</groupId>
+ <!-- TODO: replace it with inner pkg later -->
+<!-- <groupId>org.apache.hugegraph</groupId>-->
<artifactId>hugegraph-loader</artifactId>
<version>0.12.0</version>
+<!-- <version>${revision}</version>-->
<exclusions>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
@@ -140,6 +142,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
+ <version>2.4</version>
<configuration>
<archive>
<manifest>
diff --git
a/hugegraph-hubble/hubble-dist/assembly/travis/install-hugegraph-hubble.sh
b/hugegraph-hubble/hubble-dist/assembly/travis/install-hugegraph-hubble.sh
index cdd7e31..d20d443 100755
--- a/hugegraph-hubble/hubble-dist/assembly/travis/install-hugegraph-hubble.sh
+++ b/hugegraph-hubble/hubble-dist/assembly/travis/install-hugegraph-hubble.sh
@@ -3,10 +3,12 @@
set -ev
TRAVIS_DIR=$(dirname "$0")
+HUBBLE_DIR=$(echo hugegraph-hubble-*.*)
-mvn -e clean package -DskipTests
+echo "$TRAVIS_DIR"
+pwd && mvn -e -X clean package -DskipTests
-cp "${TRAVIS_DIR}"/jacocoagent.jar hugegraph-hubble-*/lib
-cp "${TRAVIS_DIR}"/start-hubble.sh hugegraph-hubble-*/bin
+cp "${TRAVIS_DIR}"/jacocoagent.jar "$HUBBLE_DIR"/lib || exit 1
+cp "${TRAVIS_DIR}"/start-hubble.sh "$HUBBLE_DIR"/bin || exit 1
-hugegraph-hubble-*/bin/start-hubble.sh
+sh hugegraph-hubble-*/bin/start-hubble.sh
diff --git a/hugegraph-hubble/hubble-dist/assembly/travis/run-api-test.sh
b/hugegraph-hubble/hubble-dist/assembly/travis/run-api-test.sh
index a61c891..449889c 100755
--- a/hugegraph-hubble/hubble-dist/assembly/travis/run-api-test.sh
+++ b/hugegraph-hubble/hubble-dist/assembly/travis/run-api-test.sh
@@ -2,6 +2,9 @@
set -ev
+TRAVIS_DIR="hubble-dist/assembly/travis"
+pwd
+
"$TRAVIS_DIR"/install-hugegraph-hubble.sh
behave hubble-be/src/test/python
diff --git a/hugegraph-hubble/hubble-dist/pom.xml
b/hugegraph-hubble/hubble-dist/pom.xml
index dcf12a6..373dddd 100644
--- a/hugegraph-hubble/hubble-dist/pom.xml
+++ b/hugegraph-hubble/hubble-dist/pom.xml
@@ -12,20 +12,20 @@
<artifactId>hubble-dist</artifactId>
<properties>
- <release.name>${artifactId}</release.name>
+ <release.name>${project.parent.artifactId}</release.name>
<final.name>${release.name}-${project.version}</final.name>
- <top.level.basedir>${project.basedir}/..</top.level.basedir>
- <assembly.dir>${project.basedir}/assembly</assembly.dir>
+ <current.basedir>${project.basedir}/</current.basedir>
+ <assembly.dir>${current.basedir}/assembly</assembly.dir>
<assembly.descriptor.dir>${assembly.dir}/descriptor</assembly.descriptor.dir>
<assembly.static.dir>${assembly.dir}/static</assembly.static.dir>
- <hubble-fe.dir>${top.level.basedir}/hubble-fe</hubble-fe.dir>
+ <hubble-fe.dir>${project.parent.basedir}/hubble-fe</hubble-fe.dir>
</properties>
<dependencies>
<dependency>
- <groupId>com.baidu.hugegraph</groupId>
+ <groupId>org.apache.hugegraph</groupId>
<artifactId>hubble-be</artifactId>
- <version>${project.version}</version>
+ <version>${revision}</version>
</dependency>
</dependencies>
@@ -63,11 +63,11 @@
<configuration>
<tasks>
<echo file="${top.level.dir}/dist.sh">
- cd ${hubble-fe.dir} && pwd
+ cd ${hubble-fe.dir} || exit 1
yarn install && yarn build || exit
1
echo -e "Hubble-FE build successfully.\n"
- cd ..
+ cd ${top.level.dir} && pwd
rm -rf ${final.name}/ui
cp -r ${hubble-fe.dir}/build
${final.name}/ui
@@ -76,8 +76,7 @@
echo
"${top.level.dir}/${final.name}.tar.gz"
rm -f ${top.level.dir}/dist.sh
</echo>
- <exec executable="${shell-executable}"
- dir="${top.level.dir}"
failonerror="true">
+ <exec executable="${shell-executable}"
dir="${top.level.dir}" failonerror="true">
<arg line="./dist.sh"/>
</exec>
</tasks>
diff --git a/hugegraph-hubble/pom.xml b/hugegraph-hubble/pom.xml
index bb8f018..61b8681 100644
--- a/hugegraph-hubble/pom.xml
+++ b/hugegraph-hubble/pom.xml
@@ -13,7 +13,7 @@
<artifactId>hugegraph-hubble</artifactId>
<packaging>pom</packaging>
- <name>${artifactId}}</name>
+ <name>${project.artifactId}</name>
<url>https://github.com/apache/incubator-hugegraph-toolchain/tree/master/hugegraph-hubble</url>
<description>
hugegraph-hubble is a graph management and analysis platform that
provides features:
@@ -26,17 +26,20 @@
</modules>
<properties>
- <top.level.dir>${project.basedir}/..</top.level.dir>
+ <top.level.dir>${project.basedir}/</top.level.dir>
+ <springboot.version>2.1.8.RELEASE</springboot.version>
</properties>
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-dependencies</artifactId>
- <version>2.1.8.RELEASE</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-dependencies</artifactId>
+ <version>${springboot.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
</project>
diff --git a/hugegraph-loader/assembly/travis/install-hugegraph-from-source.sh
b/hugegraph-loader/assembly/travis/install-hugegraph-from-source.sh
index 487639b..4e34b6b 100755
--- a/hugegraph-loader/assembly/travis/install-hugegraph-from-source.sh
+++ b/hugegraph-loader/assembly/travis/install-hugegraph-from-source.sh
@@ -10,9 +10,9 @@ fi
COMMIT_ID=$1
HUGEGRAPH_GIT_URL="https://github.com/hugegraph/hugegraph.git";
-git clone --depth 100 ${HUGEGRAPH_GIT_URL}
+git clone --depth 100 ${HUGEGRAPH_GIT_URL} hugegraph
cd hugegraph
-git checkout ${COMMIT_ID}
+git checkout "${COMMIT_ID}"
mvn package -DskipTests
mv hugegraph-*.tar.gz ../
cd ../
diff --git a/hugegraph-loader/assembly/travis/install-hugegraph-from-tar.sh
b/hugegraph-loader/assembly/travis/install-hugegraph-from-tar.sh
index 86c6fb6..f26c5ee 100755
--- a/hugegraph-loader/assembly/travis/install-hugegraph-from-tar.sh
+++ b/hugegraph-loader/assembly/travis/install-hugegraph-from-tar.sh
@@ -10,7 +10,7 @@ fi
VERSION=$1
HUGEGRAPH_LINK="https://github.com/hugegraph/hugegraph/releases/download/v${VERSION}/hugegraph-${VERSION}.tar.gz";
-wget ${HUGEGRAPH_LINK} || exit 1
+wget "${HUGEGRAPH_LINK}" || exit 1
tar -zxvf hugegraph-${VERSION}.tar.gz
HTTPS_SERVER_DIR="hugegraph_https"
diff --git a/hugegraph-loader/assembly/travis/install-mysql.sh
b/hugegraph-loader/assembly/travis/install-mysql.sh
index e5f8195..1483d4c 100755
--- a/hugegraph-loader/assembly/travis/install-mysql.sh
+++ b/hugegraph-loader/assembly/travis/install-mysql.sh
@@ -2,22 +2,36 @@
set -ev
-TRAVIS_DIR=`dirname $0`
+TRAVIS_DIR=$(dirname $0)
+
+# Need speed up it
+CONF=hugegraph-test/src/main/resources/hugegraph.properties
+MYSQL_USERNAME=root
+
+# Set MySQL configurations
+
+
+# Keep for upgrade in future
+docker pull mysql:5.7
+docker run -p 3306:3306 --name "$1" -e MYSQL_ROOT_PASSWORD="$2" -d mysql:5.7
+
+
+# Old Version
#MYSQL_DOWNLOAD_ADDRESS="http://dev.MySQL.com/get/Downloads";
#MYSQL_VERSION="MySQL-5.7"
#MYSQL_PACKAGE="mysql-5.7.11-Linux-glibc2.5-x86_64"
#MYSQL_TAR="${MYSQL_PACKAGE}.tar.gz"
-if [[ -d /var/lib/mysql ]]; then
- # Reference from
https://github.com/mozilla/treeherder/blob/master/bin/travis-setup.sh
- # Using tmpfs for the MySQL data directory reduces travis test runtime by
6x
- sudo mkdir /mnt/ramdisk
- sudo mount -t tmpfs -o size=1024m tmpfs /mnt/ramdisk
- sudo mv /var/lib/mysql /mnt/ramdisk
- sudo ln -s /mnt/ramdisk/mysql /var/lib/mysql
- sudo cp ${TRAVIS_DIR}/mysql.cnf /etc/mysql/conf.d/mysql.cnf
- sudo service mysql restart
-else
- echo "Please install mysql firstly."
- exit 1
-fi
+#if [[ -d /var/lib/mysql ]]; then
+# # Reference from
https://github.com/mozilla/treeherder/blob/master/bin/travis-setup.sh
+# # Using tmpfs for the MySQL data directory reduces travis test runtime by
6x
+# sudo mkdir /mnt/ramdisk
+# sudo mount -t tmpfs -o size=1024m tmpfs /mnt/ramdisk
+# sudo mv /var/lib/mysql /mnt/ramdisk
+# sudo ln -s /mnt/ramdisk/mysql /var/lib/mysql
+# sudo cp "${TRAVIS_DIR}"/mysql.cnf /etc/mysql/conf.d/mysql.cnf
+# sudo service mysql restart
+#else
+# echo "Please install mysql firstly."
+# exit 1
+#fi
diff --git a/hugegraph-loader/pom.xml b/hugegraph-loader/pom.xml
index 441168e..4ffdd52 100644
--- a/hugegraph-loader/pom.xml
+++ b/hugegraph-loader/pom.xml
@@ -13,7 +13,7 @@
<artifactId>hugegraph-loader</artifactId>
<packaging>jar</packaging>
- <name>${artifactId}</name>
+ <name>${project.artifactId}</name>
<url>https://github.com/apache/incubator-hugegraph-toolchain/tree/master/hugegraph-loader</url>
<description>
hugegraph-loader is a customizable command line utility for loading
small to medium size graph datasets
@@ -28,7 +28,7 @@
</scm>
<properties>
- <release.name>${artifactId}</release.name>
+ <release.name>${project.artifactId}</release.name>
<final.name>${release.name}-${project.version}</final.name>
<assembly.dir>${project.basedir}/assembly</assembly.dir>
<assembly.descriptor.dir>${assembly.dir}/descriptor</assembly.descriptor.dir>
@@ -529,7 +529,7 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.1.0</version>
<configuration>
- <configLocation>checkstyle.xml</configLocation>
+ <configLocation>../checkstyle.xml</configLocation>
<encoding>UTF-8</encoding>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
diff --git a/hugegraph-tools/.travis.yml b/hugegraph-tools/.travis.yml
deleted file mode 100644
index 27f7932..0000000
--- a/hugegraph-tools/.travis.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-language: java
-
-jdk:
- - openjdk8
-
-sudo: required
-
-branches:
- only:
- - master
- - /^release-.*$/
- - /^test-.*$/
-
-install: mvn compile -Dmaven.javadoc.skip=true | grep -v
"Downloading\|Downloaded"
-
-before_script:
- - $TRAVIS_DIR/install-hugegraph.sh $TRAVIS_BRANCH | grep -v
"Downloading\|Downloaded"
-
-script:
- - mvn test -Dtest=FuncTestSuite
-
-after_success:
- - bash <(curl -s https://codecov.io/bash)
-
-env:
- global:
- - TRAVIS_DIR=assembly/travis
diff --git a/hugegraph-tools/assembly/travis/install-hugegraph-from-source.sh
b/hugegraph-tools/assembly/travis/install-hugegraph-from-source.sh
index 3d12053..37f1a71 100755
--- a/hugegraph-tools/assembly/travis/install-hugegraph-from-source.sh
+++ b/hugegraph-tools/assembly/travis/install-hugegraph-from-source.sh
@@ -10,9 +10,9 @@ HUGEGRAPH_GIT_URL="https://github.com/hugegraph/hugegraph.git";
GIT_DIR=hugegraph
# download code and compile
-git clone --depth 100 ${HUGEGRAPH_GIT_URL}
+git clone --depth 100 $HUGEGRAPH_GIT_URL $GIT_DIR
cd "${GIT_DIR}"
-git checkout ${COMMIT_ID}
+git checkout "${COMMIT_ID}"
mvn package -DskipTests
TAR=$(echo hugegraph-*.tar.gz)
@@ -20,7 +20,7 @@ tar -zxvf "${TAR}" -C ../
cd ../
rm -rf "${GIT_DIR}"
-HTTP_SERVER_DIR=$(echo hugegraph-*)
+HTTP_SERVER_DIR=$(echo hugegraph-*.*)
HTTPS_SERVER_DIR="hugegraph_https"
cp -r "${HTTP_SERVER_DIR}" "${HTTPS_SERVER_DIR}"
diff --git a/hugegraph-tools/checkstyle.xml b/hugegraph-tools/checkstyle.xml
deleted file mode 100644
index 80c26bf..0000000
--- a/hugegraph-tools/checkstyle.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC
- "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
- "https://checkstyle.org/dtds/configuration_1_3.dtd";>
-<!--参考：https://checkstyle.sourceforge.io/checks.html-->
-<module name="Checker">
- <!--检查不通过时被判定的违规级别，必须修复后才能使build通过-->
- <property name="severity" value="error"/>
- <!--对java文件做检查-->
- <property name="fileExtensions" value="java"/>
- <!--对UTF-8编码的文件做检查-->
- <property name="charset" value="UTF-8"/>
- <!--文件中不允许包含制表符-->
- <module name="FileTabCharacter">
- <property name="eachLine" value="true"/>
- </module>
-
- <!--检查java源文件并定义一些适用于检查此类文件的一些属性-->
- <module name="TreeWalker">
- <!--检查行长度-->
- <module name="LineLength">
- <property name="max" value="80"/>
- <!--可以忽略的行-->
- <property name="ignorePattern"
- value="^package.*|^import.*|a
href|href|http://|https://|ftp://"/>
- </module>
- <!--检查没有import语句使用*号-->
- <module name="AvoidStarImport"/>
- <!--检查是否存在多余的import语句，比如重复的，java自带的包，相同包下的其他类-->
- <module name="RedundantImport"/>
- <!--检查是否存在没有使用的import语句-->
- <module name="UnusedImports"/>
- <!--检查包名称是否遵守命名规约-->
- <module name="PackageName">
- <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
- </module>
- <!--检查局部变量的名称是否遵守命名规约-->
- <module name="LocalVariableName">
- <property name="format" value="^[a-z][a-zA-Z0-9_]*$"/>
- </module>
- <!--检查成员变量（非静态字段）的名称是否遵守命名规约-->
- <module name="MemberName">
- <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
- </module>
- <!--检查方法名称是否遵守命名规约-->
- <module name="MethodName">
- <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
- </module>
- <!--检查参数名称是否遵守命名规约-->
- <module name="ParameterName">
- <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
- </module>
- <!--检查常量（用static final修饰的字段）的名称是否遵守命名规约-->
- <module name="ConstantName">
- <property name="format" value="^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$"/>
- </module>
- <!--检查数组是否属于java风格，方括号放在类型后面，而不是变量后面，比如：int[] nums（合法），int nums[]（不合法）-->
- <module name="ArrayTypeStyle">
- <property name="javaStyle" value="true"/>
- </module>
- <!--long类型的字面量如果要以"L"结尾，必须是大写的"L"，而非小写的"l"-->
- <module name="UpperEll"/>
- <!--代码换行时，运算符必须在当前行的末尾，比如：+、&&、?、: 等-->
- <module name="OperatorWrap">
- <property name="option" value="eol"/>
- </module>
- <!--检查指定标记的周围是否有空格，比如：if、for、while、synchoronized 等-->
- <module name="WhitespaceAround"/>
-
<!--检查修饰符是否符合Java建议，顺序是：public、protected、private、abstract、default、static、final、transient、volatile、synchronized、native、strictfp-->
- <module name="ModifierOrder"/>
- <!--检查代码块的左花括号的放置位置，必须在当前行的末尾-->
- <module name="LeftCurly">
- <property name="option" value="eol"/>
- <property name="ignoreEnums" value="false"/>
- </module>
- <!--代码中不允许有空语句，也就是单独的;符号-->
- <module name="EmptyStatement"/>
- <!--覆盖equals()方法的类必须也覆盖了hashCode()方法-->
- <module name="EqualsHashCode"/>
- <!--switch语句必须含有default子句-->
- <module name="MissingSwitchDefault"/>
- <!--switch语句的default必须放在所有的case分支之后-->
- <module name="DefaultComesLast"/>
- <!--覆盖clone()方法时调用了super.clone()方法-->
- <module name="SuperClone"/>
- </module>
-</module>
diff --git a/hugegraph-tools/pom.xml b/hugegraph-tools/pom.xml
index 6b6c6ac..81f7a40 100644
--- a/hugegraph-tools/pom.xml
+++ b/hugegraph-tools/pom.xml
@@ -13,10 +13,10 @@
<packaging>jar</packaging>
<url>https://github.com/apache/incubator-hugegraph-toolchain/tree/master/hugegraph-tools</url>
- <name>${artifactId}</name>
+ <name>${project.artifactId}</name>
<properties>
- <release.name>${artifactId}</release.name>
+ <release.name>${project.artifactId}</release.name>
<final.name>${release.name}-${project.version}</final.name>
<assembly.dir>${project.basedir}/assembly</assembly.dir>
<assembly.descriptor.dir>${assembly.dir}/descriptor</assembly.descriptor.dir>
@@ -246,7 +246,7 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.1.0</version>
<configuration>
- <configLocation>checkstyle.xml</configLocation>
+ <configLocation>../checkstyle.xml</configLocation>
<encoding>UTF-8</encoding>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
diff --git a/pom.xml b/pom.xml
index 4978cd1..153af73 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,8 +33,7 @@
<scm>
<url>https://github.com/hugegraph/hugegraph-toolchain</url>
<connection>https://github.com/hugegraph/hugegraph-toolchain</connection>
- <developerConnection>https://github.com/hugegraph/hugegraph-toolchain
- </developerConnection>
+
<developerConnection>https://github.com/hugegraph/hugegraph-toolchain</developerConnection>
</scm>
<modules>
@@ -59,287 +58,90 @@
</properties>
<dependencies>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.7</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.9</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- <version>2.4.6</version>
- </dependency>
- <dependency>
- <groupId>com.beust</groupId>
- <artifactId>jcommander</artifactId>
- <version>1.78</version>
- </dependency>
- <dependency>
- <groupId>org.simpleflatmapper</groupId>
- <artifactId>sfm-csv</artifactId>
- <version>8.2.1</version>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>29.0-jre</version>
- </dependency>
-
- <!--
- <dependency>
- <groupId>com.baidu.inf.hadoop</groupId>
- <artifactId>libdfs-java</artifactId>
- <version>2.0.5</version>
- </dependency>
- -->
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapred</artifactId>
- <version>0.22.0</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-compress</artifactId>
- <version>1.21</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.5.13</version>
- </dependency>
- <dependency>
- <groupId>org.tukaani</groupId>
- <artifactId>xz</artifactId>
- <version>1.8</version>
- </dependency>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>6.0.6</version>
- </dependency>
- <dependency>
- <groupId>org.postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>42.3.3</version>
- </dependency>
- <dependency>
- <groupId>com.microsoft.sqlserver</groupId>
- <artifactId>mssql-jdbc</artifactId>
- <version>7.2.0.jre8</version>
- </dependency>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc8</artifactId>
- <version>12.2.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-exec</artifactId>
- <version>3.1.2</version>
- <exclusions>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-web</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-yarn-registry</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-yarn-server-resourcemanager</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.calcite.avatica</groupId>
- <artifactId>avatica</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.calcite</groupId>
- <artifactId>calcite-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.calcite</groupId>
- <artifactId>calcite-druid</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-client</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-json</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey.contribs</groupId>
- <artifactId>jersey-guice</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.parquet</groupId>
- <artifactId>parquet-hadoop-bundle</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.parquet</groupId>
- <artifactId>parquet-column</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libfb303</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <!--TODO: enhance it later to avoid conflicts now -->
+<!-- <dependency>-->
+<!-- <groupId>commons-io</groupId>-->
+<!-- <artifactId>commons-io</artifactId>-->
+<!-- <version>2.7</version>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.apache.commons</groupId>-->
+<!-- <artifactId>commons-lang3</artifactId>-->
+<!-- <version>3.9</version>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>com.google.guava</groupId>-->
+<!-- <artifactId>guava</artifactId>-->
+<!-- <version>29.0-jre</version>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.apache.commons</groupId>-->
+<!-- <artifactId>commons-compress</artifactId>-->
+<!-- <version>1.21</version>-->
+<!-- </dependency>-->
</dependencies>
- <profiles>
- <profile>
- <id>unit</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <test-classes>**/UnitTestSuite.java</test-classes>
- </properties>
- </profile>
- <profile>
- <id>file</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <source_type>file</source_type>
- <store_path>files</store_path>
- <test-classes>**/FileLoadTest.java</test-classes>
- </properties>
- </profile>
- <profile>
- <id>hdfs</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <properties>
- <source_type>hdfs</source_type>
- <!-- same as hdfs://localhost:8020/files -->
- <store_path>/files</store_path>
- <test-classes>**/HDFSLoadTest.java</test-classes>
- </properties>
- </profile>
- <profile>
- <id>jdbc</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <properties>
- <test-classes>**/JDBCLoadTest.java</test-classes>
- </properties>
- </profile>
- <profile>
- <id>release</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.2.1</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar-no-fork</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9.1</version>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <additionalJOptions>
-
<additionalJOption>-Xdoclint:none</additionalJOption>
- </additionalJOptions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>1.5</version>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <!-- Prevent `gpg` from using pinentry programs -->
- <gpgArguments>
- <arg>--pinentry-mode</arg>
- <arg>loopback</arg>
- </gpgArguments>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+<!-- <profiles>-->
+<!-- <profile>-->
+<!-- <id>release</id>-->
+<!-- <build>-->
+<!-- <plugins>-->
+<!-- <plugin>-->
+<!-- <groupId>org.apache.maven.plugins</groupId>-->
+<!-- <artifactId>maven-source-plugin</artifactId>-->
+<!-- <version>2.2.1</version>-->
+<!-- <executions>-->
+<!-- <execution>-->
+<!-- <id>attach-sources</id>-->
+<!-- <goals>-->
+<!-- <goal>jar-no-fork</goal>-->
+<!-- </goals>-->
+<!-- </execution>-->
+<!-- </executions>-->
+<!-- </plugin>-->
+<!-- <plugin>-->
+<!-- <groupId>org.apache.maven.plugins</groupId>-->
+<!-- <artifactId>maven-javadoc-plugin</artifactId>-->
+<!-- <version>2.9.1</version>-->
+<!-- <executions>-->
+<!-- <execution>-->
+<!-- <id>attach-javadocs</id>-->
+<!-- <goals>-->
+<!-- <goal>jar</goal>-->
+<!-- </goals>-->
+<!-- </execution>-->
+<!-- </executions>-->
+<!-- <configuration>-->
+<!-- <additionalJOptions>-->
+<!--
<additionalJOption>-Xdoclint:none</additionalJOption>-->
+<!-- </additionalJOptions>-->
+<!-- </configuration>-->
+<!-- </plugin>-->
+<!-- <plugin>-->
+<!-- <groupId>org.apache.maven.plugins</groupId>-->
+<!-- <artifactId>maven-gpg-plugin</artifactId>-->
+<!-- <version>1.5</version>-->
+<!-- <executions>-->
+<!-- <execution>-->
+<!-- <id>sign-artifacts</id>-->
+<!-- <phase>verify</phase>-->
+<!-- <goals>-->
+<!-- <goal>sign</goal>-->
+<!-- </goals>-->
+<!-- </execution>-->
+<!-- </executions>-->
+<!-- <configuration>-->
+<!-- <!– Prevent `gpg` from using pinentry
programs –>-->
+<!-- <gpgArguments>-->
+<!-- <arg>--pinentry-mode</arg>-->
+<!-- <arg>loopback</arg>-->
+<!-- </gpgArguments>-->
+<!-- </configuration>-->
+<!-- </plugin>-->
+<!-- </plugins>-->
+<!-- </build>-->
+<!-- </profile>-->
+<!-- </profiles>-->
<build>
<plugins>
@@ -388,165 +190,166 @@
</compilerArgs>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version>
- <executions>
- <execution>
- <id>assembly-hugegraph-loader</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <attach>false</attach>
- <appendAssemblyId>false</appendAssemblyId>
-
<outputDirectory>${project.basedir}</outputDirectory>
-
<descriptor>${assembly.descriptor.dir}/assembly.xml</descriptor>
- <finalName>${final.name}</finalName>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <echo file="${project.basedir}/dist.sh">
- tar -zcvf \
- ${project.basedir}/${final.name}.tar.gz
${final.name} || exit 1
- rm -f ${project.basedir}/dist.sh
- echo -n "hugegraph-loader tar.gz available
at: "
- echo
"${project.basedir}/${final.name}.tar.gz"
- </echo>
- <exec executable="${shell-executable}"
- dir="${project.basedir}"
failonerror="true">
- <arg line="./dist.sh"/>
- </exec>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <version>3.0.0</version>
- <configuration>
- <filesets>
- <fileset>
- <directory>${project.basedir}</directory>
- <includes>
- <include>*.tar.gz</include>
- <include>${final.name}/**</include>
- </includes>
- <followSymlinks>false</followSymlinks>
- </fileset>
- <fileset>
- <directory>${final.name}</directory>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <version>0.8.4</version>
- <executions>
- <execution>
- <id>pre-unit-test</id>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- </execution>
- <execution>
- <id>post-unit-test</id>
- <phase>test</phase>
- <goals>
- <goal>report</goal>
- </goals>
- <configuration>
- <outputDirectory>
- ${project.build.directory}
- </outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>properties-maven-plugin</artifactId>
- <version>1.0.0</version>
- <executions>
- <execution>
- <phase>generate-resources</phase>
- <goals>
- <goal>write-project-properties</goal>
- </goals>
- <configuration>
- <outputFile>
-
${project.build.testOutputDirectory}/profile.properties
- </outputFile>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.7</version>
- <configuration>
- <encoding>UTF-8</encoding>
- <nonFilteredFileExtensions>
-
<nonFilteredFileExtension>parquet</nonFilteredFileExtension>
- </nonFilteredFileExtensions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.20</version>
- <configuration>
- <includes>
- <include>${test-classes}</include>
- </includes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>3.1.0</version>
- <configuration>
- <configLocation>checkstyle.xml</configLocation>
- <encoding>UTF-8</encoding>
- <consoleOutput>true</consoleOutput>
- <failsOnError>true</failsOnError>
- <linkXRef>false</linkXRef>
-
<includeTestSourceDirectory>false</includeTestSourceDirectory>
- </configuration>
- <executions>
- <execution>
- <id>validate</id>
- <phase>validate</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+<!-- <plugin>-->
+<!-- <groupId>org.apache.maven.plugins</groupId>-->
+<!-- <artifactId>maven-assembly-plugin</artifactId>-->
+<!-- <version>2.4</version>-->
+<!-- <executions>-->
+<!-- <execution>-->
+<!-- <id>assembly-hugegraph-toolchain</id>-->
+<!-- <phase>package</phase>-->
+<!-- <goals>-->
+<!-- <goal>single</goal>-->
+<!-- </goals>-->
+<!-- <configuration>-->
+<!-- <attach>false</attach>-->
+<!-- <appendAssemblyId>false</appendAssemblyId>-->
+<!--
<outputDirectory>${project.basedir}</outputDirectory>-->
+<!--
<descriptor>${assembly.descriptor.dir}/assembly.xml</descriptor>-->
+<!-- <finalName>${final.name}</finalName>-->
+<!-- </configuration>-->
+<!-- </execution>-->
+<!-- </executions>-->
+<!-- </plugin>-->
+<!-- <plugin>-->
+<!-- <artifactId>maven-antrun-plugin</artifactId>-->
+<!-- <executions>-->
+<!-- <execution>-->
+<!-- <phase>package</phase>-->
+<!-- <goals>-->
+<!-- <goal>run</goal>-->
+<!-- </goals>-->
+<!-- <configuration>-->
+<!-- <tasks>-->
+<!-- <echo file="${project.basedir}/dist.sh">-->
+<!-- tar -zcvf \-->
+<!--
${project.basedir}/${final.name}.tar.gz ${final.name} || exit 1-->
+<!-- rm -f ${project.basedir}/dist.sh-->
+<!-- echo -n "hugegraph-loader tar.gz
available at: "-->
+<!-- echo
"${project.basedir}/${final.name}.tar.gz"-->
+<!-- </echo>-->
+<!-- <exec executable="${shell-executable}"-->
+<!-- dir="${project.basedir}"
failonerror="true">-->
+<!-- <arg line="./dist.sh"/>-->
+<!-- </exec>-->
+<!-- </tasks>-->
+<!-- </configuration>-->
+<!-- </execution>-->
+<!-- </executions>-->
+<!-- </plugin>-->
+<!-- <plugin>-->
+<!-- <artifactId>maven-clean-plugin</artifactId>-->
+<!-- <version>3.0.0</version>-->
+<!-- <configuration>-->
+<!-- <filesets>-->
+<!-- <fileset>-->
+<!-- <directory>${project.basedir}</directory>-->
+<!-- <includes>-->
+<!-- <include>*.tar.gz</include>-->
+<!-- <include>${final.name}/**</include>-->
+<!-- </includes>-->
+<!-- <followSymlinks>false</followSymlinks>-->
+<!-- </fileset>-->
+<!-- <fileset>-->
+<!-- <directory>${final.name}</directory>-->
+<!-- </fileset>-->
+<!-- </filesets>-->
+<!-- </configuration>-->
+<!-- </plugin>-->
+<!-- <plugin>-->
+<!-- <groupId>org.jacoco</groupId>-->
+<!-- <artifactId>jacoco-maven-plugin</artifactId>-->
+<!-- <version>0.8.4</version>-->
+<!-- <executions>-->
+<!-- <execution>-->
+<!-- <id>pre-unit-test</id>-->
+<!-- <goals>-->
+<!-- <goal>prepare-agent</goal>-->
+<!-- </goals>-->
+<!-- </execution>-->
+<!-- <execution>-->
+<!-- <id>post-unit-test</id>-->
+<!-- <phase>test</phase>-->
+<!-- <goals>-->
+<!-- <goal>report</goal>-->
+<!-- </goals>-->
+<!-- <configuration>-->
+<!-- <outputDirectory>-->
+<!-- ${project.build.directory}-->
+<!-- </outputDirectory>-->
+<!-- </configuration>-->
+<!-- </execution>-->
+<!-- </executions>-->
+<!-- </plugin>-->
+<!-- <plugin>-->
+<!-- <groupId>org.codehaus.mojo</groupId>-->
+<!-- <artifactId>properties-maven-plugin</artifactId>-->
+<!-- <version>1.0.0</version>-->
+<!-- <executions>-->
+<!-- <execution>-->
+<!-- <phase>generate-resources</phase>-->
+<!-- <goals>-->
+<!-- <goal>write-project-properties</goal>-->
+<!-- </goals>-->
+<!-- <configuration>-->
+<!-- <outputFile>-->
+<!--
${project.build.testOutputDirectory}/profile.properties-->
+<!-- </outputFile>-->
+<!-- </configuration>-->
+<!-- </execution>-->
+<!-- </executions>-->
+<!-- </plugin>-->
+<!-- <plugin>-->
+<!-- <groupId>org.apache.maven.plugins</groupId>-->
+<!-- <artifactId>maven-resources-plugin</artifactId>-->
+<!-- <version>2.7</version>-->
+<!-- <configuration>-->
+<!-- <encoding>UTF-8</encoding>-->
+<!-- <nonFilteredFileExtensions>-->
+<!--
<nonFilteredFileExtension>parquet</nonFilteredFileExtension>-->
+<!-- </nonFilteredFileExtensions>-->
+<!-- </configuration>-->
+<!-- </plugin>-->
+<!-- <plugin>-->
+<!-- <groupId>org.apache.maven.plugins</groupId>-->
+<!-- <artifactId>maven-surefire-plugin</artifactId>-->
+<!-- <version>2.20</version>-->
+<!-- <configuration>-->
+<!-- <includes>-->
+<!-- <include>${test-classes}</include>-->
+<!-- </includes>-->
+<!-- </configuration>-->
+<!-- </plugin>-->
+<!-- TODO: after all modules fix checkstyle, enable it in root again -->
+<!-- <plugin>-->
+<!-- <groupId>org.apache.maven.plugins</groupId>-->
+<!-- <artifactId>maven-checkstyle-plugin</artifactId>-->
+<!-- <version>3.1.0</version>-->
+<!-- <configuration>-->
+<!-- <configLocation>checkstyle.xml</configLocation>-->
+<!-- <encoding>UTF-8</encoding>-->
+<!-- <consoleOutput>true</consoleOutput>-->
+<!-- <failsOnError>true</failsOnError>-->
+<!-- <linkXRef>false</linkXRef>-->
+<!--
<includeTestSourceDirectory>false</includeTestSourceDirectory>-->
+<!-- </configuration>-->
+<!-- <executions>-->
+<!-- <execution>-->
+<!-- <id>validate</id>-->
+<!-- <phase>validate</phase>-->
+<!-- <goals>-->
+<!-- <goal>check</goal>-->
+<!-- </goals>-->
+<!-- </execution>-->
+<!-- </executions>-->
+<!-- </plugin>-->
</plugins>
- <testResources>
- <testResource>
- <directory>src/test/resources/</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
+<!-- <testResources>-->
+<!-- <testResource>-->
+<!-- <directory>src/test/resources/</directory>-->
+<!-- <filtering>true</filtering>-->
+<!-- </testResource>-->
+<!-- </testResources>-->
</build>
</project>
