From 4e0d8a2b9ee03acb90e26f9573edef2880a73436 Mon Sep 17 00:00:00 2001 From: w7u Date: Thu, 28 Nov 2019 21:31:57 +0800 Subject: [PATCH 1/9] add several tools like(gpg,javadoc..) to release the pkg to sonatype.org central --- pom.xml | 93 ++++++++++++++++++- src/main/java/org/sqlflow/client/SQLFlow.java | 7 +- 2 files changed, 93 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index b1ed348..585bf78 100644 --- a/pom.xml +++ b/pom.xml @@ -7,8 +7,9 @@ org.sqlflow jsqlflow jar - 1.0-SNAPSHOT + 0.0.1 jsqlflow + SQLFlow client https://github.com/sql-machine-learning/jsqlflow @@ -19,6 +20,7 @@ 1.8 1.8 + io.grpc @@ -69,7 +71,20 @@ 1.6.2 + + + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadocs + + jar + + + + org.xolstice.maven.plugins protobuf-maven-plugin @@ -90,6 +105,7 @@ + org.apache.maven.plugins maven-enforcer-plugin @@ -108,6 +124,81 @@ + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.8 + true + + sonatype_releases + https://oss.sonatype.org/ + false + + + + + org.apache.maven.plugins + maven-source-plugin + 3.2.0 + + + attach-sources + + jar-no-fork + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + gpg + verify + + sign + + + + + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + https://github.com/sql-machine-learning/jsqlflow/tree/develop + + + + + weiguoz + myxjtu@gmail.com + http://sqlflow.org/ + +8 + + + + + + sonatype_releases + Nexus Release Repository + https://oss.sonatype.org/service/local/staging/deploy/maven2 + + + sonatype_snapshots + Nexus Snapshot Repository + https://oss.sonatype.org/content/repositories/snapshots + + \ No newline at end of file diff --git a/src/main/java/org/sqlflow/client/SQLFlow.java b/src/main/java/org/sqlflow/client/SQLFlow.java index 322275b..42e8150 100644 --- a/src/main/java/org/sqlflow/client/SQLFlow.java +++ b/src/main/java/org/sqlflow/client/SQLFlow.java @@ -32,12 +32,7 @@ public interface SQLFlow { * Submit a task to SQLFlow server. This method return immediately. * * @param session: specify dbConnStr(datasource), user Id ... - *

datasource == maxcomputer - * maxcompute://{accesskey_id}:{accesskey_secret}@{endpoint}?curr_project={curr_project}&scheme={scheme} - *

datasource == mysql - * mysql://{username}:{password}@tcp({address})/{dbname}[?param1=value1&...¶mN=valueN] - *

datasource == hive - * hive://user:password@ip:port/dbname[?auth=&session.=...&session=valueN] + * mysql://root:root@tcp(localhost)/iris * @param sql: sql program. *

Example: "SELECT * FROM iris.test; SELECT * FROM iris.iris TO TRAIN DNNClassifier * COLUMN..." * From 498f253f46d4512c11905f36cbb965acd8ee0ee8 Mon Sep 17 00:00:00 2001 From: w7u Date: Fri, 29 Nov 2019 20:43:25 +0800 Subject: [PATCH 2/9] add deploy --- .travis.settings.xml | 38 ++++++++++++++++++++++++++++++++++++++ .travis.yml | 10 +++++++++- pom.xml | 1 + 3 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 .travis.settings.xml diff --git a/.travis.settings.xml b/.travis.settings.xml new file mode 100644 index 0000000..937f8a9 --- /dev/null +++ b/.travis.settings.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + sonatype_snapshots + ${env.SONATYPE_USR} + ${env.SONATYPE_PSWD} + + + sonatype_releases + ${env.SONATYPE_USR} + ${env.SONATYPE_PSWD} + + + + + + + gpg + + gpg + ${env.GPG_PSWD} + + + + + + gpg + + diff --git a/.travis.yml b/.travis.yml index 0cc8c17..c4a10d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,4 +11,12 @@ before_script: - jdk_switcher use $JDK script: - - mvn clean verify --batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true + - mvn clean verify --batch-mode --errors --fail-at-end --show-version + +deploy: + provider: script + script: "cp .travis.settings.xml $HOME/.m2/settings.xml && mvn deploy" + skip_cleanup: true + on: + # Set `tag: true` so that the deployment is triggered only when a tagged commit is pushed + tags: true diff --git a/pom.xml b/pom.xml index 585bf78..be0c3c5 100644 --- a/pom.xml +++ b/pom.xml @@ -85,6 +85,7 @@ + org.xolstice.maven.plugins protobuf-maven-plugin From b7f2aa12df233a7f4a8e3363374dbd56f4ceeeb3 Mon Sep 17 00:00:00 2001 From: w7u Date: Fri, 29 Nov 2019 20:52:47 +0800 Subject: [PATCH 3/9] add deploy --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c4a10d2..d87e2d0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ script: deploy: provider: script - script: "cp .travis.settings.xml $HOME/.m2/settings.xml && mvn deploy" + script: "cp .travis.settings.xml $HOME/.m2/settings.xml && mvn deploy -P gpg" skip_cleanup: true on: # Set `tag: true` so that the deployment is triggered only when a tagged commit is pushed From 955d52d809b7ba34e775b19b54844ce573e96db7 Mon Sep 17 00:00:00 2001 From: w7u Date: Fri, 29 Nov 2019 20:59:37 +0800 Subject: [PATCH 4/9] add before_script --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d87e2d0..e58806f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,13 +9,14 @@ env: dist: trusty before_script: - jdk_switcher use $JDK + - cp .travis.settings.xml $HOME/.m2/settings.xml script: - mvn clean verify --batch-mode --errors --fail-at-end --show-version deploy: provider: script - script: "cp .travis.settings.xml $HOME/.m2/settings.xml && mvn deploy -P gpg" + script: "mvn deploy -P gpg" skip_cleanup: true on: # Set `tag: true` so that the deployment is triggered only when a tagged commit is pushed From 4ed99c29fc2147841f67632eef73999abe2af4a8 Mon Sep 17 00:00:00 2001 From: w7u Date: Fri, 29 Nov 2019 21:03:16 +0800 Subject: [PATCH 5/9] add before_install --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e58806f..8c25eb1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,9 +7,10 @@ cache: env: - JDK=oraclejdk8 dist: trusty +before_install: + - cp .travis.settings.xml $HOME/.m2/settings.xml before_script: - jdk_switcher use $JDK - - cp .travis.settings.xml $HOME/.m2/settings.xml script: - mvn clean verify --batch-mode --errors --fail-at-end --show-version From 7f13adce0d7580ff4553184ff61ed771b17d7f65 Mon Sep 17 00:00:00 2001 From: w7u Date: Fri, 29 Nov 2019 21:16:32 +0800 Subject: [PATCH 6/9] skip gpg while in test --- .travis.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8c25eb1..b345bb2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,21 +3,17 @@ sudo: false cache: directories: - $HOME/.m2 - env: - JDK=oraclejdk8 dist: trusty -before_install: - - cp .travis.settings.xml $HOME/.m2/settings.xml before_script: - jdk_switcher use $JDK -script: - - mvn clean verify --batch-mode --errors --fail-at-end --show-version +install: mvn clean verify -Dgpg.skip deploy: provider: script - script: "mvn deploy -P gpg" + script: "cp .travis.settings.xml $HOME/.m2/settings.xml && mvn deploy -P gpg" skip_cleanup: true on: # Set `tag: true` so that the deployment is triggered only when a tagged commit is pushed From 527b4c4f230b428b2b5e7a7417cab10c4c506d89 Mon Sep 17 00:00:00 2001 From: w7u Date: Fri, 29 Nov 2019 21:22:54 +0800 Subject: [PATCH 7/9] just test --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b345bb2..4447caa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,8 +9,10 @@ dist: trusty before_script: - jdk_switcher use $JDK -install: mvn clean verify -Dgpg.skip +# install: mvn clean verify -Dgpg.skip +install: cp .travis.settings.xml $HOME/.m2/settings.xml && mvn deploy -P gpg +# TODO(weiguo) not tested yet deploy: provider: script script: "cp .travis.settings.xml $HOME/.m2/settings.xml && mvn deploy -P gpg" From 682dde1afae973cb57f8fa3affc6a25fdf360c93 Mon Sep 17 00:00:00 2001 From: w7u Date: Fri, 29 Nov 2019 21:55:01 +0800 Subject: [PATCH 8/9] test deploy --- .travis.settings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.settings.xml b/.travis.settings.xml index 937f8a9..9da90d3 100644 --- a/.travis.settings.xml +++ b/.travis.settings.xml @@ -27,6 +27,7 @@ gpg gpg + ${env.GPG_KEYNAME} ${env.GPG_PSWD} From 9305d354a35f69c7d1ca62ee0595dfc5ed2f58f4 Mon Sep 17 00:00:00 2001 From: w7u Date: Fri, 29 Nov 2019 22:13:39 +0800 Subject: [PATCH 9/9] clean dbg --- .travis.yml | 6 ++---- .travis.settings.xml => .travis/settings.xml | 0 2 files changed, 2 insertions(+), 4 deletions(-) rename .travis.settings.xml => .travis/settings.xml (100%) diff --git a/.travis.yml b/.travis.yml index 4447caa..3291168 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,14 +9,12 @@ dist: trusty before_script: - jdk_switcher use $JDK -# install: mvn clean verify -Dgpg.skip -install: cp .travis.settings.xml $HOME/.m2/settings.xml && mvn deploy -P gpg +install: mvn clean verify -Dgpg.skip # TODO(weiguo) not tested yet deploy: provider: script - script: "cp .travis.settings.xml $HOME/.m2/settings.xml && mvn deploy -P gpg" + script: "mvn --settings .travis/settings.xml deploy -P gpg" skip_cleanup: true on: - # Set `tag: true` so that the deployment is triggered only when a tagged commit is pushed tags: true diff --git a/.travis.settings.xml b/.travis/settings.xml similarity index 100% rename from .travis.settings.xml rename to .travis/settings.xml